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
                   ` (35 more replies)
  0 siblings, 36 replies; 37+ 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] 37+ 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
                   ` (34 subsequent siblings)
  35 siblings, 0 replies; 37+ 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] 37+ 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
                   ` (33 subsequent siblings)
  35 siblings, 0 replies; 37+ 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] 37+ 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
                   ` (32 subsequent siblings)
  35 siblings, 0 replies; 37+ 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] 37+ 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
                   ` (31 subsequent siblings)
  35 siblings, 0 replies; 37+ 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] 37+ 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
                   ` (30 subsequent siblings)
  35 siblings, 0 replies; 37+ 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] 37+ 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
                   ` (29 subsequent siblings)
  35 siblings, 0 replies; 37+ 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] 37+ 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
                   ` (28 subsequent siblings)
  35 siblings, 0 replies; 37+ 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] 37+ 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
                   ` (27 subsequent siblings)
  35 siblings, 0 replies; 37+ 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] 37+ 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
                   ` (26 subsequent siblings)
  35 siblings, 0 replies; 37+ 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] 37+ 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
                   ` (25 subsequent siblings)
  35 siblings, 0 replies; 37+ 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] 37+ 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
                   ` (24 subsequent siblings)
  35 siblings, 0 replies; 37+ 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] 37+ 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
                   ` (23 subsequent siblings)
  35 siblings, 0 replies; 37+ 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] 37+ 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
                   ` (22 subsequent siblings)
  35 siblings, 0 replies; 37+ 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] 37+ 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
                   ` (21 subsequent siblings)
  35 siblings, 0 replies; 37+ 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] 37+ 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
                   ` (20 subsequent siblings)
  35 siblings, 0 replies; 37+ 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] 37+ 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
                   ` (19 subsequent siblings)
  35 siblings, 0 replies; 37+ 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] 37+ 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
                   ` (18 subsequent siblings)
  35 siblings, 0 replies; 37+ 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/srcpkgs/font-tamzen/template b/srcpkgs/font-tamzen/template
index 91faf9c56395..2ad2e7d2d2c2 100644
--- a/srcpkgs/font-tamzen/template
+++ b/srcpkgs/font-tamzen/template
@@ -1,13 +1,13 @@
 # Template file for 'font-tamzen'
 pkgname=font-tamzen
 version=1.11.4
-revision=2
+revision=3
 wrksrc="tamzen-font-Tamzen-${version}"
 makedepends="font-util"
 depends="$makedepends"
 short_desc="Monospaced bitmap font based on Tamsyn"
 maintainer='Peter Bui <pbui@github.bx612.space>'
-license="custom"
+license="custom:Tamzen"
 homepage="https://sunaku.github.io/tamsyn-1.7b-font-review.html"
 distfiles="https://github.com/sunaku/tamzen-font/archive/Tamzen-${version}.tar.gz"
 checksum=da677aaa4bb7a30fd23f92c0e93b6a3e66ca27817561390ec78a476cee3bcde7

From c2a1570440253592d31381b06cbb233318b36db0 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 31 Mar 2021 22:28:08 -0700
Subject: [PATCH 0455/2024] foomatic-db-engine: fix license

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

diff --git a/srcpkgs/foomatic-db-engine/template b/srcpkgs/foomatic-db-engine/template
index 3db8efce3504..dc1a21716e5a 100644
--- a/srcpkgs/foomatic-db-engine/template
+++ b/srcpkgs/foomatic-db-engine/template
@@ -1,7 +1,7 @@
 # Template file for 'foomatic-db-engine'
 pkgname=foomatic-db-engine
 version=4.0.13
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --libdir=/usr/lib PERL_INSTALLDIRS=vendor"
 hostmakedepends="wget perl foomatic-db cups-filters ghostscript cups libxml2-devel"
@@ -9,7 +9,7 @@ makedepends="libxml2-devel cups-devel"
 depends="${hostmakedepends/libxml2-devel/}"
 short_desc="OpenPrinting printer support - programs"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://www.openprinting.org/"
 distfiles="https://www.openprinting.org/download/foomatic/$pkgname-$version.tar.gz"
 checksum=b5c89027aa26967d2e6db62e2af7db0c4039d2480d4fbf2476a6ddcf609a5faf

From a06d07e36a62ef651d2058d5ba09ace0f40a0a4c Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 31 Mar 2021 22:35:31 -0700
Subject: [PATCH 0456/2024] foremost: fix license

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

diff --git a/srcpkgs/foremost/template b/srcpkgs/foremost/template
index d4f13a8e336a..cb463049d370 100644
--- a/srcpkgs/foremost/template
+++ b/srcpkgs/foremost/template
@@ -1,11 +1,11 @@
 # Template file for 'foremost'
 pkgname=foremost
 version=1.5.7
-revision=5
+revision=6
 conf_files="/etc/foremost.conf"
 short_desc="Forensic program to recover lost files"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="Public Domain, GPL-2"
+license="Public Domain"
 homepage="http://foremost.sourceforge.net/"
 distfiles="http://foremost.sourceforge.net/pkg/foremost-${version}.tar.gz"
 checksum=502054ef212e3d90b292e99c7f7ac91f89f024720cd5a7e7680c3d1901ef5f34

From 0033dabc4dabc5ea661732e8b9721d74835aa31f Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 31 Mar 2021 22:46:12 -0700
Subject: [PATCH 0457/2024] frame: fix license

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

diff --git a/srcpkgs/frame/template b/srcpkgs/frame/template
index 88ed8ae738e5..faf98cc44932 100644
--- a/srcpkgs/frame/template
+++ b/srcpkgs/frame/template
@@ -1,17 +1,17 @@
-# Template build file for 'frame'
+# Template file for 'frame'
 pkgname=frame
 version=2.5.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--enable-x11"
+hostmakedepends="pkg-config"
+makedepends="libXi-devel xorg-server-devel"
 short_desc="Touch Frame Library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-makedepends="libXi-devel xorg-server-devel"
-hostmakedepends="pkg-config"
-license="LGPL-2.1"
+license="LGPL-3.0-only"
 homepage="https://launchpad.net/frame"
 distfiles="https://launchpad.net/${pkgname}/trunk/v${version}/+download/${pkgname}-${version}.tar.gz"
 checksum=cfb9ab52cdccd926f1822a457264d0014c7eb9f4600a72626063dd073b26256f
-configure_args="--enable-x11"
 
 frame-devel_package() {
 	depends="frame>=${version}_${revision}"

From b03e1d214c8af21233dbe2049310db984e5c9611 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 31 Mar 2021 23:13:54 -0700
Subject: [PATCH 0458/2024] fs-utils: fix license

Closes: #29919 [via git-merge-pr]
---
 srcpkgs/fs-utils/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/fs-utils/template b/srcpkgs/fs-utils/template
index df850a17090d..91a0d1dcc0d6 100644
--- a/srcpkgs/fs-utils/template
+++ b/srcpkgs/fs-utils/template
@@ -1,14 +1,14 @@
-# Template file for 'fs-utils'.
+# Template file for 'fs-utils'
 pkgname=fs-utils
 version=1.10
-revision=2
+revision=3
 archs="~*-musl"
 build_style=gnu-configure
 configure_args="--disable-static"
 makedepends="netbsd-rumpkernel-devel"
 short_desc="NetBSD File System Access Utilities in Userland"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD"
+license="BSD-2-Clause, BSD-3-Clause, BSD-4-Clause"
 homepage="https://github.com/rumpkernel/fs-utils"
 distfiles="$homepage/archive/v$version.tar.gz
  https://raw.githubusercontent.com/rumpkernel/fs-utils/master/LICENSE"

From ee05d9f3c78ec03bac1da631fb8724ab3f69e715 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Sun, 28 Mar 2021 23:05:01 +0200
Subject: [PATCH 0459/2024] duf: update to 0.6.2.

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

diff --git a/srcpkgs/duf/template b/srcpkgs/duf/template
index 87191e9e8fbc..3797726fb76f 100644
--- a/srcpkgs/duf/template
+++ b/srcpkgs/duf/template
@@ -1,15 +1,16 @@
 # Template file for 'duf'
 pkgname=duf
-version=0.6.0
+version=0.6.2
 revision=1
 build_style=go
+go_ldflags="-X main.Version=$version"
 go_import_path="github.com/muesli/duf"
 short_desc="Disk Usage/Free Utility"
 maintainer="Paper <paper@tilde.institute>"
 license="MIT"
 homepage="https://github.com/muesli/duf/"
 distfiles="https://github.com/muesli/duf/archive/v$version.tar.gz"
-checksum=238ace11966ab3b1f99e5488a9f161ebc97aba7600a8f09884110d0572309491
+checksum=f2314d8e5e133a6ce93968b3450c1710a3e432cb4a5dfc528aa0317d968a8988
 
 post_install() {
 	vlicense LICENSE

From 1b46d4426c28667fdf853697b8b38f2590256645 Mon Sep 17 00:00:00 2001
From: a dinosaur <nick@a-dinosaur.com>
Date: Mon, 29 Mar 2021 03:53:00 +1100
Subject: [PATCH 0460/2024] libopenmpt: update to 0.5.7

Closes: #29817 [via git-merge-pr]
---
 srcpkgs/libopenmpt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libopenmpt/template b/srcpkgs/libopenmpt/template
index 3e427baeed40..d9ba1879ff41 100644
--- a/srcpkgs/libopenmpt/template
+++ b/srcpkgs/libopenmpt/template
@@ -1,6 +1,6 @@
 # Template file for 'libopenmpt'
 pkgname=libopenmpt
-version=0.5.6
+version=0.5.7
 revision=1
 wrksrc="libopenmpt-${version}+release.autotools"
 build_style=gnu-configure
@@ -16,7 +16,7 @@ maintainer="a dinosaur <nick@a-dinosaur.com>"
 license="BSD-3-Clause"
 homepage="https://lib.openmpt.org/libopenmpt/"
 distfiles="https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"
-checksum=17dea782b334c146f4acd948c7c31ffdd2afc899eb347ebe01be1606ea79f4b8
+checksum=c86026c47e208f1849676d1b6c5c9a068247154f38d368628c05c1f354d72c77
 
 post_install() {
 	vlicense LICENSE

From 51df33af467433de6e21e726117b614beb62ec57 Mon Sep 17 00:00:00 2001
From: mag <mag-one@autistici.org>
Date: Sun, 28 Mar 2021 15:51:13 +0200
Subject: [PATCH 0461/2024] faust: update to 2.30.5

Closes: #29808 [via git-merge-pr]
---
 srcpkgs/faust/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/faust/template b/srcpkgs/faust/template
index 65352639d6af..03b44b2f2580 100644
--- a/srcpkgs/faust/template
+++ b/srcpkgs/faust/template
@@ -1,6 +1,6 @@
 # Template file for 'faust'
 pkgname=faust
-version=2.27.2
+version=2.30.5
 revision=1
 build_style=gnu-makefile
 hostmakedepends="cmake pkg-config llvm"
@@ -10,7 +10,7 @@ maintainer="mag <mag-one@autistici.org>"
 license="GPL-2.0-or-later"
 homepage="http://faust.grame.fr/"
 distfiles=https://github.com/grame-cncm/faust/releases/download/${version}/${pkgname}-${version}.tar.gz
-checksum="c9b21de69253d5a02a779c2eed74491fc62209d86c24724b429f68098191c39c"
+checksum="6cf64b8ee92c2db74d7d83d726b0ecb6f7e141deeadf4cd40c60e467893e0bfc"
 
 # Android stuffs, used by the 'faust2android' script.
 nostrip_files="libsndfile.so "

From fc562f6539f5083085a79343fddce0505d45da9f Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 28 Mar 2021 13:12:35 +0200
Subject: [PATCH 0462/2024] zlib: fix license

Closes: #29805 [via git-merge-pr]
---
 srcpkgs/zlib/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zlib/template b/srcpkgs/zlib/template
index ec437ea6df4a..a6462e5616a2 100644
--- a/srcpkgs/zlib/template
+++ b/srcpkgs/zlib/template
@@ -1,12 +1,12 @@
-# Template build file for 'zlib'
+# Template file for 'zlib'
 pkgname=zlib
 version=1.2.11
 revision=3
 bootstrap=yes
 build_style=configure
-short_desc="A compression/decompression Library"
+short_desc="Compression/decompression Library"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="zlib"
+license="Zlib"
 homepage="http://www.zlib.net"
 distfiles="$homepage/$pkgname-$version.tar.gz"
 checksum=c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1

From 200f08aeb6812d59c19a70ea4d85c3ef22948870 Mon Sep 17 00:00:00 2001
From: Gabriel Sanches <gabriel@gsr.dev>
Date: Sat, 27 Mar 2021 18:28:06 -0300
Subject: [PATCH 0463/2024] circleci-cli: update to 0.1.15195.

This update provides shell completion for Bash and ZSH.

Commit information has been removed for ease of maintenance.

Closes: #29791 [via git-merge-pr]
---
 srcpkgs/circleci-cli/template | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/circleci-cli/template b/srcpkgs/circleci-cli/template
index f0eac722b454..1932703e601b 100644
--- a/srcpkgs/circleci-cli/template
+++ b/srcpkgs/circleci-cli/template
@@ -1,17 +1,21 @@
 # Template file for 'circleci-cli'
 pkgname=circleci-cli
-version=0.1.15108
+version=0.1.15195
 revision=1
 build_style=go
+build_helper=qemu
 go_import_path=github.com/CircleCI-Public/${pkgname}
-go_ldflags="-s -w -X github.com/CircleCI-Public/${pkgname}/version.Version=${version} -X github.com/CircleCI-Public/${pkgname}/version.Commit=cf6a918 -X github.com/CircleCI-Public/${pkgname}/version.packageManager=xbps"
+go_ldflags="-s -w
+ -X github.com/CircleCI-Public/${pkgname}/version.Version=${version}
+ -X github.com/CircleCI-Public/${pkgname}/version.packageManager=xbps"
 hostmakedepends="packr2"
 short_desc="Use CircleCI from the command line"
 maintainer="Gabriel Sanches <gabriel@gsr.dev>"
 license="MIT"
 homepage="https://circleci-public.github.io/circleci-cli/"
 distfiles="https://github.com/CircleCI-Public/${pkgname}/archive/v${version}.tar.gz"
-checksum=930bc37c181389cebbbcf9a2b836eb55f8c7ebcb9e853666ce5f4213b084a551
+checksum=c9f7bb5a81a173b4c87c9343c7bf12412f9e45ffa742478ffde74a9b10e879da
+_completions="bash zsh"
 
 pre_build() {
 	packr2
@@ -19,6 +23,12 @@ pre_build() {
 
 post_build() {
 	packr2 clean
+
+	# Generate completion for shells.
+	cli=$(find $GOPATH/bin -name $pkgname)
+	for shell in $_completions; do
+		vtargetrun $cli completion $shell > ${pkgname}.${shell}
+	done
 }
 
 post_install() {
@@ -26,4 +36,8 @@ post_install() {
 
 	# Rename the binary according to CircleCI's own releases.
 	mv ${DESTDIR}/usr/bin/circleci{-cli,}
+
+	for shell in $_completions; do
+		vcompletion ${pkgname}.${shell} $shell circleci
+	done
 }

From bc4e3523d1a5768580d0db9ed1281d83f371975c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 25 Mar 2021 22:12:33 +0200
Subject: [PATCH 0464/2024] opera: update to 75.0.3969.93.

Closes: #29755 [via git-merge-pr]
---
 srcpkgs/opera/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opera/template b/srcpkgs/opera/template
index d709282efc79..5b1abd449ce2 100644
--- a/srcpkgs/opera/template
+++ b/srcpkgs/opera/template
@@ -1,6 +1,6 @@
 # Template file for 'opera'
 pkgname=opera
-version=74.0.3911.75
+version=75.0.3969.93
 revision=1
 archs="x86_64"
 depends="ffmpeg desktop-file-utils hicolor-icon-theme"
@@ -9,7 +9,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="custom:Proprietary"
 homepage="https://www.opera.com/computer"
 distfiles="http://get.geo.opera.com/pub/opera/desktop/${version}/linux/${pkgname}-stable_${version}_amd64.deb"
-checksum=358e125db7e27e85582263c3ffa94a5c12c0b90c05e1811937a5e50276ecd83d
+checksum=0805334a1d236f44bfe9a34fa2fd829fe19587c480dd9559145a3a620e42fac8
 repository="nonfree"
 nostrip=yes
 

From 1e5c13c6a2c37f637e5425045f6da07d62ac43f7 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 26 Mar 2021 11:00:42 -0700
Subject: [PATCH 0465/2024] corkscrew: fix license, fix homepage

Since we are switching to a git tarball instead of a release tarball,
autoreconf becomes necessary.

Closes: #29764 [via git-merge-pr]
---
 srcpkgs/corkscrew/template | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/corkscrew/template b/srcpkgs/corkscrew/template
index a7c4327bc7da..39321f2f72c4 100644
--- a/srcpkgs/corkscrew/template
+++ b/srcpkgs/corkscrew/template
@@ -1,12 +1,16 @@
 # Template file for 'corkscrew'
 pkgname=corkscrew
 version=2.0
-revision=1
+revision=2
 build_style=gnu-configure
+hostmakedepends="automake"
 short_desc="Corkscrew is a tool for tunneling SSH through HTTP proxies"
 maintainer="pulux <pulux@pf4sh.de>"
-license="GPL-2"
-homepage="http://www.agroman.net/corkscrew/"
-#distfiles="http://agroman.net/corkscrew/$pkgname-$version.tar.gz"
-distfiles="https://ftp.heanet.ie/mirrors/OpenBSD/distfiles/corkscrew-${version}.tar.gz"
-checksum=0d0fcbb41cba4a81c4ab494459472086f377f9edb78a2e2238ed19b58956b0be
+license="GPL-2.0-or-later"
+homepage="https://github.com/bryanpkc/corkscrew"
+distfiles="https://github.com/bryanpkc/corkscrew/archive/refs/tags/v${version}.tar.gz"
+checksum=09d70daaa3145070a1e463dbab6ae1cbc62449b1e09c94e158f6017e7c79c9f6
+
+pre_configure() {
+	autoreconf -fi
+}

From c88595e2e41c0e01e435f79166b428e419821358 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 24 Mar 2021 20:58:03 -0700
Subject: [PATCH 0466/2024] avr-gcc: fix license

Closes: #29753 [via git-merge-pr]
---
 srcpkgs/avr-gcc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/avr-gcc/template b/srcpkgs/avr-gcc/template
index bf65e60bf13d..093c66c9dbe4 100644
--- a/srcpkgs/avr-gcc/template
+++ b/srcpkgs/avr-gcc/template
@@ -1,11 +1,11 @@
 # Template file for 'avr-gcc'
 pkgname=avr-gcc
 version=9.3.0
-revision=1
+revision=2
 wrksrc="gcc-$version"
 short_desc="GNU C Compiler for AVR"
 maintainer="allan <mail@may.mooo.com>"
-license="GFDL-1.2, GPL-3, LGPL-2.1"
+license="GFDL-1.3-or-later, GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later, GCC-exception-3.1"
 homepage="http://gcc.gnu.org"
 distfiles="${GNU_SITE}/gcc/gcc-${version}/gcc-${version}.tar.xz"
 checksum=71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1

From 1d0c61a5747d946db6467fce9f0f0435789f49f2 Mon Sep 17 00:00:00 2001
From: David Flatz <david@upcs.at>
Date: Thu, 25 Mar 2021 11:13:56 +0100
Subject: [PATCH 0467/2024] synapse: update to 1.30.1.

Closes: #29746 [via git-merge-pr]
---
 srcpkgs/synapse/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index 98cef830f2c3..f4452df2997d 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.29.0
+version=1.30.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -19,7 +19,7 @@ license="Apache-2.0"
 homepage="https://github.com/matrix-org/synapse"
 changelog="https://raw.githubusercontent.com/matrix-org/synapse/develop/CHANGES.md"
 distfiles="https://github.com/matrix-org/synapse/archive/v${version}.tar.gz"
-checksum=01650226eabe9dbf04e01a457aafb8d6b147707b4d764d18692bde1786d608f3
+checksum=8c93abb1ed84c1f383d6179fdd74f7afec56b15401073e12f4a7a5a4ef75849a
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"

From f378b2c1602fd68081379888a36390ddd4d62071 Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Wed, 24 Mar 2021 10:37:16 -0400
Subject: [PATCH 0468/2024] python3-pygame: update to 2.0.1.

---
 srcpkgs/python3-pygame/template | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/python3-pygame/template b/srcpkgs/python3-pygame/template
index c136b750713d..80ed8b637837 100644
--- a/srcpkgs/python3-pygame/template
+++ b/srcpkgs/python3-pygame/template
@@ -1,24 +1,19 @@
 # Template file for 'python3-pygame'
 pkgname=python3-pygame
-version=1.9.6
-revision=4
+version=2.0.1
+revision=1
 wrksrc="pygame-${version}"
 build_style=python3-module
 make_build_args="cython"
 hostmakedepends="pkg-config python3-setuptools python3-Cython
- SDL_mixer-devel SDL_image-devel SDL_ttf-devel libjpeg-turbo-devel portmidi-devel"
-makedepends="python3-devel SDL_mixer-devel SDL_image-devel
- SDL_ttf-devel libjpeg-turbo-devel portmidi-devel"
+ SDL2_mixer-devel SDL2_image-devel SDL2_ttf-devel libjpeg-turbo-devel portmidi-devel"
+makedepends="python3-devel SDL2_mixer-devel SDL2_image-devel
+ SDL2_ttf-devel libjpeg-turbo-devel portmidi-devel"
 short_desc="Collection of Python modules for writing games (Python3)"
 maintainer="Archaeme <normandy@firemail.cc>"
 license="LGPL-2.1-or-later"
 homepage="https://www.pygame.org/"
 distfiles="${PYPI_SITE}/p/pygame/pygame-${version}.tar.gz"
-checksum=301c6428c0880ecd4a9e3951b80e539c33863b6ff356a443db1758de4f297957
+checksum=8b1e7b63f47aafcdd8849933b206778747ef1802bd3d526aca45ed77141e4001
 
 export PORTMIDI_INC_PORTTIME=1
-
-pre_build() {
-	# Remove the C source to re-cythonize, which avoids some API changes
-	rm src_c/pypm.c src_c/_sdl2/{sdl2,audio,video}.c
-}

From e527df1c8169ef028ff44e7527a5dcbc254061dc Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Wed, 24 Mar 2021 10:37:19 -0400
Subject: [PATCH 0469/2024] python3-pgzero: update to 1.2.1.

Closes: #29720 [via git-merge-pr]
---
 srcpkgs/python3-pgzero/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-pgzero/template b/srcpkgs/python3-pgzero/template
index ee3e285ca08a..b9be3f993aff 100644
--- a/srcpkgs/python3-pgzero/template
+++ b/srcpkgs/python3-pgzero/template
@@ -1,10 +1,9 @@
 # Template file for 'python3-pgzero'
 pkgname=python3-pgzero
-version=1.2
-revision=3
+version=1.2.1
+revision=1
 wrksrc="pgzero-${version}"
 build_style=python3-module
-pycompile_module="pgzero pgzrun.py"
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-pygame python3-numpy"
 short_desc="Zero-boilerplate games programming framework based on Pygame (Python3)"
@@ -12,4 +11,5 @@ maintainer="Peter Bui <pbui@github.bx612.space>"
 license="LGPL-3.0-or-later"
 homepage="https://pygame-zero.readthedocs.io/en/stable/"
 distfiles="${PYPI_SITE}/p/pgzero/pgzero-${version}.tar.gz"
-checksum=91e641d545c6235a24719dea0fd83c8429e92a8b5ab1756bef145128e8db9017
+checksum=8cadc020f028cbac3e0cbd3bb9311a1c045f1deedac7917ff433f986c38e6106
+make_check=no # Tests require video device

From a5223e68ec38608002c49e5e84dec96d46a985fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Mon, 22 Mar 2021 23:18:57 +0100
Subject: [PATCH 0470/2024] tarpaulin: update to 0.17.0.

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

diff --git a/srcpkgs/tarpaulin/template b/srcpkgs/tarpaulin/template
index 56fceeb4c436..1c95f61183f4 100644
--- a/srcpkgs/tarpaulin/template
+++ b/srcpkgs/tarpaulin/template
@@ -1,9 +1,10 @@
 # Template file for 'tarpaulin'
 pkgname=tarpaulin
-version=0.14.3
-revision=2
+version=0.17.0
+revision=1
 archs="x86_64*"
 build_style=cargo
+make_check_args="-- --test-threads 1"
 hostmakedepends="pkg-config cmake"
 makedepends="openssl-devel zlib-devel"
 short_desc="Code coverage tool for Rust/Cargo projects"
@@ -11,7 +12,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"
 homepage="https://github.com/xd009642/tarpaulin"
 distfiles="https://github.com/xd009642/tarpaulin/archive/${version}.tar.gz"
-checksum=f1624dac8124420cf921fc81d9b7fd513f116362d83abe0bcbd7d91fd4af952f
+checksum=54b282eedf4bcf67c3ec63bec8ae7d995efc1c398cd8e6d5c78ab85bfd5f3ade
 
 post_install() {
 	vlicense LICENSE-MIT

From 66095e572aedc73df157c163d004a56d5aa171e5 Mon Sep 17 00:00:00 2001
From: Corey Thomas <cthomas@oisf.net>
Date: Mon, 22 Mar 2021 23:02:10 -0400
Subject: [PATCH 0471/2024] mupen64plus: update to 2.5.9

Closes: #29692 [via git-merge-pr]
---
 srcpkgs/mupen64plus/template | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/mupen64plus/template b/srcpkgs/mupen64plus/template
index 0323d321803c..f0e6fe2c4173 100644
--- a/srcpkgs/mupen64plus/template
+++ b/srcpkgs/mupen64plus/template
@@ -1,18 +1,19 @@
 # Template file for 'mupen64plus'
 pkgname=mupen64plus
-version=2.5
-revision=13
+version=2.5.9
+revision=1
+nocross="yes"
 wrksrc="mupen64plus-bundle-src-${version}"
-hostmakedepends="pkg-config which"
+hostmakedepends="pkg-config which nasm"
 makedepends="boost-devel SDL2-devel speexdsp-devel freetype-devel glu-devel libpng-devel libsamplerate-devel"
 depends="desktop-file-utils"
-short_desc="A Nintendo64 Emulator"
+short_desc="Nintendo64 Emulator"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="http://www.mupen64plus.org"
 distfiles="https://github.com/mupen64plus/mupen64plus-core/releases/download/${version}/${pkgname}-bundle-src-${version}.tar.gz"
-checksum=9c75b9d826f2d24666175f723a97369b3a6ee159b307f7cc876bbb4facdbba66
-archs="i686* x86_64*"
+checksum=d5243ddc00388ee2e538b3826a78a719dec2bd5da54ac6f3344fed861fb141a8
+nopie=yes
 
 CFLAGS="-fcommon"
 

From a280636e84162f4b19e9e180d95693123c37c4fe Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Sun, 4 Apr 2021 23:31:03 +0300
Subject: [PATCH 0472/2024] exa: update to 0.10.0; adopt

---
 srcpkgs/exa/template | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/exa/template b/srcpkgs/exa/template
index 5ea748de3627..ea3ad487fa43 100644
--- a/srcpkgs/exa/template
+++ b/srcpkgs/exa/template
@@ -1,21 +1,30 @@
 # Template file for 'exa'
 pkgname=exa
-version=0.9.0
-revision=2
+version=0.10.0
+revision=1
 build_style=cargo
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config libgit2-devel"
 makedepends="libgit2-devel"
 short_desc="Modern replacement for ls"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="FollieHiyuki <folliekazetani@protonmail.com>"
 license="MIT"
 homepage="https://the.exa.website/"
-distfiles="https://github.com/ogham/exa/archive/v${version}.tar.gz"
-checksum=@facbe3b234f403e1e1919f28f009f1733a0fbbbb11f0bc2ba89ac3eba11bc5e8
+distfiles="https://github.com/ogham/exa/archive/v${version}.tar.gz
+ https://github.com/ogham/exa/releases/download/v${version}/exa-accoutrements-v${version}.zip"
+checksum="27420f7b805941988399d63f388be4f6077eee94a505bf01c2fb0e7d15cbf78d
+ c1ab340af63e64bc3fd854c03f6161aa240a533e928688036a7d4544aecabc05"
+
+post_extract() {
+	mkdir -p accoutrements
+	mv ../man accoutrements/
+	mv ../completions accoutrements/
+}
 
 post_install() {
-	vman contrib/man/exa.1
-	vcompletion contrib/completions.bash bash
-	vcompletion contrib/completions.fish fish
-	vcompletion contrib/completions.zsh zsh
+	vman accoutrements/man/exa.1
+	vman accoutrements/man/exa_colors.5
+	vcompletion completions/completions.bash bash
+	vcompletion completions/completions.fish fish
+	vcompletion completions/completions.zsh zsh
 	vlicense LICENCE
 }

From 1eef3ee2204a132e10d7127cf4ee3f99d7656b71 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 12:54:23 -0700
Subject: [PATCH 0473/2024] badvpn: fix license, add changelog

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

diff --git a/srcpkgs/badvpn/template b/srcpkgs/badvpn/template
index 3b35580d8b34..048186d81cfb 100644
--- a/srcpkgs/badvpn/template
+++ b/srcpkgs/badvpn/template
@@ -1,16 +1,21 @@
 # Template file for 'badvpn'
 pkgname=badvpn
 version=1.999.130
-revision=13
+revision=14
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="openssl-devel nspr-devel nss-devel"
 short_desc="Peer-to-peer VPN system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="BSD"
-homepage="https://github.com/ambrop72/$pkgname"
+license="BSD-3-Clause"
+homepage="https://github.com/ambrop72/badvpn"
+changelog="https://raw.githubusercontent.com/ambrop72/badvpn/master/ChangeLog"
 distfiles="https://github.com/ambrop72/$pkgname/archive/${version}.tar.gz"
 checksum=bfd4bbfebd7274bcec792558c9a2fd60e39cd92e04673825ade5d04154766109
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) configure_args="-DBUILD_NCD=0" ;;
 esac
+
+post_install() {
+	vlicense COPYING
+}

From 50afb6e33fe2b0ca82c532bd7e1830c860af20c7 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 13:22:28 -0700
Subject: [PATCH 0474/2024] bam: fix license

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

diff --git a/srcpkgs/bam/template b/srcpkgs/bam/template
index 5913d7fd5ec3..53c8c50740c4 100644
--- a/srcpkgs/bam/template
+++ b/srcpkgs/bam/template
@@ -1,11 +1,11 @@
 # Template file for 'bam'
 pkgname=bam
 version=0.5.1
-revision=3
+revision=4
 makedepends="lua53-devel"
 short_desc="Fast and flexible build system using Lua"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="custom"
+license="Zlib, MIT"
 homepage="http://github.com/matricks/bam"
 distfiles="https://github.com/matricks/bam/archive/v${version}.tar.gz"
 checksum=cc8596af3325ecb18ebd6ec2baee550e82cb7b2da19588f3f843b02e943a15a9

From ece67adb0bf30124aa43cf0b878b352cdd491939 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 13:37:57 -0700
Subject: [PATCH 0475/2024] banner: fix license

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

diff --git a/srcpkgs/banner/template b/srcpkgs/banner/template
index 08a21fae58c6..d7d0dbf414c6 100644
--- a/srcpkgs/banner/template
+++ b/srcpkgs/banner/template
@@ -1,11 +1,11 @@
 # Template file for 'banner'
 pkgname=banner
 version=1.2
-revision=5
+revision=6
 build_style=gnu-configure
 short_desc="Prints ASCII banners"
 maintainer="allan <mail@may.mooo.com>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://www.moria.de/~michael/comp/banner"
 distfiles="http://www.moria.de/~michael/comp/banner/banner-${version}.tar.gz"
 checksum=84828f417e6139733cff98c8bb4765a70070352ab7d471ecd1f54d8fa8a9f746

From 9583f02da143f584213393f737ef937d9ef12599 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 13:53:00 -0700
Subject: [PATCH 0476/2024] batman-adv14: fix license

GPL-2.0-only is a best guess based on a lack of "... or newer" in the
source file licensing comment and there not being a COPYING or LICENSE
(or equivalent) file with the source.
---
 srcpkgs/batman-adv14/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/batman-adv14/template b/srcpkgs/batman-adv14/template
index e5f3028dc49e..8fb35827056a 100644
--- a/srcpkgs/batman-adv14/template
+++ b/srcpkgs/batman-adv14/template
@@ -1,16 +1,16 @@
 # Template file for 'batman-adv14'
 pkgname=batman-adv14
 version=2013.4.0
-revision=8
+revision=9
+wrksrc="batman-adv-$version"
 short_desc="B.A.T.M.A.N. routing protocol kernel module (protocol version 14)"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="http://www.open-mesh.org/"
 distfiles="http://downloads.open-mesh.org/batman/releases/batman-adv-${version}/batman-adv-${version}.tar.gz"
 checksum=a9b1b7542c94cc6bf7c97b7b0d02bf071b5632a64480ae419358b9cb9cab6870
-conflicts="batman-adv>=0"
-wrksrc="batman-adv-$version"
 provides="batman-adv-${version}_${revision}"
+conflicts="batman-adv>=0"
 
 dkms_modules="batman-adv14 ${version}"
 depends="dkms"

From 2a85b48bdbd50e580d04eb099d016422fed77da7 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 14:01:10 -0700
Subject: [PATCH 0477/2024] bchunk: fix license

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

diff --git a/srcpkgs/bchunk/template b/srcpkgs/bchunk/template
index 9476ef42e3d1..602ea4856227 100644
--- a/srcpkgs/bchunk/template
+++ b/srcpkgs/bchunk/template
@@ -1,11 +1,11 @@
 # Template file for 'bchunk'
 pkgname=bchunk
 version=1.2.2
-revision=1
+revision=2
+short_desc="Convert a CD image in a .bin/.cue format to .iso and .cdr tracks"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://he.fi/bchunk/"
-short_desc="Convert a CD image in a .bin/.cue format to .iso and .cdr tracks"
 distfiles="http://he.fi/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=e7d99b5b60ff0b94c540379f6396a670210400124544fb1af985dd3551eabd89
 

From e3b36e8adadf38ab9ff903de321893149e80bb8b Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 14:03:30 -0700
Subject: [PATCH 0478/2024] bdf2sfd: fix license

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

diff --git a/srcpkgs/bdf2sfd/template b/srcpkgs/bdf2sfd/template
index 1d3f7b463160..fdccefbc7534 100644
--- a/srcpkgs/bdf2sfd/template
+++ b/srcpkgs/bdf2sfd/template
@@ -1,11 +1,11 @@
 # Template file for 'bdf2sfd'
 pkgname=bdf2sfd
 version=1.1.6
-revision=1
+revision=2
 build_style=cmake
 short_desc="BDF to SFD converter to vectorize bitmap fonts"
 maintainer="Duncaen <duncaen@voidlinux.org>"
-license="BSD-2-clause"
+license="BSD-2-Clause"
 homepage="https://github.com/fcambus/bdf2sfd"
 changelog="https://github.com/fcambus/bdf2sfd/raw/master/ChangeLog"
 distfiles="https://github.com/fcambus/bdf2sfd/archive/${version}.tar.gz"

From d10e00fb9bb3a5f17390a4a114abc0e97ef610dd Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 14:06:34 -0700
Subject: [PATCH 0479/2024] beep: fix license

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

diff --git a/srcpkgs/beep/template b/srcpkgs/beep/template
index 91724238f8a1..0f3c10d9781f 100644
--- a/srcpkgs/beep/template
+++ b/srcpkgs/beep/template
@@ -1,13 +1,13 @@
 # Template file for 'beep'
 pkgname=beep
 version=1.3
-revision=5
+revision=6
 build_style=gnu-makefile
 make_build_args="beep"
+depends="libcap-progs"
 short_desc="Beep music composer"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="GPL-3"
-depends="libcap-progs"
+license="GPL-2.0-or-later"
 homepage="http://www.johnath.com/beep/"
 distfiles="http://www.johnath.com/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=59acef7a987de5557cefd1a904666cc2691f132929af39e65450b182a581ec2d

From 38cfb985f0741e53f12aab098c1adc6f601eb34f Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 14:16:31 -0700
Subject: [PATCH 0480/2024] bitchx: fix license

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

diff --git a/srcpkgs/bitchx/template b/srcpkgs/bitchx/template
index f4746e263f89..450fde27deed 100644
--- a/srcpkgs/bitchx/template
+++ b/srcpkgs/bitchx/template
@@ -1,13 +1,13 @@
 # Template file for 'bitchx'
 pkgname=bitchx
 version=1.2.1
-revision=16
+revision=17
 build_style=gnu-configure
 configure_args="--with-ssl --with-ipv6 --with-plugins"
 makedepends="openssl-devel ncurses-devel"
-short_desc="A simple IRC client (Internet Relay Chat)"
+short_desc="Simple IRC client (Internet Relay Chat)"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="3-clause-BSD"
+license="BSD-3-Clause"
 homepage="http://bitchx.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=2d270500dd42b5e2b191980d584f6587ca8a0dbda26b35ce7fadb519f53c83e2
@@ -15,3 +15,7 @@ checksum=2d270500dd42b5e2b191980d584f6587ca8a0dbda26b35ce7fadb519f53c83e2
 disable_parallel_build=yes
 
 CFLAGS="-fcommon"
+
+post_install() {
+	vlicense COPYRIGHT
+}

From 015eb380bdb1a2de42208c8255821a4b3fde34ae Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 14:21:34 -0700
Subject: [PATCH 0481/2024] bitlbee-steam: fix license

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

diff --git a/srcpkgs/bitlbee-steam/template b/srcpkgs/bitlbee-steam/template
index c6c2790f0af0..9f7a8b645fb8 100644
--- a/srcpkgs/bitlbee-steam/template
+++ b/srcpkgs/bitlbee-steam/template
@@ -1,13 +1,13 @@
 # Template file for 'bitlbee-steam'
 pkgname=bitlbee-steam
 version=1.4.2
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config automake libtool"
 makedepends="bitlbee-devel"
 short_desc="Steam protocol plugin for BitlBee"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://github.com/jgeboski/bitlbee-steam"
 distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=fced6878906e14d96f899d362620de17c41a7fb84c2460068a9c08fc6904de38

From b75a561fdd696709ff073306e21d1dc128895240 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 14:23:36 -0700
Subject: [PATCH 0482/2024] bridge-utils: fix license

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

diff --git a/srcpkgs/bridge-utils/template b/srcpkgs/bridge-utils/template
index 969d5902ecb8..08827cd6ad58 100644
--- a/srcpkgs/bridge-utils/template
+++ b/srcpkgs/bridge-utils/template
@@ -1,16 +1,16 @@
 # Template file for 'bridge-utils'
 pkgname=bridge-utils
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--sbindir=/usr/bin"
 hostmakedepends="automake"
 short_desc="Layer2 ethernet bridging for Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://www.linuxfoundation.org/collaborate/workgroups/networking/bridge"
 distfiles="${KERNEL_SITE}/utils/net/bridge-utils/bridge-utils-${version}.tar.xz"
 checksum=cc67efb5d5fb8928a6569b3fade2b4042ec17da04678dab127d96b46489e26c8
-configure_args="--sbindir=/usr/bin"
 
 pre_configure() {
 	sed "s/u_int\([0-9]*\)_t/uint\1_t/" -i libbridge/libbridge.h

From e13a5c24eee22801c3dd7d6f8c6f6ce48a2b144a Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 14:26:09 -0700
Subject: [PATCH 0483/2024] broadcom-bt-firmware: fix license

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

diff --git a/srcpkgs/broadcom-bt-firmware/template b/srcpkgs/broadcom-bt-firmware/template
index 2345f00f7a56..93314460c88b 100644
--- a/srcpkgs/broadcom-bt-firmware/template
+++ b/srcpkgs/broadcom-bt-firmware/template
@@ -1,13 +1,13 @@
 # Template file for 'broadcom-bt-firmware'
 pkgname=broadcom-bt-firmware
 version=12.0.1.1105
-revision=2
+revision=3
 _patch=_p1
 wrksrc="${pkgname}-${version}${_patch}"
 hostmakedepends="perl"
 short_desc="Broadcom Bluetooth firmware for Linux kernel"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
-license="Custom"
+license="custom:Broadcom"
 homepage="https://github.com/winterheart/broadcom-bt-firmware"
 distfiles="https://github.com/winterheart/broadcom-bt-firmware/archive/v${version}${_patch}.tar.gz"
 checksum=df1bbbdac950f99b33d797236c7f91696f2f12a52d5682af6e9fb686b410d0c8

From 8668db60579d5c645a07ce29506703a7ef036b36 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 21:33:57 -0700
Subject: [PATCH 0484/2024] bsdunzip: fix license

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

diff --git a/srcpkgs/bsdunzip/template b/srcpkgs/bsdunzip/template
index fe26c540d5f1..e6ac1e4a369f 100644
--- a/srcpkgs/bsdunzip/template
+++ b/srcpkgs/bsdunzip/template
@@ -1,12 +1,12 @@
 # Template file for 'bsdunzip'
 pkgname=bsdunzip
 version=20160115
-revision=1
+revision=2
 build_style=gnu-makefile
 makedepends="libarchive-devel"
 short_desc="Libarchive(3)-utilizing unzip implementation from FreeBSD"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD, ISC"
+license="BSD-2-Clause, ISC"
 homepage="https://github.com/somasis/bsdunzip"
 distfiles="https://github.com/somasis/bsdunzip/archive/${version}.tar.gz"
 checksum=06c52c77fa518732665aa2daa73f364cd2470a5d47a83c9c79f86f207cf3ecc1

From 0137b6e3a7b5331ab32468f1c4706d0866dcc37b Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 21:43:54 -0700
Subject: [PATCH 0485/2024] bti: fix license

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

diff --git a/srcpkgs/bti/template b/srcpkgs/bti/template
index 174b9c4139d5..a914e9e75d60 100644
--- a/srcpkgs/bti/template
+++ b/srcpkgs/bti/template
@@ -1,14 +1,14 @@
 # Template file for 'bti'
 pkgname=bti
 version=034
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="pcre-devel libxml2-devel libcurl-devel json-c-devel liboauth-devel"
 depends="bash wget"
 short_desc="Console client for Twitter and identi.ca"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="http://gregkh.github.com/bti/"
 distfiles="https://www.kernel.org/pub/software/web/bti/bti-${version}.tar.xz"
 checksum=8b4a1a11f529f83956468acadaea9d11db4f03e82afe07fecb84b2d00e9eae83

From f009d2b8de37066aa240eacf8dedd1ba5ecdafb6 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 21:44:07 -0700
Subject: [PATCH 0486/2024] buffer: fix license

Closes: #29760 [via git-merge-pr]
---
 srcpkgs/buffer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/buffer/template b/srcpkgs/buffer/template
index 9e4c738ea186..df0fb0c0c640 100644
--- a/srcpkgs/buffer/template
+++ b/srcpkgs/buffer/template
@@ -1,13 +1,13 @@
 # Template file for 'buffer'
 pkgname=buffer
 version=2014.11.26
-revision=2
+revision=3
 _gitrev=2b58f5b78f7511b4d4e2eb0e9f8b0af16dea3985
 wrksrc=${pkgname}-${_gitrev}
 build_style=gnu-makefile
 short_desc="Speed up writing tapes on remote tape drives"
 maintainer="jbu <pullmoll@t-online.de>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://github.com/scotte/buffer"
 distfiles="https://github.com/scotte/buffer/archive/${_gitrev}.tar.gz>${pkgname}-${version}.tar.gz"
 checksum=14a881fcd070b1dcd8ec91d8d036f22094c22ac3769c274f0d7d6799038a73c3

From a4c4db0ff98f73e1351c8fff9fc3de7a31b73135 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sat, 20 Mar 2021 14:23:56 +0100
Subject: [PATCH 0487/2024] instead: update to 3.3.4, drop gtk3 and sdl2 build
 option

Both are enabled by default in upstream.

Closes: #29628 [via git-merge-pr]
---
 srcpkgs/instead/template | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/instead/template b/srcpkgs/instead/template
index 81b5e1b39d28..66800783564b 100644
--- a/srcpkgs/instead/template
+++ b/srcpkgs/instead/template
@@ -1,23 +1,17 @@
 # Template file for 'instead'
 pkgname=instead
-version=3.3.2
+version=3.3.4
 revision=1
 build_style=cmake
-configure_args="-DWITH_SDL2=$(vopt_if sdl2 ON OFF)
- -DWITH_GTK3=$(vopt_if gtk3 ON OFF)"
-makedepends="lua51-devel $(vopt_if gtk3 'gtk+3-devel' 'gtk+-devel')
- $(vopt_if sdl2 'SDL2_image-devel SDL2_mixer-devel
- SDL2_ttf-devel' 'SDL_image-devel SDL_mixer-devel SDL_ttf-devel')"
+hostmakedepends="pkg-config"
+makedepends="lua51-devel gtk+3-devel SDL2_image-devel SDL2_mixer-devel SDL2_ttf-devel"
 short_desc="Interactive fiction interpreter"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://instead-hub.github.io"
 changelog="https://raw.githubusercontent.com/instead-hub/instead/master/ChangeLog"
 distfiles="https://github.com/instead-hub/instead/releases/download/${version}/instead_${version}.tar.gz"
-checksum=bb98f6903291bcc40fb06f2203ab8e05272ec84fded412482b6faa54bea3a90b
-
-build_options="gtk3 sdl2"
-build_options_default="sdl2"
+checksum=ff705290646b764a189f08e852deee82baa56f467f5f3fe9e687df81c3c819d6
 
 post_install() {
 	vlicense COPYING

From 5229eaf441dc26018500f7969555195780533b77 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Tue, 23 Mar 2021 21:02:24 +0300
Subject: [PATCH 0488/2024] starship: update to 0.51.0

Closes: #29705 [via git-merge-pr]
---
 srcpkgs/starship/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/starship/template b/srcpkgs/starship/template
index 9362f5664cba..f7e0d45bd71b 100644
--- a/srcpkgs/starship/template
+++ b/srcpkgs/starship/template
@@ -1,7 +1,7 @@
 # Template file for 'starship'
 pkgname=starship
-version=0.50.0
-revision=2
+version=0.51.0
+revision=1
 build_style=cargo
 build_helper=qemu
 hostmakedepends="pkg-config libgit2-devel"
@@ -12,7 +12,7 @@ maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
 license="ISC"
 homepage="https://starship.rs"
 distfiles="https://github.com/starship/starship/archive/v${version}.tar.gz"
-checksum=d8f4dc9bd266f2a5c34926d361c62fdddb61cd7da4acadba5f9c175eb07602e5
+checksum=87a9e2ad206a7397e52e00a0a650d364ca2ea941cb9fbe75704d56a43f11cef9
 
 post_build() {
 	STARSHIP="target/${RUST_TARGET}/release/starship"

From 9b6668ce29e6991fed072321c055b0a22c0ee075 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Mon, 5 Apr 2021 02:46:19 +0300
Subject: [PATCH 0489/2024] font-iosevka: update to 5.2.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 521d9ab3b5ff..41f0e6194abf 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.1.1
+version=5.2.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
- d5025d8cc1e969fa2364d28f08a82478a839788ceb7d41d10367c25cbf79ca6b
- 80c1d9ea390414e645efadc9fd6792d8e05be8a983c2add505ae1b62c963ec8b"
+ c160178621f7c2943b3c00b2f33146e5c0b7945cecfb5008bd8f80aa5f1946bc
+ f12ad8fe3a1ccb398302456154107420b0411fc039993a5966b36dc43f361435"
 
 font_dirs="/usr/share/fonts/TTF"
 

From b17c06d375bd8db25f7f3299a00c2e5c4a7124f3 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Mon, 5 Apr 2021 02:49:03 +0300
Subject: [PATCH 0490/2024] font-sarasa-gothic: update to 0.21.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 b65ac762e51e..ed3628dd230f 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.2
+version=0.21.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=8d29448e685fdc56b824133d51c295bbc5056c40ff6c624927f45032472f8be1
+checksum=cfe1b519e1272fd2b1d069007456001c489b16f923d2b6356b102af471857c83
 
 font_dirs="/usr/share/fonts/TTF"
 

From 792fb5af5393d6ea9ac0daafb21916855ca49af3 Mon Sep 17 00:00:00 2001
From: Brad Ackerman <brad@facefault.org>
Date: Sat, 3 Apr 2021 21:37:47 -0700
Subject: [PATCH 0491/2024] fpc: add ppc64le support

Closes https://github.com/void-linux/void-packages/pull/29986.
---
 srcpkgs/fpc/template | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/fpc/template b/srcpkgs/fpc/template
index 7cf3e9adffe6..876b3587ec17 100644
--- a/srcpkgs/fpc/template
+++ b/srcpkgs/fpc/template
@@ -2,7 +2,7 @@
 pkgname=fpc
 version=3.2.0
 revision=1
-archs="x86_64* i686*"
+archs="x86_64* i686* ppc64le"
 create_wrksrc=yes
 build_wrksrc="${pkgname}build-${version}"
 conf_files="/etc/fpc.cfg /etc/fppkg.cfg"
@@ -23,6 +23,9 @@ i686*)
 	distfiles+=" ${SOURCEFORGE_SITE}/freepascal/Linux/${version}/${pkgname}-${version}-1.i686.rpm"
 	checksum+=" 05c5600c9461362a08df100cf50ca125cb2b4d5bfe4da48cf8c144f2bf4617a2"
 	;;
+ppc64le*)
+	distfiles+=" ${SOURCEFORGE_SITE}/freepascal/Linux/${version}/${pkgname}-${version}.powerpc64le-linux.tar"
+	checksum+=" 9bf59ae3d336f0de4624c63e4e892ea95de4be2ca66182d185defc50b69b65f3"
 esac
 # TODO: figure out cross-build and how to unwrap the ARM .tar.
 nocross=yes
@@ -30,9 +33,25 @@ nopie=yes
 noverifyrdeps=yes
 
 post_extract() {
-	# relative links needed
-	ln -sf ../lib64/fpc/${version}/ppcx64 usr/bin
-	ln -sf ../lib/fpc/${version}/ppc386 usr/bin
+	# extract recursive tar files or otherwise post-process.
+	case "$XBPS_TARGET_MACHINE" in
+	ppc64le*)
+		mkdir ${wrksrc}/usr
+		cd ${wrksrc}/${pkgname}-${version}.powerpc64-linux
+		for f in $(bsdtar -tf binary.powerpc64-linux.tar)
+		do
+			bsdtar -xOf binary.powerpc64-linux.tar $f | bsdtar -C ${wrksrc}/usr -xzf -
+		done
+		cd ${wrksrc}
+		ln -sf ../lib/fpc/${version}/ppcppc64 usr/bin
+		;;
+	x86_64*|i686*)
+		# relative links needed
+		ln -sf ../lib64/fpc/${version}/ppcx64 usr/bin
+		ln -sf ../lib/fpc/${version}/ppc386 usr/bin
+		;;
+	esac
+
 
 	# tweak PT_INTERP for musl targets
 	case "$XBPS_TARGET_MACHINE" in

From 050e7e2d106e6d09f073340b6e19394a9d1150f7 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 5 Apr 2021 01:53:25 +0200
Subject: [PATCH 0492/2024] fpc: also add support fpr ppc64 and ppc

---
 srcpkgs/fpc/patches/ppc64.patch | 25 +++++++++++++++++++++++++
 srcpkgs/fpc/template            | 24 ++++++++++++++++++------
 2 files changed, 43 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/fpc/patches/ppc64.patch

diff --git a/srcpkgs/fpc/patches/ppc64.patch b/srcpkgs/fpc/patches/ppc64.patch
new file mode 100644
index 000000000000..624f6cdc0fbf
--- /dev/null
+++ b/srcpkgs/fpc/patches/ppc64.patch
@@ -0,0 +1,25 @@
+commit 5120237db67c066764563df36fcf171699ff7c6f
+Author: q66 <daniel@octaforge.org>
+Date:   Mon Apr 5 01:50:14 2021 +0200
+
+    always use elfv2 abi by default on ppc64
+
+diff --git fpcsrc/compiler/options.pas fpcsrc/compiler/options.pas
+index 2cc36670..c35cc785 100644
+--- fpcbuild-3.2.0/fpcsrc/compiler/options.pas
++++ fpcbuild-3.2.0/fpcsrc/compiler/options.pas
+@@ -4299,13 +4299,8 @@ begin
+      likely to fail in spectacular ways" }
+   if not option.ABISetExplicitly then
+     begin
+-      if (target_info.abi=abi_powerpc_sysv) and
+-         (target_info.endian=endian_little) then
++      if (target_info.abi=abi_powerpc_sysv) then
+         target_info.abi:=abi_powerpc_elfv2
+-      else
+-        if (target_info.abi=abi_powerpc_elfv2) and
+-         (target_info.endian=endian_big) then
+-        target_info.abi:=abi_powerpc_sysv
+     end;
+ {$endif}
+ 
diff --git a/srcpkgs/fpc/template b/srcpkgs/fpc/template
index 876b3587ec17..7967b25165b1 100644
--- a/srcpkgs/fpc/template
+++ b/srcpkgs/fpc/template
@@ -2,7 +2,7 @@
 pkgname=fpc
 version=3.2.0
 revision=1
-archs="x86_64* i686* ppc64le"
+archs="x86_64* i686* ppc64le ppc64 ppc"
 create_wrksrc=yes
 build_wrksrc="${pkgname}build-${version}"
 conf_files="/etc/fpc.cfg /etc/fppkg.cfg"
@@ -26,6 +26,15 @@ i686*)
 ppc64le*)
 	distfiles+=" ${SOURCEFORGE_SITE}/freepascal/Linux/${version}/${pkgname}-${version}.powerpc64le-linux.tar"
 	checksum+=" 9bf59ae3d336f0de4624c63e4e892ea95de4be2ca66182d185defc50b69b65f3"
+	;;
+ppc64*)
+	distfiles+=" ${SOURCEFORGE_SITE}/freepascal/Linux/${version}/${pkgname}-${version}.powerpc64-linux.tar"
+	checksum+=" b7700e126ae37f32ee03c6113c4d07c8b97e451022419387a1da7744dfaa7e25"
+	;;
+ppc*)
+	distfiles+=" ${SOURCEFORGE_SITE}/freepascal/Linux/${version}/${pkgname}-${version}.powerpc-linux.tar"
+	checksum+=" cd35d8f520ddcd3020862658b9a5273724dbaab1e265d5e227cefb59173de81d"
+	;;
 esac
 # TODO: figure out cross-build and how to unwrap the ARM .tar.
 nocross=yes
@@ -35,15 +44,18 @@ noverifyrdeps=yes
 post_extract() {
 	# extract recursive tar files or otherwise post-process.
 	case "$XBPS_TARGET_MACHINE" in
-	ppc64le*)
+	ppc*)
+		case "$XBPS_TARGET_MACHINE" in
+			ppc64*) PPC_SUFFIX="64";;
+		esac
 		mkdir ${wrksrc}/usr
-		cd ${wrksrc}/${pkgname}-${version}.powerpc64-linux
-		for f in $(bsdtar -tf binary.powerpc64-linux.tar)
+		cd ${wrksrc}/${pkgname}-${version}.powerpc${PPC_SUFFIX}-linux
+		for f in $(bsdtar -tf binary.powerpc${PPC_SUFFIX}-linux.tar)
 		do
-			bsdtar -xOf binary.powerpc64-linux.tar $f | bsdtar -C ${wrksrc}/usr -xzf -
+			bsdtar -xOf binary.powerpc${PPC_SUFFIX}-linux.tar $f | bsdtar -C ${wrksrc}/usr -xzf -
 		done
 		cd ${wrksrc}
-		ln -sf ../lib/fpc/${version}/ppcppc64 usr/bin
+		ln -sf ../lib/fpc/${version}/ppcppc${PPC_SUFFIX} usr/bin
 		;;
 	x86_64*|i686*)
 		# relative links needed

From 5d7d29ead538ec7ec7f23e0df4198c1a602dc704 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 5 Apr 2021 01:59:11 +0200
Subject: [PATCH 0493/2024] hedgewars: use fpc on glibc ppc64*

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

diff --git a/srcpkgs/hedgewars/template b/srcpkgs/hedgewars/template
index aed3c03caf89..7060dbc37d95 100644
--- a/srcpkgs/hedgewars/template
+++ b/srcpkgs/hedgewars/template
@@ -23,7 +23,7 @@ replaces="hedgewars-data>=0"
 export CMAKE_GENERATOR="Unix Makefiles"
 
 case $XBPS_TARGET_MACHINE in
-	x86_64*)
+	x86_64*|ppc64le|ppc64)
 		hostmakedepends+=" fpc"
 		;;
 	*)

From ed209120063c7b21bb293f84707bdcaac8bc2e9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 4 Apr 2021 21:20:19 -0300
Subject: [PATCH 0494/2024] python-Cython: revbump for python 3.9.3.

This fixes an issue where running

    python3 setup.py [other targets] cython

segfaults on i686. This was observed only after the python 3.9.3 update,
though it isn't clear what mismatch caused it (therefore the related
issue won't be closed yet).

Log for build failure (python3-pygame package):
https://build.voidlinux.org/builders/i686_builder/builds/31607/steps/shell_3/logs/stdio
Related issue: #30008
---
 srcpkgs/python-Cython/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-Cython/template b/srcpkgs/python-Cython/template
index 6a75941059ba..8b5ae8841be7 100644
--- a/srcpkgs/python-Cython/template
+++ b/srcpkgs/python-Cython/template
@@ -1,7 +1,7 @@
 # Template file for 'python-Cython'
 pkgname=python-Cython
 version=0.29.22
-revision=1
+revision=2
 wrksrc="Cython-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"

From 51587f7a0abed503b78b71b2218d58e6bb71e4a3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 4 Apr 2021 20:44:29 -0400
Subject: [PATCH 0495/2024] python3: update to 3.9.4.

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

diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index a80fa7f6481d..223a28dc1288 100644
--- a/srcpkgs/python3/template
+++ b/srcpkgs/python3/template
@@ -3,7 +3,7 @@
 # THIS PACKAGE MUST BE SYNCHRONIZED WITH "srcpkgs/python3-tkinter".
 #
 pkgname=python3
-version=3.9.3
+version=3.9.4
 revision=1
 wrksrc="Python-${version}"
 pycompile_dirs="usr/lib/python${version%.*}"
@@ -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=30811039c65e04c14fc698e423947e464f9316e69fb44610bd38446046bb82b5
+checksum=4b0e6644a76f8df864ae24ac500a51bbf68bd098f6a173e27d3b61cdca9aa134
 
 alternatives="
  python:idle:/usr/bin/idle${version%.*}

From cada1a7d577f6c8ac902f0ba534acef32f8ec472 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 4 Apr 2021 20:46:05 -0400
Subject: [PATCH 0496/2024] python3-tkinter: update to 3.9.4.

---
 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 d499752ff0a1..d52b5cdb66ec 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.3
+version=3.9.4
 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=30811039c65e04c14fc698e423947e464f9316e69fb44610bd38446046bb82b5
+checksum=4b0e6644a76f8df864ae24ac500a51bbf68bd098f6a173e27d3b61cdca9aa134
 
 pre_configure() {
 	# Ensure that internal copies of expat and libffi are not used.

From dca1f49ddd59b0c84bcf53188b3020d2ca33e145 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 4 Apr 2021 20:47:26 -0400
Subject: [PATCH 0497/2024] vtk: rebuild for python3-3.9.4 ABI compatibility
 fix

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

diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index 7ca38759c59f..edaf9dfc827a 100644
--- a/srcpkgs/vtk/template
+++ b/srcpkgs/vtk/template
@@ -1,7 +1,7 @@
 # Template file for 'vtk'
 pkgname=vtk
 version=9.0.1
-revision=4
+revision=5
 wrksrc=VTK-${version}
 build_style=cmake
 # vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"

From ab47db464592778ab60dee88110e81967c3d3164 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 4 Apr 2021 20:47:26 -0400
Subject: [PATCH 0498/2024] python-Cython: rebuild for python3-3.9.4 ABI
 compatibility fix

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

diff --git a/srcpkgs/python-Cython/template b/srcpkgs/python-Cython/template
index 8b5ae8841be7..00c790ce5d32 100644
--- a/srcpkgs/python-Cython/template
+++ b/srcpkgs/python-Cython/template
@@ -1,7 +1,7 @@
 # Template file for 'python-Cython'
 pkgname=python-Cython
 version=0.29.22
-revision=2
+revision=3
 wrksrc="Cython-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"

From b2ec6c83828e26fd65894c02f90c9cf3034179ce Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 4 Apr 2021 20:48:45 -0400
Subject: [PATCH 0499/2024] python3-pygame: rebuild for python3-3.9.4 ABI
 compatibility fix

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

diff --git a/srcpkgs/python3-pygame/template b/srcpkgs/python3-pygame/template
index 80ed8b637837..eeb29dd59b11 100644
--- a/srcpkgs/python3-pygame/template
+++ b/srcpkgs/python3-pygame/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pygame'
 pkgname=python3-pygame
 version=2.0.1
-revision=1
+revision=2
 wrksrc="pygame-${version}"
 build_style=python3-module
 make_build_args="cython"

From 4ca498b09f5dd80f6c45259343e835deb37fcf16 Mon Sep 17 00:00:00 2001
From: Noel Cower <ncower@nil.dev>
Date: Sun, 28 Mar 2021 14:22:10 -0700
Subject: [PATCH 0500/2024] varnish: update to 6.6.0.

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

diff --git a/srcpkgs/varnish/template b/srcpkgs/varnish/template
index d9a105350ac5..fff05f21f786 100644
--- a/srcpkgs/varnish/template
+++ b/srcpkgs/varnish/template
@@ -1,6 +1,6 @@
 # Template file for 'varnish'
 pkgname=varnish
-version=6.5.1
+version=6.6.0
 revision=1
 build_style=gnu-configure
 configure_args="--cache-file=config.void --disable-static $(vopt_enable pcrejit pcre-jit)"
@@ -11,7 +11,7 @@ maintainer="Noel Cower <ncower@nil.dev>"
 license="BSD-2-Clause"
 homepage="https://varnish-cache.org/"
 distfiles="https://varnish-cache.org/_downloads/${pkgname}-${version}.tgz"
-checksum=11964c688f9852237c99c1e327d54dc487549ddb5f0f5aa7996e521333d7cdb5
+checksum=d5ff82f2041276dfaeb9a652a88b6d7287cfcf7ca345bb02c438fb65d2bca2e5
 lib32disabled=yes
 
 build_options="pcrejit"
@@ -24,6 +24,10 @@ system_accounts="_varnish _vcache"
 _varnish_homedir="/var/lib/varnish"
 _vcache_pgroup="_varnish"
 
+if [ "${XBPS_TARGET_MACHINE%-musl}" = i686 ]; then
+	broken="vcltest failure on i686 in c00059.vtc"
+fi
+
 if [ yes = "$(vopt_if pcrejit yes)" ]; then
 	# Don't permit cross builds if pcrejit is set.
 	nocross="Cannot run test program when cross compiling (PCRE_JIT)"

From 88ea77d91c7b7fa3680b55a752012fd54048e381 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Mon, 5 Apr 2021 09:11:54 +0200
Subject: [PATCH 0501/2024] warzone2100: update to 4.0.0.

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

diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template
index a73c6c8a734e..8d6de60569c0 100644
--- a/srcpkgs/warzone2100/template
+++ b/srcpkgs/warzone2100/template
@@ -1,21 +1,21 @@
 # Template file for 'warzone2100'
 pkgname=warzone2100
-version=3.4.1
-revision=2
+version=4.0.0
+revision=1
 wrksrc="warzone2100"
 build_style=cmake
 configure_args="-DWZ_ENABLE_WARNINGS_AS_ERRORS=OFF -DWZ_DISTRIBUTOR=void"
-hostmakedepends="zip unzip asciidoc gettext pkg-config qt5-qmake qt5-host-tools"
+hostmakedepends="zip unzip asciidoc gettext pkg-config shaderc"
 makedepends="libpng-devel fribidi-devel fontconfig-devel SDL2-devel libvorbis-devel
  libtheora-devel libopenal-devel glew-devel physfs-devel harfbuzz-devel
- qt5-script-devel libsodium-devel libcurl-devel"
+ libsodium-devel libcurl-devel"
 depends="desktop-file-utils warzone2100-data"
 short_desc="3D realtime strategy game on a future Earth"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://wz2100.net"
 distfiles="https://github.com/Warzone2100/${pkgname}/releases/download/${version}/${pkgname}_src.tar.xz"
-checksum=ea2cd7f016118a89244ebef8ce9424f71c060bcd5895b791d3e1cec02b555b69
+checksum=3368f6653a5ebe5579938f0ebbcfe7907b1f0fc635f0a7aecc5d68ebc50124b5
 nocross="fails to detect SDL2 when cross-compiling"
 
 warzone2100-data_package() {

From e77be58ef7f535d3bac40b7b2726086d7c8c67a7 Mon Sep 17 00:00:00 2001
From: Stefano Ragni <stefano.ragni@outlook.com>
Date: Mon, 5 Apr 2021 13:08:00 +0200
Subject: [PATCH 0502/2024] alsa-tools: add hdajacksensetest

also fix python_version 2 -> 3 (for hwmixvolume)
---
 srcpkgs/alsa-tools/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/alsa-tools/template b/srcpkgs/alsa-tools/template
index 45593c372fba..1078472c79ae 100644
--- a/srcpkgs/alsa-tools/template
+++ b/srcpkgs/alsa-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'alsa-tools'
 pkgname=alsa-tools
 version=1.2.2
-revision=1
+revision=2
 hostmakedepends="pkg-config"
 makedepends="fltk-devel gtk+-devel gtk+3-devel"
 depends="python3-gobject python3-alsa"
@@ -11,11 +11,11 @@ license="GPL-2.0-only"
 homepage="http://alsa-project.org"
 distfiles="https://www.alsa-project.org/files/pub/tools/alsa-tools-${version}.tar.bz2"
 checksum=bfd3c7aae1289269605d3da02279159b10e3dabdd31e658cbceaa30170957349
-python_version=2 #unverified
+python_version=3
 
 _tools="
-	as10k1 echomixer envy24control hdajackretask hda-verb hdspconf hdsploader
-	hdspmixer hwmixvolume ld10k1 mixartloader pcxhrloader rmedigicontrol
+	as10k1 echomixer envy24control hdajackretask hdajacksensetest hda-verb hdspconf
+	hdsploader hdspmixer hwmixvolume ld10k1 mixartloader pcxhrloader rmedigicontrol
 	sb16_csp seq/sbiload sscape_ctl us428control usx2yloader vxloader
 "
 

From c753a074f72d039cb2af9b48aff1775b12fd39d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Mon, 5 Apr 2021 12:15:43 +0200
Subject: [PATCH 0503/2024] visidata: update to 2.3.

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

diff --git a/srcpkgs/visidata/template b/srcpkgs/visidata/template
index 8ec4a94a004e..21be128580d4 100644
--- a/srcpkgs/visidata/template
+++ b/srcpkgs/visidata/template
@@ -1,6 +1,6 @@
 # Template file for 'visidata'
 pkgname=visidata
-version=2.2.1
+version=2.3
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,4 +12,4 @@ license="GPL-3.0-only"
 homepage="https://visidata.org/"
 changelog="https://raw.githubusercontent.com/saulpw/visidata/stable/CHANGELOG.md"
 distfiles="https://github.com/saulpw/visidata/archive/v${version}.tar.gz"
-checksum=8e73e8290f8ac01d0a9b7ed44613170f55a4687c1087ac92f5dd92e9f0546cf4
+checksum=11a859ef45a7932b10da34bb0978975d052933e747303c055a2d40ccc0472b30

From c2414501c05eeab3e1cd76494cca00edc2da2181 Mon Sep 17 00:00:00 2001
From: Noel Cower <ncower@nil.dev>
Date: Sun, 4 Apr 2021 20:10:39 -0700
Subject: [PATCH 0504/2024] glusterfs: update to 9.0.

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

diff --git a/srcpkgs/glusterfs/template b/srcpkgs/glusterfs/template
index 158a5c5b7954..93fd87eeda76 100644
--- a/srcpkgs/glusterfs/template
+++ b/srcpkgs/glusterfs/template
@@ -1,7 +1,7 @@
 # Template file for 'glusterfs'
 pkgname=glusterfs
-version=8.3
-revision=2
+version=9.0
+revision=1
 build_style=gnu-configure
 configure_args="--with-mountutildir=/usr/bin ac_cv_file__etc_debian_version=no
  ac_cv_file__etc_SuSE_release=no ac_cv_file__etc_redhat_release=no
@@ -17,7 +17,7 @@ maintainer="Noel Cower <ncower@nil.dev>"
 license="GPL-2.0-or-later, LGPL-3.0-only"
 homepage="https://www.gluster.org/"
 distfiles="https://download.gluster.org/pub/gluster/glusterfs/${version%.*}/${version}/${pkgname}-${version}.tar.gz"
-checksum=d7e68391db9ab8bee8cb2ccc01cc4e4bc2ea2c04402080860b9b06050b69ce1d
+checksum=6f29ae4ab2c270ade0cd14a3f733d7d33fda78e79e81b148cd50711f65069d87
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) broken="not yet supported";;

From c1ec5ebdb0b3b56b984b65ccba523e94fef708af Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Tue, 2 Mar 2021 20:36:07 +1100
Subject: [PATCH 0505/2024] libuv: update to 1.41.0.

---
 srcpkgs/libuv/patches/disable-fs-chown.patch  | 10 +++++-----
 .../libuv/patches/disable-setuid-test.patch   | 20 +++++++++----------
 srcpkgs/libuv/template                        |  6 ++++--
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/libuv/patches/disable-fs-chown.patch b/srcpkgs/libuv/patches/disable-fs-chown.patch
index e2dd0899fad1..893d09edfa02 100644
--- a/srcpkgs/libuv/patches/disable-fs-chown.patch
+++ b/srcpkgs/libuv/patches/disable-fs-chown.patch
@@ -1,6 +1,6 @@
---- test/test-list.h.orig	2018-04-16 19:13:01.184197428 +0200
-+++ test/test-list.h	2018-04-16 19:13:28.144260600 +0200
-@@ -287,7 +287,7 @@ TEST_DECLARE   (fs_unlink_readonly)
+--- test/test-list.h.orig	2021-03-02 21:59:17.718832425 +1100
++++ test/test-list.h	2021-03-02 21:59:41.809157112 +1100
+@@ -344,7 +344,7 @@
  #ifdef _WIN32
  TEST_DECLARE   (fs_unlink_archive_readonly)
  #endif
@@ -9,12 +9,12 @@
  TEST_DECLARE   (fs_link)
  TEST_DECLARE   (fs_readlink)
  TEST_DECLARE   (fs_realpath)
-@@ -821,7 +821,7 @@ TASK_LIST_START
+@@ -997,7 +997,7 @@
  #ifdef _WIN32
    TEST_ENTRY  (fs_unlink_archive_readonly)
  #endif
 -  TEST_ENTRY  (fs_chown)
 +  /* TEST_ENTRY  (fs_chown) */
    TEST_ENTRY  (fs_utime)
+   TEST_ENTRY  (fs_utime_round)
    TEST_ENTRY  (fs_futime)
-   TEST_ENTRY  (fs_readlink)
diff --git a/srcpkgs/libuv/patches/disable-setuid-test.patch b/srcpkgs/libuv/patches/disable-setuid-test.patch
index 27ccb7464451..9dbd6bcee612 100644
--- a/srcpkgs/libuv/patches/disable-setuid-test.patch
+++ b/srcpkgs/libuv/patches/disable-setuid-test.patch
@@ -1,6 +1,6 @@
---- test/test-list.h.orig	2018-04-16 19:13:01.184197428 +0200
-+++ test/test-list.h	2018-04-16 19:15:11.042501710 +0200
-@@ -254,8 +254,8 @@ TEST_DECLARE   (spawn_detached)
+--- test/test-list.h.orig	2021-03-02 21:59:17.718832425 +1100
++++ test/test-list.h	2021-03-02 22:05:18.359833402 +1100
+@@ -305,8 +305,8 @@
  TEST_DECLARE   (spawn_and_kill_with_std)
  TEST_DECLARE   (spawn_and_ping)
  TEST_DECLARE   (spawn_preserve_env)
@@ -11,16 +11,16 @@
  TEST_DECLARE   (spawn_stdout_to_file)
  TEST_DECLARE   (spawn_stdout_and_stderr_to_file)
  TEST_DECLARE   (spawn_stdout_and_stderr_to_file2)
-@@ -391,7 +391,7 @@ TEST_DECLARE   (win32_signum_number)
+@@ -477,7 +477,7 @@
+ TEST_DECLARE   (win32_signum_number)
+ #else
  TEST_DECLARE   (emfile)
- TEST_DECLARE   (close_fd)
- TEST_DECLARE   (spawn_fs_open)
 -TEST_DECLARE   (spawn_setuid_setgid)
 +/* TEST_DECLARE   (spawn_setuid_setgid) */
  TEST_DECLARE   (we_get_signal)
  TEST_DECLARE   (we_get_signals)
  TEST_DECLARE   (we_get_signal_one_shot)
-@@ -755,8 +755,8 @@ TASK_LIST_START
+@@ -923,8 +923,8 @@
    TEST_ENTRY  (spawn_and_kill_with_std)
    TEST_ENTRY  (spawn_and_ping)
    TEST_ENTRY  (spawn_preserve_env)
@@ -31,10 +31,10 @@
    TEST_ENTRY  (spawn_stdout_to_file)
    TEST_ENTRY  (spawn_stdout_and_stderr_to_file)
    TEST_ENTRY  (spawn_stdout_and_stderr_to_file2)
-@@ -790,7 +790,7 @@ TASK_LIST_START
+@@ -963,7 +963,7 @@
+   TEST_ENTRY  (win32_signum_number)
+ #else
    TEST_ENTRY  (emfile)
-   TEST_ENTRY  (close_fd)
-   TEST_ENTRY  (spawn_fs_open)
 -  TEST_ENTRY  (spawn_setuid_setgid)
 +  /* TEST_ENTRY  (spawn_setuid_setgid) */
    TEST_ENTRY  (we_get_signal)
diff --git a/srcpkgs/libuv/template b/srcpkgs/libuv/template
index 458c4ed52aab..76a36863f4b9 100644
--- a/srcpkgs/libuv/template
+++ b/srcpkgs/libuv/template
@@ -1,6 +1,6 @@
 # Template file for 'libuv'
 pkgname=libuv
-version=1.39.0
+version=1.41.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
@@ -10,7 +10,9 @@ license="MIT, CC-BY-SA-4.0"
 homepage="https://libuv.org/"
 changelog="https://raw.githubusercontent.com/libuv/libuv/v1.x/ChangeLog"
 distfiles="https://github.com/libuv/libuv/archive/v${version}.tar.gz"
-checksum=dc7b21f1bb7ef19f4b42c5ea058afabe51132d165da18812b70fb319659ba629
+checksum=6cfeb5f4bab271462b4a2cc77d4ecec847fdbdc26b72019c27ae21509e6f94fa
+# the tests fail when run as root and as such break in the CI containers
+make_check="extended"
 
 LDFLAGS="-pthread"
 

From b3b0c75da6ef387511f8c221797e3b285449cdde Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Mon, 1 Mar 2021 20:35:27 +1100
Subject: [PATCH 0506/2024] MoarVM: update to 2021.03.

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

diff --git a/srcpkgs/MoarVM/template b/srcpkgs/MoarVM/template
index 75ada16bfce3..52236814e470 100644
--- a/srcpkgs/MoarVM/template
+++ b/srcpkgs/MoarVM/template
@@ -1,6 +1,6 @@
 # Template file for 'MoarVM'
 pkgname=MoarVM
-version=2020.11
+version=2021.03
 revision=1
 build_style=configure
 configure_script="perl Configure.pl"
@@ -15,6 +15,6 @@ license="Artistic-2.0"
 homepage="https://moarvm.org"
 changelog="https://github.com/MoarVM/MoarVM/raw/master/docs/ChangeLog"
 distfiles="https://moarvm.org/releases/MoarVM-${version}.tar.gz"
-checksum=6d028273b6ed5ba7b972e7b3f2681ce1deff1897ebdf7bcd5cfcd1e7c2fec384
+checksum=8a0cf32273e473af884f409a02ad13c4aed5646628facf86544f6b3757e5cacf
 nocross=yes
 shlib_provides="libmoar.so"

From 19e1df099bf9086f303b2618c53970d42348d5bc Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Mon, 1 Mar 2021 20:37:34 +1100
Subject: [PATCH 0507/2024] nqp: update to 2021.03.

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

diff --git a/srcpkgs/nqp/template b/srcpkgs/nqp/template
index e75d67b6a366..b6d660c413ab 100644
--- a/srcpkgs/nqp/template
+++ b/srcpkgs/nqp/template
@@ -1,6 +1,6 @@
 # Template file for 'nqp'
 pkgname=nqp
-version=2020.11
+version=2021.03
 revision=1
 build_style=configure
 make_check_target=test
@@ -15,5 +15,5 @@ maintainer="Andy Weidenbaum <atweiden@tutanota.de>"
 license="Artistic-2.0"
 homepage="https://github.com/Raku/nqp"
 distfiles="https://rakudo.org/dl/nqp/${pkgname}-${version}.tar.gz"
-checksum=7985f587c43801650316745f055cb5fc3f9063c5bb34de5ae695d76518ad900f
+checksum=73498f685b8efbd54e43176d41a8f001c32abd27bcb0a801dcd69d38f4e61c11
 nocross=yes

From d7a9270af2a51625a6e6ee41e8b2bd577cc4a06e Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Mon, 1 Mar 2021 20:40:49 +1100
Subject: [PATCH 0508/2024] rakudo: update to 2021.03.

Closes: #29147 [via git-merge-pr]
---
 srcpkgs/rakudo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rakudo/template b/srcpkgs/rakudo/template
index fcef8d7dcfce..903206d04182 100644
--- a/srcpkgs/rakudo/template
+++ b/srcpkgs/rakudo/template
@@ -1,6 +1,6 @@
 # Template file for 'rakudo'
 pkgname=rakudo
-version=2020.11
+version=2021.03
 revision=1
 build_style=configure
 make_check_target=test
@@ -32,7 +32,7 @@ license="Artistic-2.0"
 homepage="https://rakudo.org"
 changelog="https://github.com/rakudo/rakudo/raw/master/docs/ChangeLog"
 distfiles="https://rakudo.org/dl/rakudo/${pkgname}-${version}.tar.gz"
-checksum=b6f086553dfdfbf878d8b1f7659c3a0028f770e6655fb947bdd65ce0ded4fa80
+checksum=98eb57fa0f4953aa6617111f36a2706799d8082b42e22c37cf104a918d914ec2
 nocross=yes
 provides="raku-${version}_${revision}"
 

From 2377ff4eabb40050c444727e98fd2726655fbc02 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 5 Apr 2021 15:42:39 +0200
Subject: [PATCH 0509/2024] dbeaver: update to 21.0.2.

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

diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index 0573665b8a32..74249a296838 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=21.0.1
+version=21.0.2
 revision=1
 # the build downloads binaries linked to glibc
 archs="x86_64"
@@ -11,7 +11,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="Apache-2.0"
 homepage="https://dbeaver.io"
 distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz"
-checksum=f7ebd07bb85022d715df48e191f24293af23eadc29478c402fd67e871fa4dc0f
+checksum=39f9d518d057884a2bfd2a4cee656190fe849b06fd7184b465d159c618a28837
 nopie=true
 
 do_build() {

From d036b62c55d0d60531608ae61a340bd06d3fe798 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 5 Apr 2021 15:52:41 +0200
Subject: [PATCH 0510/2024] dte: update to 1.10.

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

diff --git a/srcpkgs/dte/template b/srcpkgs/dte/template
index eb53f00f87cc..99d194321313 100644
--- a/srcpkgs/dte/template
+++ b/srcpkgs/dte/template
@@ -1,13 +1,12 @@
 # Template file for 'dte'
 pkgname=dte
-version=1.9.1
-revision=2
+version=1.10
+revision=1
 build_style=gnu-makefile
 make_install_args="prefix=/usr"
-makedepends="ncurses-devel"
 short_desc="Small, configurable console text editor"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://craigbarnes.gitlab.io/dte/index.html"
 distfiles="https://craigbarnes.gitlab.io/dist/dte/dte-${version}.tar.gz"
-checksum=80d2732269a308b5e1126ecc16c28cda032864f625a95184821a73c054f81a2d
+checksum=db62aab235764f735adc8378f796d6474596582b7dae357e0bddf31304189800

From 7a874ba33835203536d7fe5ceda28fbaf0eb6af9 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 5 Apr 2021 16:06:25 +0200
Subject: [PATCH 0511/2024] passwdqc: update to 2.0.2.

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

diff --git a/srcpkgs/passwdqc/template b/srcpkgs/passwdqc/template
index 5df4fb5d68d1..d5ec411bd2ae 100644
--- a/srcpkgs/passwdqc/template
+++ b/srcpkgs/passwdqc/template
@@ -1,6 +1,6 @@
 # Template file for 'passwdqc'
 pkgname=passwdqc
-version=2.0.1
+version=2.0.2
 revision=1
 build_style=gnu-makefile
 make_install_args="SHARED_LIBDIR=/usr/lib SECUREDIR=/usr/lib/security"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause,0BSD"
 homepage="http://www.openwall.com/passwdqc/"
 distfiles="http://www.openwall.com/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=5637e2c72b2738128f378b350f69253cbd5ebeffa7b550820640d1ae2638a868
+checksum=ff1f505764c020f6a4484b1e0cc4fdbf2e3f71b522926d90b4709104ca0604ab
 
 do_build() {
 	make ${makejobs} CC="$CC" LD="$CC" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \

From b91fabfb43ee1d4838c47c7d9b6cd60278936f67 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, 12 Mar 2021 07:29:34 +0700
Subject: [PATCH 0512/2024] supercollider: use system glob(3) on musl

---
 srcpkgs/supercollider/template | 29 ++++-------------------------
 1 file changed, 4 insertions(+), 25 deletions(-)

diff --git a/srcpkgs/supercollider/template b/srcpkgs/supercollider/template
index bded2fc4908c..c7a878f91c09 100644
--- a/srcpkgs/supercollider/template
+++ b/srcpkgs/supercollider/template
@@ -1,12 +1,12 @@
 # Template file for 'supercollider'
 pkgname=supercollider
 version=3.11.1
-revision=1
+revision=2
 wrksrc="SuperCollider-${version}-Source"
 build_style=cmake
 make_cmd=make
 configure_args="-DENABLE_TESTSUITE=OFF -DSYSTEM_BOOST=ON -DSYSTEM_YAMLCPP=ON"
-hostmakedepends="emacs pkg-config"
+hostmakedepends="emacs pkg-config qt5-host-tools qt5-qmake"
 makedepends="avahi-libs-devel boost-devel fftw-devel jack-devel libatomic-devel
  libsndfile-devel libXt-devel qt5-declarative-devel qt5-location-devel
  qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite
@@ -19,10 +19,6 @@ homepage="https://github.com/supercollider/supercollider"
 distfiles="https://github.com/supercollider/supercollider/releases/download/Version-${version}/SuperCollider-${version}-Source.tar.bz2"
 checksum=2dd2f8179a55de4735ac940e2e2d0df4e68cc3a33172628e4dd99ae89c74856b
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-host-tools qt5-devel"
-fi
-
 export CMAKE_GENERATOR="Unix Makefiles"
 
 build_options="webengine"
@@ -40,30 +36,13 @@ else
 	configure_args+=" -DSC_USE_QTWEBENGINE=OFF"
 fi
 
-if [ "$XBPS_TARGET_LIBC" = musl ]; then
-	makedepends+=" libglob-devel"
-fi
-
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*);;
 	*) configure_args+=" -DSSE=OFF -DSSE2=OFF";;
 esac
 
 pre_configure() {
-	rm -rf external_libraries/boost # https://github.com/supercollider/supercollider/issues/4096
+	# https://github.com/supercollider/supercollider/issues/4096
+	rm -rf external_libraries/boost
 	sed -i 's/yaml/yaml-cpp/g' CMakeLists.txt editors/sc-ide/CMakeLists.txt
-	case "$XBPS_TARGET_MACHINE" in
-	*-musl)
-		sed -i \
-		 -e '/include/s,glob\.h,libglob/glob.h,g' \
-		 -e 's/glob(/g_glob(/g' \
-		 -e 's/globfree(/g_globfree(/g' \
-		 common/SC_Filesystem_unix.cpp
-		sed -i 's/__va_copy/va_copy/g' common/SC_StringBuffer.cpp
-		echo 'target_link_libraries(sclang glob)' >> lang/CMakeLists.txt
-		echo 'target_link_libraries(scsynth glob)' >> server/scsynth/CMakeLists.txt
-		echo 'target_link_libraries(supernova glob)' >> server/supernova/CMakeLists.txt
-		echo 'target_link_libraries(SuperCollider glob)' >> editors/sc-ide/CMakeLists.txt
-		;;
-	esac
 }

From e743db5cf7bd78286b16b8f5c056f84cd148fcf8 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, 13 Mar 2021 07:47:08 +0700
Subject: [PATCH 0513/2024] eudev: update to 3.2.10.

---
 srcpkgs/eudev/template | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/eudev/template b/srcpkgs/eudev/template
index 77e291d78eb5..df783c562bca 100644
--- a/srcpkgs/eudev/template
+++ b/srcpkgs/eudev/template
@@ -3,30 +3,34 @@
 _UDEV_VERSION="243" # compatible udev version provided
 
 pkgname=eudev
-version=3.2.9
+version=3.2.10
 revision=1
 build_style=gnu-configure
 configure_args="--enable-hwdb --enable-manpages --disable-introspection"
-hostmakedepends="automake libtool pkg-config gperf libxslt docbook-xsl"
+hostmakedepends="pkg-config gperf"
 makedepends="libblkid-devel libkmod-devel"
-checkdepends="xz"
+checkdepends="xz tar perl"
 short_desc="Gentoo's fork of systemd-udev (enhanced userland device daemon)"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/gentoo/eudev"
-distfiles="https://github.com/gentoo/eudev/archive/v${version}.tar.gz"
-checksum=7d281276b480da3935d1acb239748c2c9db01a8043aad7e918ce57a223d8cd24
+# Gentoo's ebuild uses this tarball
+distfiles="https://dev.gentoo.org/~blueness/eudev/eudev-${version}.tar.gz"
+checksum=87bb028d470fd1b85169349b44c55d5b733733dc2d50ddf1196e026725ead034
 conf_files="/etc/udev/udev.conf"
 
-pre_configure() {
-	autoreconf -fi
-}
-
 post_install() {
 	mv "${DESTDIR}/etc/udev/hwdb.d" "${DESTDIR}/usr/lib/udev"
 	vsv udevd
 }
 
+do_check() {
+	# requires unshare(2) which is not available in chroot
+	if [ ! "$XBPS_ALLOW_CHROOT_BREAKOUT" ]; then
+		make check
+	fi
+}
+
 eudev-libudev-devel_package() {
 	provides="libudev-devel-${_UDEV_VERSION}_${revision}"
 	depends="eudev-libudev>=${version}_${revision}"

From 97a2f37eb0af6f7f65c7cce3d5d2bec67a918318 Mon Sep 17 00:00:00 2001
From: Martin Tournoij <martin@arp242.net>
Date: Mon, 5 Apr 2021 22:47:26 +0800
Subject: [PATCH 0514/2024] goatcounter: update to 2.0.3

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

diff --git a/srcpkgs/goatcounter/template b/srcpkgs/goatcounter/template
index 01090e13c77d..734920ce5987 100644
--- a/srcpkgs/goatcounter/template
+++ b/srcpkgs/goatcounter/template
@@ -1,6 +1,6 @@
 # Template file for 'goatcounter'
 pkgname=goatcounter
-version=2.0.0
+version=2.0.3
 revision=1
 build_style=go
 go_import_path=zgo.at/goatcounter
@@ -12,4 +12,4 @@ 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=bca27f65a302482ae018e9d7c5449c4e91aec11a4eea2f62cfe2ed8743a9b241
+checksum=d7477240602c4d6522fb528276378879cda35dea0ba4b174143e36a410398023

From 19ce65c0645050c6f46f67cf649effebe3a0e663 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 5 Apr 2021 13:57:29 -0300
Subject: [PATCH 0515/2024] mpv: update to 0.33.1.

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

diff --git a/srcpkgs/mpv/template b/srcpkgs/mpv/template
index f43662480cb3..f3ac99c6c335 100644
--- a/srcpkgs/mpv/template
+++ b/srcpkgs/mpv/template
@@ -1,6 +1,6 @@
 # Template file for 'mpv'
 pkgname=mpv
-version=0.33.0
+version=0.33.1
 revision=1
 build_style=waf3
 configure_args="--confdir=/etc/mpv --docdir=/usr/share/examples/mpv
@@ -29,7 +29,7 @@ license="GPL-2.0-or-later"
 homepage="https://mpv.io"
 changelog="https://github.com/mpv-player/mpv/releases"
 distfiles="https://github.com/mpv-player/${pkgname}/archive/v${version}.tar.gz"
-checksum=f1b9baf5dc2eeaf376597c28a6281facf6ed98ff3d567e3955c95bf2459520b4
+checksum=100a116b9f23bdcda3a596e9f26be3a69f166a4f1d00910d1789b6571c46f3a9
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 5cb96525f8cb8ded9aced3afba62e66c808b7e1f Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 5 Apr 2021 18:58:07 +0200
Subject: [PATCH 0516/2024] mupen64plus: fix archs= again and fix lint

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

diff --git a/srcpkgs/mupen64plus/template b/srcpkgs/mupen64plus/template
index f0e6fe2c4173..4984a7f4a777 100644
--- a/srcpkgs/mupen64plus/template
+++ b/srcpkgs/mupen64plus/template
@@ -2,7 +2,7 @@
 pkgname=mupen64plus
 version=2.5.9
 revision=1
-nocross="yes"
+archs="x86_64* i686*"
 wrksrc="mupen64plus-bundle-src-${version}"
 hostmakedepends="pkg-config which nasm"
 makedepends="boost-devel SDL2-devel speexdsp-devel freetype-devel glu-devel libpng-devel libsamplerate-devel"
@@ -14,6 +14,7 @@ homepage="http://www.mupen64plus.org"
 distfiles="https://github.com/mupen64plus/mupen64plus-core/releases/download/${version}/${pkgname}-bundle-src-${version}.tar.gz"
 checksum=d5243ddc00388ee2e538b3826a78a719dec2bd5da54ac6f3344fed861fb141a8
 nopie=yes
+nocross=yes
 
 CFLAGS="-fcommon"
 

From adbb96786245902ef8c0f7283d0d7111638ae8c2 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Mon, 5 Apr 2021 17:32:20 +0300
Subject: [PATCH 0517/2024] qalculate: update to 3.18.0

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

diff --git a/srcpkgs/qalculate/template b/srcpkgs/qalculate/template
index c223601ef705..0fae47109711 100644
--- a/srcpkgs/qalculate/template
+++ b/srcpkgs/qalculate/template
@@ -1,7 +1,7 @@
 # Template file for 'qalculate'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate-gtk"
 pkgname=qalculate
-version=3.17.0
+version=3.18.0
 revision=1
 wrksrc="lib${pkgname}-${version}"
 build_style=gnu-configure
@@ -13,7 +13,7 @@ maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/libqalculate/releases/download/v${version}/libqalculate-${version}.tar.gz"
-checksum=7ea06b140b9238b44473e07b60e1e8cb5271e45b80cbdc27e7eb2e6f82c2ec8c
+checksum=ed7263f48d12a1dd94fe105156a6563125e9b3fe6361e9a9deb5b0ea5cbf03cf
 
 libqalculate_package() {
 	short_desc+=" - library files"

From 0193af80469dbd8c912b69546d32fe6e6f6da93d Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Mon, 5 Apr 2021 17:36:12 +0300
Subject: [PATCH 0518/2024] qalculate-gtk: update to 3.18.0

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

diff --git a/srcpkgs/qalculate-gtk/template b/srcpkgs/qalculate-gtk/template
index c8d3c8e309a8..6b96f80e781d 100644
--- a/srcpkgs/qalculate-gtk/template
+++ b/srcpkgs/qalculate-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'qalculate-gtk'
 # NOTE: keep this package synchronized with "srcpkgs/qalculate"
 pkgname=qalculate-gtk
-version=3.17.0
+version=3.18.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config glib-devel"
@@ -12,4 +12,4 @@ maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 distfiles="https://github.com/Qalculate/qalculate-gtk/releases/download/v${version}/qalculate-gtk-${version}.tar.gz"
-checksum=b95f4be3c6fd883dec280a92d46b4678f8a7de2e5b654344246bb9d87695626b
+checksum=3e727087877c7c367c223948d8ed807fd0bbc19386dd9f6f4741c213cd6d3311

From cb7d9421906f1055f0fe545ff929d7b44ad2d9e3 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 5 Apr 2021 16:41:52 -0500
Subject: [PATCH 0519/2024] python3-rich: update to 10.1.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 3b9eaac8a2af..54f6080d7698 100644
--- a/srcpkgs/python3-rich/template
+++ b/srcpkgs/python3-rich/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-rich'
 pkgname=python3-rich
-version=10.0.0
+version=10.1.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=4674bd3056a72bb282ad581e3f8092dc110cdcc456b5ba76e34965cb85a69724
+checksum=8f05431091601888c50341697cfc421dc398ce37b12bca0237388ef9c7e2c9e9
 
 post_install() {
 	vlicense LICENSE

From 59dd0ac740efd230c7f6f9bbb47d786bb078b037 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 5 Apr 2021 16:38:49 -0500
Subject: [PATCH 0520/2024] eggdrop: update to 1.9.0.

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

diff --git a/srcpkgs/eggdrop/template b/srcpkgs/eggdrop/template
index 7790a5d6dafe..ebe5eee57fe3 100644
--- a/srcpkgs/eggdrop/template
+++ b/srcpkgs/eggdrop/template
@@ -1,7 +1,7 @@
 # Template file for 'eggdrop'
 pkgname=eggdrop
-version=1.8.4
-revision=3
+version=1.9.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="tcl-devel"
 makedepends="tcl-devel openssl-devel zlib-devel"
@@ -10,7 +10,8 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://www.eggheads.org/"
 distfiles="https://ftp.eggheads.org/pub/eggdrop/source/${version%.*}/eggdrop-${version}.tar.gz"
-checksum=79644eb27a5568934422fa194ce3ec21cfb9a71f02069d39813e85d99cdebf9e
+checksum=281bd6fb913db2ea9609e2b20315e242cbd7c582598c7b0d2854ad5afc54777b
+conf_files="/etc/eggdrop/text/banner /etc/eggdrop/text/motd"
 
 pre_build() {
 	make config

From 27b1a0bae7f313554bc2ef567a97cff2c113feaf Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Mon, 5 Apr 2021 17:49:07 +0200
Subject: [PATCH 0521/2024] qdirstat: update to 1.7.1.

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

diff --git a/srcpkgs/qdirstat/template b/srcpkgs/qdirstat/template
index 070bd37742bf..efed1890b409 100644
--- a/srcpkgs/qdirstat/template
+++ b/srcpkgs/qdirstat/template
@@ -1,7 +1,7 @@
 # Template file for 'qdirstat'
 pkgname=qdirstat
-version=1.7
-revision=2
+version=1.7.1
+revision=1
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="zlib-devel qt5-devel"
@@ -10,7 +10,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/shundhammer/qdirstat"
 distfiles="https://github.com/shundhammer/qdirstat/archive/${version}.tar.gz"
-checksum=9a8ec22a19290794147f727bca27deb7e02b4d9c537deb2fd0d3e647621f8c4a
+checksum=fb40181972092d80994d3d04802c43298b70a21f1e636d5490a2bfbd1cb407d9
 
 post_install() {
 	vman man/qdirstat.1

From 1bd942e8112c64974f52eb7275171c4ee2b3e6f6 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Mon, 5 Apr 2021 17:59:36 +0200
Subject: [PATCH 0522/2024] sigrok-cli: update to 0.7.2.

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

diff --git a/srcpkgs/sigrok-cli/template b/srcpkgs/sigrok-cli/template
index 7a77169393da..c3e8d07d39b5 100644
--- a/srcpkgs/sigrok-cli/template
+++ b/srcpkgs/sigrok-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'sigrok-cli'
 pkgname=sigrok-cli
-version=0.7.1
+version=0.7.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -11,4 +11,4 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="GPL-3"
 homepage="https://sigrok.org/"
 distfiles="https://sigrok.org/download/source/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=f52413429f47d457c333db0fd068416ab7a3f9e35ca76de8624dc5ac6fb07797
+checksum=71d0443f36897bf565732dec206830dbea0f2789b6601cf10536b286d1140ab8

From 079e5cdad3c2d2cb0fda9d5c61fda635c04d7c19 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Mon, 5 Apr 2021 23:50:45 +0200
Subject: [PATCH 0523/2024] libosmgpsmap: update to 1.2.0.

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

diff --git a/srcpkgs/libosmgpsmap/template b/srcpkgs/libosmgpsmap/template
index 420b3630c8e7..63dc740d9cb4 100644
--- a/srcpkgs/libosmgpsmap/template
+++ b/srcpkgs/libosmgpsmap/template
@@ -1,7 +1,7 @@
 # Template file for 'libosmgpsmap'
 pkgname=libosmgpsmap
-version=1.1.0
-revision=6
+version=1.2.0
+revision=1
 wrksrc="osm-gps-map-${version}"
 build_style=gnu-configure
 build_helper="gir"
@@ -13,7 +13,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="GPL-2.0-or-later"
 homepage="http://nzjrs.github.io/osm-gps-map/"
 distfiles="https://github.com/nzjrs/osm-gps-map/releases/download/${version}/osm-gps-map-${version}.tar.gz"
-checksum=8f2ff865ed9ed9786cc5373c37b341b876958416139d0065ebb785cf88d33586
+checksum=ddec11449f37b5dffb4bca134d024623897c6140af1f9981a8acc512dbf6a7a5
 
 build_options="gir"
 build_options_default="gir"

From 75dc68724af3572878194162d4c65c2407dfb510 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 5 Apr 2021 16:55:58 -0500
Subject: [PATCH 0524/2024] Amass: update to 3.11.13.

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

diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template
index 05d7ef6765fe..914353276941 100644
--- a/srcpkgs/Amass/template
+++ b/srcpkgs/Amass/template
@@ -1,12 +1,12 @@
 # Template file for 'Amass'
 pkgname=Amass
-version=3.11.12
+version=3.11.13
 revision=1
 build_style=go
-go_import_path="github.com/OWASP/Amass/..."
+go_import_path="github.com/OWASP/Amass/v3/..."
 short_desc="In-depth Attack Surface Mapping and Asset Discovery"
 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=27fef5b24b8b3be5b3f6843b61265447afaa19b649e4cc9e947abc296c2c3184
+checksum=012b5c01209c56b4698c605c74c39001341a5319b90e65d484329fd4a3e2b7cf

From 881d4c498ea219e90d3c9cf9629bfac153cd393e Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 6 Apr 2021 01:02:04 +0200
Subject: [PATCH 0525/2024] warzone2100: fix -latomic

---
 srcpkgs/warzone2100/template | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template
index 8d6de60569c0..3af4ebc401f0 100644
--- a/srcpkgs/warzone2100/template
+++ b/srcpkgs/warzone2100/template
@@ -18,6 +18,16 @@ distfiles="https://github.com/Warzone2100/${pkgname}/releases/download/${version
 checksum=3368f6653a5ebe5579938f0ebbcfe7907b1f0fc635f0a7aecc5d68ebc50124b5
 nocross="fails to detect SDL2 when cross-compiling"
 
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+fi
+
+post_extract() {
+	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+		echo "target_link_libraries(warzone2100 atomic)" >> CMakeLists.txt
+	fi
+}
+
 warzone2100-data_package() {
 	short_desc+=" - data files"
 	pkg_install() {

From e6baca11dcec83f7f5d157e37349f96cfc11e23b Mon Sep 17 00:00:00 2001
From: Gerardo Di iorio <arete74@gmail.com>
Date: Mon, 5 Apr 2021 20:33:36 +0200
Subject: [PATCH 0526/2024] hcloud: update to 1.22.0.

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

diff --git a/srcpkgs/hcloud/template b/srcpkgs/hcloud/template
index d50726090832..d5eb343c9338 100644
--- a/srcpkgs/hcloud/template
+++ b/srcpkgs/hcloud/template
@@ -1,6 +1,6 @@
 # Template file for 'hcloud'
 pkgname=hcloud
-version=1.21.1
+version=1.22.0
 revision=1
 wrksrc="cli-${version}"
 build_style=go
@@ -13,7 +13,7 @@ maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="MIT"
 homepage="https://github.com/hetznercloud/cli"
 distfiles="https://github.com/hetznercloud/cli/archive/v${version}.tar.gz"
-checksum=0c76bd22e0891f4073b73d16fe233ab704fe5c0cf539f091d20d2e43ccbc5a1b
+checksum=fec0f1ae490ed4e1079138661fffcbf489544c460f631a6a4e5910d3645dad86
 
 post_install() {
 	vlicense LICENSE

From 353b4c8695139bbf78df616dfc8da3c43d4bf689 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 5 Apr 2021 08:07:07 +0200
Subject: [PATCH 0527/2024] wire-desktop: update to 3.24.2939

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

diff --git a/srcpkgs/wire-desktop/template b/srcpkgs/wire-desktop/template
index 6e9ac6b90c0a..edb4bb21be61 100644
--- a/srcpkgs/wire-desktop/template
+++ b/srcpkgs/wire-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'wire-desktop'
 pkgname=wire-desktop
-version=3.6.2885
-revision=2
+version=3.24.2939
+revision=1
 wrksrc="${pkgname}-linux-${version}"
 hostmakedepends="nodejs yarn git"
 short_desc="Wire for desktop"
@@ -9,9 +9,8 @@ maintainer="Young Jin Park <youngjinpark20@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://wire.com"
 distfiles="https://github.com/wireapp/wire-desktop/archive/linux/${version}.tar.gz"
-checksum=524db450d41a2dc677b8450cdf4e13dcc753280b2f6565ed5e23e6f59c14bed4
+checksum=69e70d39286f29b2fb186da30ec828be0a30329c457e829111b863223ed64127
 nocross=yes
-shlib_provides="libGLVESv2.so"
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) broken="glibc artefacts are installed" ;;
@@ -20,13 +19,11 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 pre_build() {
-	vsed -i '/node-addressbook/d' electron/package.json
 	yarn
-	yarn build:ts
 }
 
 do_build() {
-	npx grunt --target=dir linux-other
+	LINUX_TARGET=dir yarn build:linux
 }
 
 do_install() {
@@ -38,5 +35,4 @@ do_install() {
 	vcopy resources/icons/256x256.png usr/share/icons/hicolor/256x256/apps/wire-desktop.png
 	vmkdir usr/share/icons/hicolor/32x32/apps
 	vcopy resources/icons/32x32.png usr/share/icons/hicolor/32x32/apps/wire-desktop.png
-	vlicense LICENSE
 }

From 88b05b50c25e03090b5355da2dd609fadc3f5e7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Tue, 23 Mar 2021 22:58:58 +0100
Subject: [PATCH 0528/2024] New package: sslscan-2.0.9

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

diff --git a/srcpkgs/sslscan/template b/srcpkgs/sslscan/template
new file mode 100644
index 000000000000..0f4f07071ded
--- /dev/null
+++ b/srcpkgs/sslscan/template
@@ -0,0 +1,15 @@
+# Template file for 'sslscan'
+pkgname=sslscan
+version=2.0.9
+revision=1
+build_style=gnu-makefile
+makedepends="openssl-devel"
+short_desc="Fast SSL/TLS scanner"
+maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/rbsec/sslscan"
+changelog="https://github.com/rbsec/sslscan/raw/master/Changelog"
+distfiles="https://github.com/rbsec/sslscan/archive/refs/tags/${version}.tar.gz"
+checksum=22a3b0664cd12c06b716eee818fdcefa545803f5f52033723ce2f76743beb647
+# No test suite
+make_check=no

From bddac3dd7c25c17b6393164c3ffc29d1d5892f41 Mon Sep 17 00:00:00 2001
From: Kye Shi <shi.kye@gmail.com>
Date: Sun, 4 Apr 2021 20:48:38 -0700
Subject: [PATCH 0529/2024] openscad: update to 2021.01

---
 ...70cc5dd1bc677176ee732cdb0ddae57e5cf0.patch | 24 -------------------
 srcpkgs/openscad/template                     |  6 ++---
 2 files changed, 3 insertions(+), 27 deletions(-)
 delete mode 100644 srcpkgs/openscad/patches/b6c170cc5dd1bc677176ee732cdb0ddae57e5cf0.patch

diff --git a/srcpkgs/openscad/patches/b6c170cc5dd1bc677176ee732cdb0ddae57e5cf0.patch b/srcpkgs/openscad/patches/b6c170cc5dd1bc677176ee732cdb0ddae57e5cf0.patch
deleted file mode 100644
index f0d80d2f97eb..000000000000
--- a/srcpkgs/openscad/patches/b6c170cc5dd1bc677176ee732cdb0ddae57e5cf0.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From b6c170cc5dd1bc677176ee732cdb0ddae57e5cf0 Mon Sep 17 00:00:00 2001
-From: Jan Beich <jbeich@FreeBSD.org>
-Date: Fri, 25 Oct 2019 15:10:26 +0000
-Subject: [PATCH] Add missing header bootlegged by Boost < 1.72
-
-src/parser.y:76:6: error: no template named 'stack' in namespace 'std'
-std::stack<LocalScope *> scope_stack;
-~~~~~^
----
- src/parser.y | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git src/parser.y src/parser.y
-index 7f4fd56ca7..4c77c989ea 100644
---- src/parser.y
-+++ src/parser.y
-@@ -46,6 +46,7 @@
- #include "printutils.h"
- #include "memory.h"
- #include <sstream>
-+#include <stack>
- #include <boost/filesystem.hpp>
- #include "boost-utils.h"
- #include "feature.h"
diff --git a/srcpkgs/openscad/template b/srcpkgs/openscad/template
index 5e846402ddd3..693931379a26 100644
--- a/srcpkgs/openscad/template
+++ b/srcpkgs/openscad/template
@@ -1,7 +1,7 @@
 # Template file for 'openscad'
 pkgname=openscad
-version=2019.05
-revision=3
+version=2021.01
+revision=1
 build_style=qmake
 hostmakedepends="bison flex pkg-config gettext qt5-qmake qt5-host-tools"
 makedepends="cgal-devel harfbuzz-devel opencsg-devel qscintilla-qt5-devel
@@ -11,4 +11,4 @@ maintainer="Pierre Allegraud <pierre.allegraud@crans.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.openscad.org"
 distfiles="http://files.openscad.org/${pkgname}-${version}.src.tar.gz"
-checksum=0a16c4263ce52380819dd91c609a719d38f12f6b8c4da0e828dcbe5b70996f59
+checksum=d938c297e7e5f65dbab1461cac472fc60dfeaa4999ea2c19b31a4184f2d70359

From 89073077f2b803c8fbf9ffef6ccb581dc54870f6 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Mon, 5 Apr 2021 22:06:18 -0400
Subject: [PATCH 0530/2024] python3-zeroconf: fix do_check.

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

diff --git a/srcpkgs/python3-zeroconf/template b/srcpkgs/python3-zeroconf/template
index 46e78473d8ce..614001d14339 100644
--- a/srcpkgs/python3-zeroconf/template
+++ b/srcpkgs/python3-zeroconf/template
@@ -15,5 +15,6 @@ distfiles="${homepage}/archive/${version}.tar.gz"
 checksum=b8e7c55f36973362314b7d8cf716a76afea3c91abe9d2f435329dc67b973fe06
 
 do_check() {
-	python3 -m pytest zeroconf/test.py
+	# IPv6 doesn't work on github CI
+	SKIP_IPV6=1 python3 -m pytest zeroconf/test.py
 }

From 0cbdd15e5e14f96c8b4a344f6175bf02b19be204 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 5 Apr 2021 23:32:32 -0300
Subject: [PATCH 0531/2024] thunderbird: update to 78.9.0.

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

diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index a65381bbe89a..78531a033701 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n".
 #
 pkgname=thunderbird
-version=78.8.1
+version=78.9.0
 revision=1
 build_helper="rust"
 short_desc="Standalone Mail/News reader"
@@ -11,7 +11,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.thunderbird.net/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=1a0b9cc1c314fdfdf7aa10246b8c5062385b62df3c9cef2358d1aa657e8a6f0f
+checksum=8015a7f78b1644578f398b5ab670637c70890ab2bade35ba321d47d099ed3ac0
 
 lib32disabled=yes
 

From fe6cc37a98f868e116671032818b23f305612d87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 5 Apr 2021 23:32:41 -0300
Subject: [PATCH 0532/2024] thunderbird-i18n: update to 78.9.0.

---
 srcpkgs/thunderbird-i18n/template | 112 +++++++++++++++---------------
 1 file changed, 56 insertions(+), 56 deletions(-)

diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template
index 8db783cc2a36..e00b1cb59577 100644
--- a/srcpkgs/thunderbird-i18n/template
+++ b/srcpkgs/thunderbird-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'thunderbird-i18n'
 pkgname=thunderbird-i18n
-version=78.8.1
+version=78.9.0
 revision=1
 build_style=meta
 short_desc="Thunderbird language packs"
@@ -96,58 +96,58 @@ _pkgtmpl() {
 	}
 }
 
-checksum="3b5caf336a8745d04f33ea7f1f49ff418d07b1f45b1c405a5b6aec4aff40ff5a
- ef2c57a0837e10b8907b0f79387113a1455eb4a2012e4657a2fde579c597b8e6
- bf8f2a717308963b1141e83ecdf0a692a4b2157145b0529ee21adf265c7ee623
- 0a0cdf0d9c7657800c873c1fbf0d38576ef8def43698c2a5a268a560edc248db
- 4999fb95a43ffe02febdc30edd64eb7c428b54fec5ac0222bf129a044eba54e3
- a63ee258b84dabc1f540fb71bcd43a57e62647864d9bb301c17bfce3f819442d
- 2731288a62486e544e8f950af6a24abe7fb111a35072205aef262be48bf53028
- 5d356f0ebb24d9cf8e76e9099cdc399145f0c636c69bf4824fc4e21284b75bfb
- 035f9cecea490c8f2b0686ae05b23ac75fbd356cd512174925529f1082ac6b9f
- cd8f59690c872bb6029ee86a681a246eafd4a4400234a2aa899b3093900b4d95
- 0b3cc842492d67586e8b9ab8a73c96c19e86ba8b15a77b60c31f05ed07ce9f86
- 94c36a768ea104a480e71c3991446f8285f3f2f5afe91e9239607704b72709ac
- ace84f5769e7c120585ecb2baa4ad758aaeec44cdca09232ca3d48e5f6640ed9
- c482477cbc043e44e446cd0c74de711dc7789ae8813ff2771db433c91f49dce7
- a2eed0c82901778094b79637f3d389c7273b8b9d99be81445d9689e87854dfa5
- 95113edd17076555542713b3c7a54eee25f9283e410bf02b3a0ce02172cbc3e4
- 0778d1ab5a52e1d658bccea604c851a7e13b32b6ce2f08f6e306ed80697b1338
- c0a603a62fc97768bb02a1b5907f0175bb2047354d2dac05319c233b896f4d64
- 3e79273f15994c4b7c7a8f350e5a20a255b1907cdd084b5e99912a86406f3167
- 168f8d9590e41d57e242e24d181ed246f608eb6581482d20bdfb434650b9b8c8
- 9fbb1fa328728bc5972f12c808d474ffad3eb17e9726e78593bb008e95bc0cad
- b5909d54a31540d5c1027f50f100c7b35ef1cdd785123a3e760c9bc7be02a8dd
- c32bdb8eac84fdf70d37cd8561fa9b7cbe7feda9fe39460ab3e30de65f1b6ea5
- f87c979d0c90b4d6167654d8a03fc1f1402719d915d8d68f2c15756b7b63019d
- a7f9a5ab5c05f3f1e56a51c7df4245c3f210ff0bc1b0dd18df4f331e52a98d29
- dd4e3e14357a88116138bdacdb4ea262c3969726a193ad8037ae96423e54067b
- e84e60069fcf580b4ebdc714fc908c62650daa3f610800b96f1a5da2f20304a0
- 909e92d13592ac33718dd918c5d93c38b5467ac5ee7d43d346a21acd34e2fbd8
- 0d984a9d089ba8b5d52a73948e1ac571c6a0fd1e07529cd207ff65164584b203
- 6543f4a0046c4b80d3d4d369d7f332c860a2f0d88ceda54cae3f7a1001a3635e
- 2a87b79515bb276455b82f38a5be0aef736aa1fecda6942d78948b8097ba54bc
- 6e9a69b9fcbce800ae1545a6816a6bbd4e9233c13c2dc6cfd97c88c4002d9f43
- f067c252a9f4625744138a16051290675c76f0c48c674bea7b4a6c6abd4367ab
- 9f157020814ed8000eebb211c8161275660a44cd62f7e731d9aea71c28de1b45
- 41f41a33717b0628486a47b94d0aa09acf1b77d3ccb15a3a7709673a8659444c
- 8651f251b0db764a6880b84bc993b749db4f7caaba2e41e8ec3bdb2f29c7e55d
- 55b1100d77dee61ffb232872162d5543e6104f044fb7193436d75a4f528c316f
- 404af38ab6c28369edd2c9bbf2abb63e223c17f58fd4c8fc70052eae03a01f03
- c442d5c44f85c4d50d582790fc90e989af57f31d04c3bbd528b2e91393ec408e
- 50cf3279da4dfaecefd7963a20fc47eb4205959dd18fe8e3d9d275ce69b85a39
- 9a12508720f0ff8968cd20dfc4bf0bdffe7bc6e76d071cfd87c6227323162b49
- 10b9fdf09e5f3b45ab5e41eb0d76ee01667810a0711c4406fa5547d10275466e
- 3247fae4d15d56eba36d9fa272e0ff6130b0d59c4aed604545a4bfd209fd0367
- 4e1e066b39b20ddac404af5cfa992eafe137c2578b5ccaa6d2a7d4b1bbd96bcd
- ff853296394e6b6e297a593b2220a5b23bebc22481fe84b3f1bd942116686fdc
- 1f0a87eb63c33698e28c2aba01d87a9919065dbd1d67801f1f2e7bfabf3de127
- 6f1fc3812ad3df192aa36baef400d194d1238c5630242ae6a2306cce5188609d
- 4533c4bfbf71b25977b5d9e5b951545f0f8d036c2711c35ffce058e66e88b37f
- cd93569d7f5d9dfbac5720188d25828a30b3e36c08a2e74a6f4188b342fd4603
- 771c561fb6b821dad83a3772720bc835bc14305f0b4c60eab9e3e72595da91e7
- e1565ba9f1712de7348ffacc4189b9c09209803b80a190481625946099e419e0
- e946252285a1462ab7f099268efdb0cc15bc13bc42f70de744bbbce0672a3188
- 78a9ddd5291e5efecec3ab339b7b821540abc22aacf00c06227ba4a4bf44ee2f
- 6877de0d388f75e96c4b22b27a2ef4affad94bde1bc890c3eea1f30b7f4e06fa
- 03c562d04b1d1fe6b84326cc833223d7a6998c3ab7f3c2d65920bc0c331ecf51"
+checksum="63771cab0ed5fda4da901b6b6ecd2c88d87ddb9db019e0d5150e6a7111be6be3
+ efd68277617e53282fbcb54bb63274d55c13211eac7340e6ba481d6b083604d3
+ 9d9d566a8a71ce6bcbf7fdc4adf0d4e621bfcfffb792d582e86dbbd393f4eb4c
+ 3edf831839f3d3a5ae3edce5578748cc6a73a2b3a4f413a10c32e7808eb4a242
+ e2968ec5aabddb23249acb95a56f3f4c5068a3024f4a987cfcec29f46d1295df
+ a254d31294909e4007811c8ab1f21f2814863765da71cf999332a04910b8cc1c
+ 82a842c5d4fe297b1adfbed74fc8a63831b9507a4b1098db26f31a59d268dad0
+ 295f9730a9c9baa4325b346c163cd0ee1e19bf589cba595c151f7a31311a43c0
+ cb21492b06e6d4d7dc10f93e1a9c673297af7f010cbc6807245a776795d56486
+ ed1ce2005e42d5796596863344913506f7423ca31bb0640167964b7c36395585
+ 873a10bfc3f54c3240830eae45310f137823c0b83fb83dfc2098cc3a89acd802
+ e87877e537c49be2ce03cf8a41d6776e8f861f1f9d90bc862224df18acfc52bb
+ 8cdc746af4060d0260b1cf1c7efbd102ed4eabf57bdfb0e62167a39a08b526e1
+ 39363f37a388c7b82df2d3cf868803682d8d6612a2b6557f1fdb9ae1466d4be7
+ 48f51bb821ffe212f15e2065a6b3377cc33704f0a07a18b3deaa79d839bef89d
+ 11c649466c6df3d2a62402711be46d74a02b668ec95de83f87e0675692b4633f
+ 5e4cf5c5b24cfabe35971dec28e47c337749a3d382b43f7a2558deadc73a7864
+ 1c49fe83d149bb1bbe4adce5f43bbf9e6bff1c6a917f898c029ce3fd46a7174c
+ e3ed198a41f20b4168b23e29324eec3e5149de2cc454675f1a30d68baaa301c3
+ b3fece3eaaccedcf28702e747307e11988eec65ef0cadccc0a01ea4092df8ac0
+ fd8f4cec4dba5ba66f905c0428f01c9be9a2a20f8d3996828f54da6fff331028
+ b6031ea780b0bf7b4f8c96aaf38d96dc686f0e2f3d58a4ec9918ad282f554c94
+ e7f28b4333ea0d2db01af8496192769af1cf2666585bb463dc39d1ba1fd73345
+ 2a80d9ca7e942c5eca5cbd8b82ca47901728f52c2de074fb9751c6c37fcb37ec
+ 3dc2a28bf96db0d678457f86e46d7a24e683c38579c0b480f59c1eb9ef2573b9
+ ff9079655352bdf9f5c1bb2e4e1596d1755300eda7e1670dbdb796a99223158a
+ 71a1964cc36893f217a3c778a3fa17810843f830245241af27054ac1222a14e5
+ 70b03fb570e5f3443d3be9970dd65fdd4fcd81bff4cd8319f028c0a4c8c166a8
+ 78833bae90336e27256341a6b7ff1e53be9dd65447a1e71528ead725504f330d
+ ac5276b4a13bb4a07c92160a6c3cbdb3d76bd622c49163eb0e82f84153259b5b
+ c1f8180207e1abdbeaed39337c9bbf5d421eb2c85146646a888bd02e5de8c27e
+ 800eb1b98bbb145a5bf22fa8a1e7cb8581371939655d61dcd642bba0de8250ba
+ f39cb90898efc60c0f977f3f9abb94db5c1e18e2ace7317240784dc6382bccb3
+ 496275439573f95f41a28d08d434ccea79e86d40f2a8321b47b98daa6dd3036c
+ cc3229a2a009fcec836b2056ccbf50cdd4aba461517dad9a04331ae5f95a3a2f
+ d20ff56ab68e53e3e4365247b564f6efc3c0cbdb301ff79ff9a80aae986c3b7d
+ 998224c8e059afc068b004c0dd3887f85974a0af56b9d0ef0dad945e049db2b0
+ fcf47de621e9f75729b1fa8c6c5f2135eb5b6d3dd78c8fae01acd6ad857604d2
+ c7b3a6b7c0a59620e65877b3eaef92b2b2b7b4f5e7e152b7297db3d24a00b399
+ 7fae97e71b183f55292feed9847a8d6141671d703e2af8aa1d64a71db2c377ec
+ c8aa778fcf6c1c32b0038affadf540145cee44c9e59d278b55c4d1966ffa27d3
+ 14065be7c50080586aa36cd43814dcabfae8572065cc3ec1ee8344e77cae9ce1
+ af30877d15eecc65804528bbd4fde0897663526f4d25fdef00b4eaf84be8e580
+ 925ea6a7f6e1a1fb17004cc7ab16bc0a307995541b9741264497f51d8a60679e
+ 419b8bd06dd680b27b0843f5cf6af1b787695dc608136970a417ebafe3ae325a
+ 7d9eb5e2bea78aa75dc345598e62ccc3efb37e64f21ec19a92920f826f486651
+ e8e88cfad04351f1cc3ecb811011bcd964d6b4ef3a6a30f98e0f8a1363c93d37
+ 1ca503db23e2648c4ebb40b117c652e0d8b95e4d07e843031db0530e00bfdd6f
+ d02b1a07f824644e336a9e92a8342d58f5eaec903fa6b80067f3c650659b3756
+ 7caf4222472434b465fca8f072a29503d38c143c1900b71bac7a607a7120d359
+ 9a7c0186b6fca8e48ec3d0c94f0bfaeb73f378178799adc04c79164b300e575a
+ abac946215c6a41be19aeacd271a2a2b2040bda87906d7e1c6f76ea19a35e507
+ 5a3827a6f662950fdb001863ce8367d02fabe1c40d44500ee6b7019874119d23
+ d1a1f0a30e037d65b667e1cff856a195c4747af4bf599f1bc8211347259fedf6
+ dcdd87071b6b16eafb39d752119f60105d461dae5155c9b33d00bc3037a98dbe"

From d72fb0547288ee669099fa084636da413543cba4 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Tue, 6 Apr 2021 14:34:03 +1000
Subject: [PATCH 0533/2024] retroarch: update to 1.9.1

---
 .../retroarch/patches/conflicting-types.patch    | 16 ----------------
 srcpkgs/retroarch/patches/musl-time_h.patch      | 15 ---------------
 srcpkgs/retroarch/template                       |  7 ++++---
 3 files changed, 4 insertions(+), 34 deletions(-)
 delete mode 100644 srcpkgs/retroarch/patches/conflicting-types.patch
 delete mode 100644 srcpkgs/retroarch/patches/musl-time_h.patch

diff --git a/srcpkgs/retroarch/patches/conflicting-types.patch b/srcpkgs/retroarch/patches/conflicting-types.patch
deleted file mode 100644
index d089b1dc761d..000000000000
--- a/srcpkgs/retroarch/patches/conflicting-types.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-This patch has been merged upstream and shouldn't be needed for 1.9.1:
-https://github.com/libretro/RetroArch/pull/11171
-
-diff --git a/gfx/drivers_context/vc_egl_ctx.c b/gfx/drivers_context/vc_egl_ctx.c
-index 3c52edb96a..dba0e038f4 100644
---- gfx/drivers_context/vc_egl_ctx.c
-+++ gfx/drivers_context/vc_egl_ctx.c
-@@ -81,6 +81,8 @@ typedef struct
- /* TODO/FIXME - static globals */
- static enum gfx_ctx_api vc_api = GFX_CTX_NONE;
- 
-+static bool gfx_ctx_vc_bind_api(void *, enum gfx_ctx_api, unsigned, unsigned);
-+
- static INLINE bool gfx_ctx_vc_egl_query_extension(vc_ctx_data_t *vc, const char *ext)
- {
-    const char *str = (const char*)eglQueryString(vc->egl.dpy, EGL_EXTENSIONS);
diff --git a/srcpkgs/retroarch/patches/musl-time_h.patch b/srcpkgs/retroarch/patches/musl-time_h.patch
deleted file mode 100644
index bf0ae3b7c0d7..000000000000
--- a/srcpkgs/retroarch/patches/musl-time_h.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-This patch has been merged upstream and shouldn't be needed for 1.9.1:
-https://github.com/libretro/RetroArch/pull/11170
-
-diff --git a/libretro-common/file/nbio/nbio_linux.c b/libretro-common/file/nbio/nbio_linux.c
-index 70e3a98..0c2d857 100644
---- libretro-common/file/nbio/nbio_linux.c
-+++ libretro-common/file/nbio/nbio_linux.c
-@@ -36,6 +36,7 @@
- #include <fcntl.h>
- #include <sys/syscall.h>
- #include <linux/aio_abi.h>
-+#include <time.h>
- 
- struct nbio_linux_t
- {
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index 87301c2c9efa..8b2d3fb445f4 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,12 +1,13 @@
 # Template file for 'retroarch'
 pkgname=retroarch
-version=1.9.0
-revision=2
+version=1.9.1
+revision=1
 wrksrc="RetroArch-$version"
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
  --enable-udev --disable-builtinflac --disable-builtinglslang
  --disable-builtinmbedtls --disable-builtinminiupnpc --disable-builtinzlib
+ --disable-git_version
  $(vopt_enable ffmpeg) $(vopt_enable flac) $(vopt_enable glslang) $(vopt_enable jack)
  $(vopt_enable miniupnpc) $(vopt_enable pulseaudio pulse) $(vopt_enable qt5 qt)
  $(vopt_enable sdl2) $(vopt_enable vulkan) $(vopt_enable wayland) $(vopt_enable x11)"
@@ -24,7 +25,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.retroarch.com/"
 distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
-checksum=39d7ad9298c9487fb4848cd6a257c23a95ee85f83c75302f97bcc4797f154b6a
+checksum=153f7057cecd22441904f557302d50f969d199c4b6ff263bfe87d9cf4a9bab75
 
 build_options="ffmpeg flac gles2 glslang jack miniupnpc neon opengl pulseaudio qt5 sdl2 vulkan wayland x11"
 build_options_default="ffmpeg flac gles2 glslang miniupnpc opengl pulseaudio sdl2 vulkan wayland x11"

From 0680f7c1080c145e1d46323fa189899e03431e82 Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Mon, 5 Apr 2021 23:45:12 -0300
Subject: [PATCH 0534/2024] atril: update to 1.24.1.

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

diff --git a/srcpkgs/atril/template b/srcpkgs/atril/template
index b2747e50f063..b26399624b01 100644
--- a/srcpkgs/atril/template
+++ b/srcpkgs/atril/template
@@ -1,6 +1,6 @@
 # Template file for 'atril'
 pkgname=atril
-version=1.24.0
+version=1.24.1
 revision=1
 build_style=gnu-configure
 build_helper="gir"
@@ -19,7 +19,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://mate-desktop.org"
 distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=be245d445333de35bdad22e4299252e6b30851d94f02caef14100b78787fc724
+checksum=b48372a89813f31d2635de02d9e92ba38e794daddf625f06d80c3793248bde1a
 patch_args=-Np1
 
 build_options="gir"

From ebb277e7a64e185ab83f053c6d45d2de2312c549 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 5 Apr 2021 22:45:40 -0300
Subject: [PATCH 0535/2024] waypipe: update to 0.8.0.

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

diff --git a/srcpkgs/waypipe/template b/srcpkgs/waypipe/template
index eb8a103ea516..c9da48718a2d 100644
--- a/srcpkgs/waypipe/template
+++ b/srcpkgs/waypipe/template
@@ -1,6 +1,6 @@
 # Template file for 'waypipe'
 pkgname=waypipe
-version=0.7.2
+version=0.8.0
 revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=meson
@@ -16,7 +16,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://gitlab.freedesktop.org/mstoeckl/waypipe"
 distfiles="https://gitlab.freedesktop.org/mstoeckl/waypipe/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
-checksum=b280079b05aef9b243be3644fc803e3feaa2fc2952d11a6c02ab33257fb52479
+checksum=e61fa816a770d0bc22aa2545547c61edc24cf52ca5bb3da32351f2ac9ff94d02
 
 post_install() {
 	vlicense COPYING LICENSE

From b37a1211fe9e2b04f69979080e14269bd7304957 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 6 Apr 2021 11:12:47 +0200
Subject: [PATCH 0536/2024] ruby: update to 2.7.3.

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

diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index f260af814c68..29c1c2eac3c3 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -2,8 +2,8 @@
 _ruby_abiver=2.7.0
 
 pkgname=ruby
-version=2.7.2
-revision=3
+version=2.7.3
+revision=1
 build_style=gnu-configure
 configure_args="--enable-shared --disable-rpath
  DOXYGEN=/usr/bin/doxygen DOT=/usr/bin/dot PKG_CONFIG=/usr/bin/pkg-config"
@@ -17,7 +17,7 @@ homepage="http://www.ruby-lang.org/en/"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Ruby, BSD-2-Clause"
 distfiles="https://cache.ruby-lang.org/pub/ruby/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=65a590313d244d48dc2ef9a9ad015dd8bc6faf821621bbb269aa7462829c75ed
+checksum=3e90e5a41d4df90e19c307ab0fb41789992c0b0128e6bbaa669b89ed44a0b68b
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Broken on the builders but successfully built locally

From ace57ca294afab6b74579da061717e9807674460 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 5 Apr 2021 15:42:20 -0300
Subject: [PATCH 0537/2024] yadm: update to 3.1.0.

closes #30023
---
 srcpkgs/yadm/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/yadm/template b/srcpkgs/yadm/template
index d33617c085e4..9f8b63e4df26 100644
--- a/srcpkgs/yadm/template
+++ b/srcpkgs/yadm/template
@@ -1,18 +1,18 @@
 # Template file for 'yadm'
 pkgname=yadm
-version=3.0.2
+version=3.1.0
 revision=1
 depends="bash git gnupg"
 short_desc="Yet Another Dotfiles Manager"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://yadm.io/"
-distfiles="https://github.com/TheLocehiliosan/${pkgname}/archive/${version}.tar.gz"
-checksum=724a8b61b09b70f5952cf14fd1786617bf88243a276b2d93dd7306feab13983c
+distfiles="https://github.com/TheLocehiliosan/yadm/archive/${version}.tar.gz"
+checksum=9f848c80deed2725c012d058bd60d1ea13539fd6fbacd5245bf97d442cb89263
 
 do_install() {
-	vbin ${pkgname}
-	vman ${pkgname}.1
+	vbin yadm
+	vman yadm.1
 	vcompletion completion/bash/yadm bash
 	vcompletion completion/fish/yadm.fish fish
 	vcompletion completion/zsh/_yadm zsh

From f74e15168addd662cc95f38ca1f9600186e7ae95 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 6 Apr 2021 10:31:55 +0300
Subject: [PATCH 0538/2024] lowdown: update to 0.8.4.

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

diff --git a/srcpkgs/lowdown/template b/srcpkgs/lowdown/template
index f7cf1acba040..66543d574636 100644
--- a/srcpkgs/lowdown/template
+++ b/srcpkgs/lowdown/template
@@ -1,6 +1,6 @@
 # Template file for 'lowdown'
 pkgname=lowdown
-version=0.8.2
+version=0.8.4
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
@@ -12,7 +12,7 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/lowdown/"
 changelog="https://kristaps.bsd.lv/lowdown/archive.html"
 distfiles="https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"
-checksum=098c5df1d3c25f287427181913390b8bc1cc8cfac99b2d968f0c2d50966fa2c4
+checksum=626ddf7e41ef462f754c0794f932f3ec1b529974ac23aa9ac27caf55bebfd4b8
 
 post_install() {
 	vlicense LICENSE.md

From 1234ed55150112898d54d755e071b2fb0164a5da Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 2 Apr 2021 03:34:24 +0200
Subject: [PATCH 0539/2024] knot-resolver: update to 5.3.1.

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

diff --git a/srcpkgs/knot-resolver/template b/srcpkgs/knot-resolver/template
index cfc297980547..04933629b990 100644
--- a/srcpkgs/knot-resolver/template
+++ b/srcpkgs/knot-resolver/template
@@ -1,6 +1,6 @@
 # Template file for 'knot-resolver'
 pkgname=knot-resolver
-version=5.3.0
+version=5.3.1
 revision=1
 build_style=meson
 configure_args="
@@ -17,7 +17,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-resolver.cz/"
 distfiles="https://secure.nic.cz/files/knot-resolver/knot-resolver-${version}.tar.xz"
-checksum=fb6cb2c03f4fffbdd8a0098127383d03b14cf7d6abf3a0cd229fb13ff68ee33e
+checksum=9d4d6b7bcdf114acc948e5ee68c83fcbb3944f48a13b9751dbbbc190cdd729c9
 
 system_accounts="_knot_resolver"
 _knot_resolver_homedir="/var/cache/knot-resolver"

From c1cbeb2e04b095fb53e9cca3a8c45fd49bc8bfb8 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 6 Apr 2021 14:23:30 +0200
Subject: [PATCH 0540/2024] syncthing: update to 1.15.1.

fixes CVE-2021-21404
---
 srcpkgs/syncthing/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index 23cddc403f32..bc393826442b 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,12 +1,11 @@
 # Template file for 'syncthing'
 pkgname=syncthing
-version=1.14.0
+version=1.15.1
 revision=1
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
 go_package="
  ${go_import_path}/cmd/stdiscosrv
- ${go_import_path}/cmd/stcli
  ${go_import_path}/cmd/strelaysrv
  ${go_import_path}/cmd/syncthing"
 go_build_tags="noupgrade"
@@ -18,7 +17,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=ab34f328fdca5a1a334af844787e72e6a80988830a5223d82a915efe038433ec
+checksum=ad7276cec428f1b680a660179a29708a68d4214d58c73043453b5a164e316c92
 
 pre_build() {
 	GOARCH= go generate \

From 933776ad43f32bcee33e25935a67b6b80dba3d59 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Mar 2021 12:27:44 +0400
Subject: [PATCH 0541/2024] New package: python3-cchardet

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

diff --git a/srcpkgs/python3-cchardet/template b/srcpkgs/python3-cchardet/template
new file mode 100644
index 000000000000..27c0903bdcde
--- /dev/null
+++ b/srcpkgs/python3-cchardet/template
@@ -0,0 +1,15 @@
+# Template file for 'python3-cchardet'
+pkgname=python3-cchardet
+version=2.1.7
+revision=1
+wrksrc="cchardet-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-Cython"
+makedepends="python3-devel"
+depends="python3"
+short_desc="Universal encoding detector faster than chardet"
+maintainer="skmpz <dem.procopiou@gmail.com>"
+license="MPL-1.1"
+homepage="https://github.com/PyYoshi/cChardet"
+distfiles="${PYPI_SITE}/c/cchardet/cchardet-${version}.tar.gz"
+checksum=c428b6336545053c2589f6caf24ea32276c6664cb86db817e03a94c60afa0eaf

From cd5933edf60f200635e22164b08a4e2c027e83fa Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Mar 2021 12:36:15 +0400
Subject: [PATCH 0542/2024] calibre: update to 5.14.0.

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

diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 166f5d9c9ecf..ec8a9466d446 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
 # Template file for 'calibre'
 pkgname=calibre
-version=5.9.0
-revision=3
+version=5.14.0
+revision=1
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
 hostmakedepends="pkg-config python3-BeautifulSoup4 python3-Pillow python3-PyQt5-svg
@@ -18,16 +18,16 @@ depends="desktop-file-utils optipng poppler-utils python3-BeautifulSoup4
  python3-css-parser python3-cssselect python3-dateutil python3-dbus
  python3-dnspython python3-feedparser python3-html5-parser python3-mechanize
  python3-msgpack python3-netifaces python3-psutil python3-regex python3-html2text
- python3-pychm qt5-webengine speech-dispatcher"
+ python3-pychm python3-cchardet qt5-webengine speech-dispatcher"
 # should check if python3-pycryptodome is still needed
 checkdepends="${depends} libjpeg-turbo-tools jxrlib python3-pycryptodome"
 short_desc="Ebook management application"
 maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-3.0-only"
 homepage="https://calibre-ebook.com"
-changelog="https://raw.githubusercontent.com/kovidgoyal/calibre/master/Changelog.yaml"
+changelog="https://raw.githubusercontent.com/kovidgoyal/calibre/master/Changelog.txt"
 distfiles="https://download.calibre-ebook.com/${version}/calibre-${version}.tar.xz"
-checksum=a71196af15372054c4a25697534a2df1ef6dd732b9db07aaecaac7a86d9b3a0a
+checksum=186cce57b6990af0b014282fa1d3d914fffc11e40d8495ea43d91485534e1271
 lib32disabled=yes
 nocross=yes
 
@@ -53,10 +53,12 @@ do_check() {
 	# disabled for now
 	# unrar test fails because python3-unrardll isn't packaged
 	# searching test case fails (non-deterministic)
+	# 7z tests disabled (missing python-py7zr dependencies)
 	python3 setup.py test \
 		--exclude-test-name unrar \
 		--exclude-test-name qt \
-		--exclude-test-name searching
+		--exclude-test-name searching \
+		--exclude-test-name 7z
 }
 
 do_install() {

From 3417fa615ba7464e9022ca4c1c843d98c8ee8480 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 6 Apr 2021 09:44:28 -0300
Subject: [PATCH 0543/2024] xrick: fix build with gcc>=10.

---
 srcpkgs/xrick/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/xrick/template b/srcpkgs/xrick/template
index c2e5d98a8270..42b8a0febe94 100644
--- a/srcpkgs/xrick/template
+++ b/srcpkgs/xrick/template
@@ -13,6 +13,8 @@ homepage="http://www.bigorno.net/xrick/"
 distfiles="https://www.bigorno.net/xrick/xrick-${version}.tgz"
 checksum=aa8542120bec97a730258027a294bd16196eb8b3d66134483d085f698588fc2b
 
+CFLAGS=-fcommon
+
 do_install() {
 	vmkdir usr/share/$pkgname
 	vinstall data.zip 0644 usr/share/$pkgname

From 69e74a27c2bcf048b9827f1a90d15e8864b2b150 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 17 Jan 2021 21:26:59 +0100
Subject: [PATCH 0544/2024] musl-legacy-compat: update to 0.5.

Add `error_at_line(3)` to error.h
---
 srcpkgs/musl-legacy-compat/files/error.h | 27 ++++++++++++++++++++++++
 srcpkgs/musl-legacy-compat/template      |  4 ++--
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/musl-legacy-compat/files/error.h b/srcpkgs/musl-legacy-compat/files/error.h
index 835d0cb7f7df..9a4e1f8d0064 100644
--- a/srcpkgs/musl-legacy-compat/files/error.h
+++ b/srcpkgs/musl-legacy-compat/files/error.h
@@ -30,4 +30,31 @@ static inline void error(int status, int errnum, const char* format, ...)
 		exit(status);
 }
 
+static int error_one_per_line = 0;
+
+static inline void error_at_line(int status, int errnum, const char *filename,
+		unsigned int linenum, const char *format, ...)
+{
+	va_list ap;
+	if (error_one_per_line) {
+		static const char *old_filename;
+		static int old_linenum;
+		if (linenum == old_linenum && filename == old_filename)
+			return;
+		old_filename = filename;
+		old_linenum = linenum;
+	}
+	fprintf(stderr, "%s: %s:%u: ", program_invocation_name, filename, linenum);
+	va_start(ap, format);
+	vfprintf(stderr, format, ap);
+	va_end(ap);
+	if (errnum)
+		fprintf(stderr, ": %s", strerror(errnum));
+	fprintf(stderr, "\n");
+	error_message_count++;
+	if (status)
+		exit(status);
+}
+
+
 #endif	/* _ERROR_H_ */
diff --git a/srcpkgs/musl-legacy-compat/template b/srcpkgs/musl-legacy-compat/template
index a59d4e7683f0..f68bd9922512 100644
--- a/srcpkgs/musl-legacy-compat/template
+++ b/srcpkgs/musl-legacy-compat/template
@@ -1,7 +1,7 @@
 # Template file for 'musl-legacy-compat'
 pkgname=musl-legacy-compat
-version=0.4
-revision=2
+version=0.5
+revision=1
 archs="*-musl"
 bootstrap=yes
 short_desc="Legacy compatibility headers for the musl libc"

From 3d0bc774ce78be3367c3d202a90df6b4fa51d752 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 17 Jan 2021 21:34:26 +0100
Subject: [PATCH 0545/2024] plocate: update to 1.1.6.

---
 srcpkgs/plocate/files/plocate.cron-daily |  6 ++----
 srcpkgs/plocate/files/pupdatedb          |  8 --------
 srcpkgs/plocate/patches/musl.patch       | 21 +++++++++++++++++++++
 srcpkgs/plocate/template                 | 20 +++++++++++++-------
 4 files changed, 36 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/plocate/files/pupdatedb
 create mode 100644 srcpkgs/plocate/patches/musl.patch

diff --git a/srcpkgs/plocate/files/plocate.cron-daily b/srcpkgs/plocate/files/plocate.cron-daily
index 099ba5ce69af..a616d55d2809 100644
--- a/srcpkgs/plocate/files/plocate.cron-daily
+++ b/srcpkgs/plocate/files/plocate.cron-daily
@@ -1,5 +1,3 @@
 #!/bin/sh
-set -e
-plocate-build /var/lib/mlocate/mlocate.db /var/lib/mlocate/plocate.db.new
-chgrp _plocate /var/lib/mlocate/plocate.db.new
-mv /var/lib/mlocate/plocate.db.new /var/lib/mlocate/plocate.db
+ulimit -n 131072
+exec pupdatedb
diff --git a/srcpkgs/plocate/files/pupdatedb b/srcpkgs/plocate/files/pupdatedb
deleted file mode 100644
index 08fdbd0748ab..000000000000
--- a/srcpkgs/plocate/files/pupdatedb
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-# pupdatedb [database directory] - update a database for plocate
-set -e
-dbdir=${1:-${DBDIR:-/var/lib/mlocate}}
-mupdatedb -o "${dbdir}/mlocate.db"
-plocate-build "${dbdir}/mlocate.db" "${dbdir}/plocate.db.new"
-chgrp _plocate "${dbdir}/plocate.db.new"
-mv "${dbdir}/plocate.db.new" "${dbdir}/plocate.db"
diff --git a/srcpkgs/plocate/patches/musl.patch b/srcpkgs/plocate/patches/musl.patch
new file mode 100644
index 000000000000..c75020f99b30
--- /dev/null
+++ b/srcpkgs/plocate/patches/musl.patch
@@ -0,0 +1,21 @@
+--- conf.cpp
++++ conf.cpp
+@@ -479,7 +479,7 @@
+ 			if (conf_scan_root != NULL)
+ 				error(EXIT_FAILURE, 0, _("--%s specified twice"),
+ 				      "database-root");
+-			conf_scan_root = canonicalize_file_name(optarg);
++			conf_scan_root = realpath(optarg, NULL);
+ 			if (conf_scan_root == NULL)
+ 				error(EXIT_FAILURE, errno, _("invalid value `%s' of --%s"), optarg,
+ 				      "database-root");
+--- database-builder.h
++++ database-builder.h
+@@ -3,6 +3,7 @@
+ 
+ #include "db.h"
+ 
++#include <unistd.h>
+ #include <chrono>
+ #include <fcntl.h>
+ #include <memory>
diff --git a/srcpkgs/plocate/template b/srcpkgs/plocate/template
index 590edee47e82..8fbece076403 100644
--- a/srcpkgs/plocate/template
+++ b/srcpkgs/plocate/template
@@ -1,24 +1,32 @@
 # Template file for 'plocate'
 pkgname=plocate
-version=1.0.7
+version=1.1.6
 revision=1
 build_style=meson
+configure_args="
+ -Dupdatedb_progname=pupdatedb
+ -Dlocategroup=_plocate"
 hostmakedepends="pkg-config"
 makedepends="libzstd-devel"
-depends="mlocate"
 short_desc="Much faster locate based on posting lists"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://plocate.sesse.net/"
+changelog="https://git.sesse.net/?p=plocate;a=blob_plain;f=NEWS;hb=HEAD"
 distfiles="https://plocate.sesse.net/download/plocate-${version}.tar.gz"
-checksum=528541eede06170aa16488b2c24abad2e527a12053a62a4a49d0eac3a41e21d3
+checksum=bff5d80874639003ffba34a37778081ca0a75f89ea0ca3d1bee9309332bfdbd3
 
 system_accounts="_plocate"
 
 alternatives="
  locate:locate:/usr/bin/plocate
  locate:locate.1:/usr/share/man/man1/plocate.1
- locate:updatedb:/usr/bin/pupdatedb"
+ locate:updatedb:/usr/bin/pupdatedb
+ locate:updatedb.conf.5:/usr/share/man/man5/pupdatedb.conf.5"
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	makedepends+=" musl-legacy-compat"
+fi
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
@@ -26,8 +34,6 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 fi
 
 post_install() {
-	# replace daily cronjob with our own version
-	rm ${DESTDIR}/etc/cron.daily/plocate
 	vinstall ${FILESDIR}/plocate.cron-daily 744 etc/cron.daily plocate-build
-	vbin ${FILESDIR}/pupdatedb
+	mv ${DESTDIR}/usr/share/man/man5/{,p}updatedb.conf.5
 }

From 211c1d6f9f3394c35e388a7c4e833a3a4771df1b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 6 Apr 2021 14:42:26 +0200
Subject: [PATCH 0546/2024] openradtool: update to 0.12.5.

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

diff --git a/srcpkgs/openradtool/template b/srcpkgs/openradtool/template
index 3256322015e3..e1c588acae49 100644
--- a/srcpkgs/openradtool/template
+++ b/srcpkgs/openradtool/template
@@ -1,6 +1,6 @@
 # Template file for 'openradtool'
 pkgname=openradtool
-version=0.12.4
+version=0.12.5
 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=e2699f2a4eda1bd5e2ace625239acdcb5e40e86e357610331761ba7439d8f624
+checksum=f74d4cb1f72124a6581e57392ca46b851870ebf0928addc71d6db90fe43992ee
 
 post_install() {
 	sed -n '2,16p' main.c >LICENSE

From 51b9581b594f9016c2807b94ed8f500b349ce95d Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 6 Apr 2021 15:40:52 +0300
Subject: [PATCH 0547/2024] opera: update to 75.0.3969.149.

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

diff --git a/srcpkgs/opera/template b/srcpkgs/opera/template
index 5b1abd449ce2..420dd20f7b87 100644
--- a/srcpkgs/opera/template
+++ b/srcpkgs/opera/template
@@ -1,6 +1,6 @@
 # Template file for 'opera'
 pkgname=opera
-version=75.0.3969.93
+version=75.0.3969.149
 revision=1
 archs="x86_64"
 depends="ffmpeg desktop-file-utils hicolor-icon-theme"
@@ -9,7 +9,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="custom:Proprietary"
 homepage="https://www.opera.com/computer"
 distfiles="http://get.geo.opera.com/pub/opera/desktop/${version}/linux/${pkgname}-stable_${version}_amd64.deb"
-checksum=0805334a1d236f44bfe9a34fa2fd829fe19587c480dd9559145a3a620e42fac8
+checksum=cd2e68873eef290d3240283b14a184d914bf251a0177cca5c299494dba095262
 repository="nonfree"
 nostrip=yes
 

From 5f78b1899b4a408e986ea2e818021de239e21d36 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 6 Apr 2021 14:52:15 +0200
Subject: [PATCH 0548/2024] u-boot-tools: update to 2021.04.

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

diff --git a/srcpkgs/u-boot-tools/template b/srcpkgs/u-boot-tools/template
index afb4625abc13..bef9d6328b96 100644
--- a/srcpkgs/u-boot-tools/template
+++ b/srcpkgs/u-boot-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'u-boot-tools'
 pkgname=u-boot-tools
-version=2021.01
-revision=2
+version=2021.04
+revision=1
 wrksrc="u-boot-${version}"
 build_style=gnu-makefile
 make_build_args="HOSTSTRIP=: STRIP=:"
@@ -13,7 +13,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.denx.de/wiki/U-Boot/"
 distfiles="ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2"
-checksum=b407e1510a74e863b8b5cb42a24625344f0e0c2fc7582d8c866bd899367d0454
+checksum=0d438b1bb5cceb57a18ea2de4a0d51f7be5b05b98717df05938636e0aadfe11a
 
 if [ "$CROSS_BUILD" ]; then
 	make_build_args+=" CROSS_BUILD_TOOLS=y CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"

From 00b5c7a042a5098c8650ff4ea7ed17a12f8731ae Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 4 Apr 2021 14:37:48 -0700
Subject: [PATCH 0549/2024] gatling: update to 0.16, fix lint

Gatling 0.16 grew a header dependency on capability.h. However, it
doesn't appear to actually use anything from libcap so until that
changes, patch gatling.c to use linux/capability.h (from
kernel-libc-headers) instead of sys/capability.h (from libcap-devel).
---
 srcpkgs/gatling/patches/gatling.c.patch | 12 ++++++++++++
 srcpkgs/gatling/template                | 15 +++++++--------
 2 files changed, 19 insertions(+), 8 deletions(-)
 create mode 100644 srcpkgs/gatling/patches/gatling.c.patch

diff --git a/srcpkgs/gatling/patches/gatling.c.patch b/srcpkgs/gatling/patches/gatling.c.patch
new file mode 100644
index 000000000000..ab2a0bb6c68a
--- /dev/null
+++ b/srcpkgs/gatling/patches/gatling.c.patch
@@ -0,0 +1,12 @@
+# patch gatling.c to use capability headers from the kernel instead of libcap
+--- gatling.c.orig	2021-04-04 21:51:17.641001871 +0000
++++ gatling.c	2021-04-04 21:51:49.798095616 +0000
+@@ -62,7 +62,7 @@
+ 
+ #ifdef __linux__
+ #include <sys/auxv.h>
+-#include <sys/capability.h>
++#include <linux/capability.h>
+ #endif
+ 
+ char serverroot[1024];
diff --git a/srcpkgs/gatling/template b/srcpkgs/gatling/template
index d1d83c202269..9993c3a0cd69 100644
--- a/srcpkgs/gatling/template
+++ b/srcpkgs/gatling/template
@@ -1,17 +1,17 @@
 # Template file for 'gatling'
 pkgname=gatling
-version=0.15
-revision=10
+version=0.16
+revision=1
 build_style=gnu-makefile
+make_build_target="gatling dl getlinks"
+make_install_args="prefix=/usr MANDIR=/usr/share/man"
 makedepends="libowfat openssl-devel zlib-devel"
 short_desc="High performance web server"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-2"
-homepage="http://www.fefe.de/$pkgname/"
+license="GPL-2.0-only"
+homepage="http://www.fefe.de/gatling"
 distfiles="https://www.fefe.de/gatling/$pkgname-$version.tar.xz"
-checksum=6fa329d0ced0c80deb8dde5460e9d9e984bee94f265043d7fdec0e253dce9aa4
-make_build_target="gatling dl getlinks"
-make_install_args="prefix=/usr MANDIR=/usr/share/man"
+checksum=5f96438ee201d7f1f6c2e0849ff273b196bdc7493f29a719ce8ed08c8be6365b
 
 CFLAGS="-std=c99 -I${XBPS_CROSS_BASE}/usr/include/libowfat -fcommon"
 
@@ -24,4 +24,3 @@ pre_build() {
 pre_install() {
 	vmkdir usr/share/man/man1
 }
-

From 96460611d55a4ecea6e81396af37426c2243a5a4 Mon Sep 17 00:00:00 2001
From: biopsin <60029989+biopsin@users.noreply.github.com>
Date: Sat, 3 Apr 2021 08:47:48 +0200
Subject: [PATCH 0550/2024] libmypaint: update to 1.6.1

Since neither GIMP or mypaint use the gobject-introspection, we don't
have to hack around it for cross targets, at least not yet.
---
 common/shlibs               |  2 +-
 srcpkgs/libmypaint/template | 21 +++++++++++++--------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 9aa0a601250b..40faf29b113a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -556,7 +556,7 @@ libecpg_compat.so.3 postgresql-libs-13.2_2
 libecpg.so.6 postgresql-libs-13.2_2
 libpgtypes.so.3 postgresql-libs-13.2_2
 libpq.so.5 postgresql-libs-13.2_2
-libmypaint-1.5.so.1 libmypaint-1.5.1_1
+libmypaint.so.0 libmypaint-1.6.1_1
 libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
 libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.8_1
diff --git a/srcpkgs/libmypaint/template b/srcpkgs/libmypaint/template
index e8e68dc8590f..cf324beff207 100644
--- a/srcpkgs/libmypaint/template
+++ b/srcpkgs/libmypaint/template
@@ -1,7 +1,7 @@
 # Template file for 'libmypaint'
 pkgname=libmypaint
-version=1.5.1
-revision=2
+version=1.6.1
+revision=1
 build_style=gnu-configure
 configure_args="--disable-gegl"
 hostmakedepends="intltool pkg-config $(vopt_if gir gobject-introspection)"
@@ -11,10 +11,16 @@ maintainer="Stefan Mühlinghaus <jazzman@alphabreed.com>"
 license="ISC"
 homepage="https://github.com/mypaint/libmypaint"
 distfiles="https://github.com/mypaint/libmypaint/releases/download/v${version}/libmypaint-${version}.tar.xz"
-checksum=aef8150a0c84ce2ff6fb24de8d5ffc564845d006f8bad7ed84ee32ed1dd90c2b
+checksum=741754f293f6b7668f941506da07cd7725629a793108bb31633fb6c3eae5315f
 
 build_options="gir"
-build_options_default="gir"
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default="gir"
+fi
+
+post_install() {
+	vlicense COPYING
+}
 
 libmypaint-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
@@ -23,9 +29,8 @@ libmypaint-devel_package() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
+		if [ "$build_option_gir" ]; then
+			vmove "usr/share/gir-*"
+		fi
 	}
 }
-
-post_install() {
-	vlicense COPYING
-}

From 1aefcb8ff970ef084d458d96fa5da1589197770a Mon Sep 17 00:00:00 2001
From: biopsin <biopsin@teknik.io>
Date: Sat, 3 Apr 2021 08:51:39 +0000
Subject: [PATCH 0551/2024] mypaint: update to 2.0.1

---
 srcpkgs/mypaint/patches/releaseinfo.patch | 11 -----------
 srcpkgs/mypaint/template                  | 12 ++++++------
 2 files changed, 6 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/mypaint/patches/releaseinfo.patch

diff --git a/srcpkgs/mypaint/patches/releaseinfo.patch b/srcpkgs/mypaint/patches/releaseinfo.patch
deleted file mode 100644
index 9454203a4930..000000000000
--- a/srcpkgs/mypaint/patches/releaseinfo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/meta.py	2020-02-15 16:05:22.000000000 +0100
-+++ lib/meta.py	2020-03-29 11:40:40.275375283 +0200
-@@ -264,7 +264,7 @@
-         # If release information from release.sh exists, use that
-         relinfo = {}
-         with open("release_info", "rb") as relinfo_fp:
--            exec(relinfo_fp, relinfo)
-+            exec(relinfo_fp.read(), relinfo)
-         base_version = relinfo.get(
-             "MYPAINT_VERSION_BASE",
-             base_version,
diff --git a/srcpkgs/mypaint/template b/srcpkgs/mypaint/template
index f3d5266c14bb..efb295af98d5 100644
--- a/srcpkgs/mypaint/template
+++ b/srcpkgs/mypaint/template
@@ -1,23 +1,23 @@
 # Template file for 'mypaint'
 pkgname=mypaint
-version=2.0.0
-revision=2
+version=2.0.1
+revision=1
 build_style=python3-module
 pycompile_dirs="/usr/share/mypaint"
 hostmakedepends="swig pkg-config gettext python3-setuptools python3-numpy python3"
-makedepends="python3-setuptools python3-numpy python3-cairo python3-gobject-devel gtk+3-devel libgomp-devel libmypaint-devel mypaint-brushes"
+makedepends="python3-setuptools python3-numpy python3-cairo python3-gobject-devel gtk+3-devel
+ libgomp-devel libmypaint-devel mypaint-brushes"
 depends="librsvg python3-numpy python3-gobject gtk+3 hicolor-icon-theme mypaint-brushes"
 short_desc="Graphics application for digital painters"
 maintainer="Stefan Mühlinghaus <jazzman@alphabreed.com>"
 license="GPL-2.0-or-later"
 homepage="http://mypaint.org"
+changelog="https://github.com/mypaint/mypaint/raw/master/Changelog.md"
 distfiles="https://github.com/mypaint/mypaint/releases/download/v${version}/mypaint-${version}.tar.xz"
-checksum=d1d67866e342938c1e84b42da10bbed5f613f7e216f800fcc7c0e20200074a5e
+checksum=f3e437d7cdd5fd28ef6532e8ab6b4b05d842bcdd644f16a0162dad3d8e57bb16
 python_version=3
 
 post_install() {
-	# Fix SVG icons
-	vsed -i 's/xmlns:ns7/xmlns:xlink/g' ${DESTDIR}/usr/share/icons/hicolor/{24x24,scalable}/actions/mypaint-*.svg
 	mv $DESTDIR/usr/lib/mypaint/lib/_mypaintlib.cpython*.so \
 		$DESTDIR/usr/lib/mypaint/lib/_mypaintlib.so
 }

From 3a2317a88264008c0e377000a11a10f1265abc63 Mon Sep 17 00:00:00 2001
From: biopsin <biopsin@teknik.io>
Date: Sat, 3 Apr 2021 09:12:39 +0000
Subject: [PATCH 0552/2024] opentoonz: revbump for libmypaint

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

diff --git a/srcpkgs/opentoonz/template b/srcpkgs/opentoonz/template
index 503ebf2d789a..3d697cefb54a 100644
--- a/srcpkgs/opentoonz/template
+++ b/srcpkgs/opentoonz/template
@@ -1,7 +1,7 @@
 # Template file for 'opentoonz'
 pkgname=opentoonz
 version=1.4.0
-revision=1
+revision=2
 build_wrksrc="toonz/sources"
 build_style=cmake
 make_cmd=make

From d1cb049f8346832afcca8814c184ec4b6794717f Mon Sep 17 00:00:00 2001
From: biopsin <biopsin@teknik.io>
Date: Sat, 3 Apr 2021 09:29:45 +0000
Subject: [PATCH 0553/2024] gimp: revbump for libmypaint

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

diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 0378ad139c6e..4dfed7463871 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,7 +1,7 @@
 # Template file for 'gimp'
 pkgname=gimp
 version=2.10.22
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-check-update --datadir=/usr/share"
 hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
@@ -37,7 +37,7 @@ pre_configure() {
 libgimp_package() {
 	short_desc+=" - runtime libraries"
 	pkg_install() {
-		vmove usr/lib/*.so.*
+		vmove "usr/lib/*.so.*"
 	}
 }
 

From 9e269da0f9acc82ff04c1b80f24ccff465339c6c Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 29 Mar 2021 11:56:58 +0200
Subject: [PATCH 0554/2024] libserialport: fix license, fix homepage

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

diff --git a/srcpkgs/libserialport/template b/srcpkgs/libserialport/template
index 3e75ad0e96df..23b6b92a42fe 100644
--- a/srcpkgs/libserialport/template
+++ b/srcpkgs/libserialport/template
@@ -1,12 +1,12 @@
 # Template file for 'libserialport'
 pkgname=libserialport
 version=0.1.1
-revision=1
+revision=2
 build_style=gnu-configure
 short_desc="Cross-platform library for accessing serial ports"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="GPL-3"
-homepage="https://sigrok.org/"
+license="LGPL-3.0-or-later"
+homepage="https://sigrok.org/wiki/Libserialport"
 distfiles="https://sigrok.org/download/source/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=4a2af9d9c3ff488e92fb75b4ba38b35bcf9b8a66df04773eba2a7bbf1fa7529d
 
@@ -20,4 +20,3 @@ libserialport-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
-

From fb8097b9d9cafb63b143f8d8d0a43a17af8ef3c9 Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Tue, 6 Apr 2021 10:59:18 -0300
Subject: [PATCH 0555/2024] lxpanel: update to 0.10.1.

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

diff --git a/srcpkgs/lxpanel/template b/srcpkgs/lxpanel/template
index 05b3c323727c..6dff9ac554f9 100644
--- a/srcpkgs/lxpanel/template
+++ b/srcpkgs/lxpanel/template
@@ -1,7 +1,7 @@
 # Template file for 'lxpanel'
 pkgname=lxpanel
-version=0.10.0
-revision=2
+version=0.10.1
+revision=1
 build_style=gnu-configure
 configure_args="--enable-gtk3"
 hostmakedepends="pkg-config intltool"
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://lxde.org/"
 distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
-checksum=4678cc8c5f1962376005ebf71ec1ee810115ac2e0e565f8d2e67dc12d01a3a7e
+checksum=1e318f57d7e36b61c23a504d03d2430c78dad142c1804451061f1b3ea5441ee8
 
 lib32disabled=yes
 

From 3629e9d62269eb47cd2e362d0f579be42a8dae5c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 6 Apr 2021 17:26:54 +0200
Subject: [PATCH 0556/2024] gucci: update to 1.4.0.

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

diff --git a/srcpkgs/gucci/template b/srcpkgs/gucci/template
index 489af4487ada..e56123b92338 100644
--- a/srcpkgs/gucci/template
+++ b/srcpkgs/gucci/template
@@ -1,16 +1,17 @@
 # Template file for 'gucci'
 pkgname=gucci
-version=1.3.0
+version=1.4.0
 revision=1
 build_style=go
 go_import_path="github.com/noqcks/gucci"
+go_ldflags="-X main.AppVersion=${version}"
 hostmakedepends="git"
 short_desc="Simple CLI templating tool written in Go"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/noqcks/gucci"
 distfiles="https://github.com/noqcks/gucci/archive/${version}.tar.gz"
-checksum=c54c8e7c5273dcd959d11b42820e35acf8150f4ed40c56281c70c5fea16f0753
+checksum=1f6cfd6a597997e18c5bed10224781d8b407d8267f5e10a162cc31b247f20be2
 
 post_install() {
 	vlicense LICENSE

From e0fcfa6f3c8fc2a973f5313fe5e4f8c5e0d66b7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 6 Apr 2021 20:50:55 +0200
Subject: [PATCH 0557/2024] Orphan onekk's packages

---
 srcpkgs/JAI/template                         | 2 +-
 srcpkgs/brother-brscan3/template             | 2 +-
 srcpkgs/brother-dcp197c-cupswrapper/template | 2 +-
 srcpkgs/brother-dcp197c-lpr/template         | 2 +-
 srcpkgs/gtklp/template                       | 2 +-
 srcpkgs/gv/template                          | 2 +-
 srcpkgs/leafpad/template                     | 2 +-
 srcpkgs/libXaw3d/template                    | 2 +-
 srcpkgs/librtlsdr/template                   | 2 +-
 srcpkgs/numlockx/template                    | 2 +-
 srcpkgs/offo-hyphenation/template            | 2 +-
 srcpkgs/openjpeg/template                    | 2 +-
 srcpkgs/psutils/template                     | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/JAI/template b/srcpkgs/JAI/template
index 2b7fcb610683..0ff28d418bfd 100644
--- a/srcpkgs/JAI/template
+++ b/srcpkgs/JAI/template
@@ -4,7 +4,7 @@ version=1.1.3
 revision=4
 archs="i686 x86_64"
 short_desc="Java Advanced Imaging Library - binary version"
-maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
+maintainer="Orphaned <orphan@voidlinux.org>
 license="custom:Oracle Binary Code License"
 homepage="https://java.net/projects/jai-core"
 repository=nonfree
diff --git a/srcpkgs/brother-brscan3/template b/srcpkgs/brother-brscan3/template
index e51bddc1dbeb..3b2ef4a8bbe2 100644
--- a/srcpkgs/brother-brscan3/template
+++ b/srcpkgs/brother-brscan3/template
@@ -8,7 +8,7 @@ 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>"
+maintainer="Orphaned <orphan@voidlinux.org>
 license="custom:BrotherEULA"
 homepage="http://support.brother.com/g/b/index.aspx"
 nopie=yes
diff --git a/srcpkgs/brother-dcp197c-cupswrapper/template b/srcpkgs/brother-dcp197c-cupswrapper/template
index 0ad17c5699cc..b74f204c586e 100644
--- a/srcpkgs/brother-dcp197c-cupswrapper/template
+++ b/srcpkgs/brother-dcp197c-cupswrapper/template
@@ -6,7 +6,7 @@ archs="i686 x86_64"
 create_wrksrc=yes
 depends="brother-dcp197c-lpr cups"
 short_desc="CUPS wrapper driver for the brother DCP-197C printer/scanner"
-maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
+maintainer="Orphaned <orphan@voidlinux.org>
 license="GPL-2.0-or-later"
 homepage="http://support.brother.com/g/b/index.aspx"
 distfiles="http://download.brother.com/welcome/dlf005405/dcp197ccupswrapper-${version}-1.i386.deb"
diff --git a/srcpkgs/brother-dcp197c-lpr/template b/srcpkgs/brother-dcp197c-lpr/template
index 699e3d5445f5..71c03d029100 100644
--- a/srcpkgs/brother-dcp197c-lpr/template
+++ b/srcpkgs/brother-dcp197c-lpr/template
@@ -6,7 +6,7 @@ archs="i686 x86_64"
 create_wrksrc=yes
 depends="a2ps ghostscript"
 short_desc="LPR driver for the brother DCP-197C printer/scanner"
-maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
+maintainer="Orphaned <orphan@voidlinux.org>
 license="GPL-2.0-only"
 homepage="http://support.brother.com/g/b/index.aspx"
 distfiles="http://download.brother.com/welcome/dlf005403/dcp197clpr-${version}-1.i386.deb"
diff --git a/srcpkgs/gtklp/template b/srcpkgs/gtklp/template
index 8b210cac2b7e..8e22c8871795 100644
--- a/srcpkgs/gtklp/template
+++ b/srcpkgs/gtklp/template
@@ -7,7 +7,7 @@ configure_args="--enable-ssl --with-cups-config=${XBPS_CROSS_BASE}/usr/bin/cups-
 hostmakedepends="automake libtool pkg-config gettext"
 makedepends="openssl-devel gtk+-devel cups-devel"
 short_desc="Gtk frontend to cups - IPP support"
-maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
+maintainer="Orphaned <orphan@voidlinux.org>
 license="GPL-2.0-or-later"
 homepage="http://gtklp.sirtobi.com/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${version}/${pkgname}-${version}.src.tar.gz"
diff --git a/srcpkgs/gv/template b/srcpkgs/gv/template
index ce1ba715a0a5..f809256e5c31 100644
--- a/srcpkgs/gv/template
+++ b/srcpkgs/gv/template
@@ -3,7 +3,7 @@ pkgname=gv
 version=3.7.4
 revision=4
 build_style=gnu-configure
-maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
+maintainer="Orphaned <orphan@voidlinux.org>
 homepage="http://www.gnu.org/software/gv/"
 license="GPL-2"
 short_desc="Postscript and PDF viewer"
diff --git a/srcpkgs/leafpad/template b/srcpkgs/leafpad/template
index f80347e452f4..c0091b05d3bd 100644
--- a/srcpkgs/leafpad/template
+++ b/srcpkgs/leafpad/template
@@ -7,7 +7,7 @@ hostmakedepends="intltool pkg-config"
 makedepends="gettext-devel gtk+-devel desktop-file-utils hicolor-icon-theme"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="GTK+ Simple text editor"
-maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
+maintainer="Orphaned <orphan@voidlinux.org>
 license="GPL-2.0-or-later"
 homepage="http://tarot.freeshell.org/leafpad/"
 distfiles="http://download-mirror.savannah.gnu.org/releases/leafpad/leafpad-${version}.tar.gz"
diff --git a/srcpkgs/libXaw3d/template b/srcpkgs/libXaw3d/template
index a59e9b381b82..bc59565dffe5 100644
--- a/srcpkgs/libXaw3d/template
+++ b/srcpkgs/libXaw3d/template
@@ -8,7 +8,7 @@ configure_args="--disable-static --enable-internationalization --enable-multipla
 hostmakedepends="automake bison libtool pkg-config"
 makedepends="libXmu-devel libXpm-devel xorg-util-macros"
 short_desc="X Athena Widget 3d library"
-maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
+maintainer="Orphaned <orphan@voidlinux.org>
 license="MIT/X11"
 homepage="https://cgit.freedesktop.org/xorg/lib/libXaw3d"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/librtlsdr/template b/srcpkgs/librtlsdr/template
index 39c9cb740498..9e62cd6153b2 100644
--- a/srcpkgs/librtlsdr/template
+++ b/srcpkgs/librtlsdr/template
@@ -6,7 +6,7 @@ build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="libusb-devel"
 short_desc="Turns your Realtek RTL2832 based DVB dongle into a SDR receiver"
-maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
+maintainer="Orphaned <orphan@voidlinux.org>
 license="GPL-2.0-or-later"
 homepage="https://osmocom.org/projects/rtl-sdr/wiki"
 distfiles="https://github.com/steve-m/${pkgname}/archive/${version}.tar.gz"
diff --git a/srcpkgs/numlockx/template b/srcpkgs/numlockx/template
index 12669f492c4a..77075643a293 100644
--- a/srcpkgs/numlockx/template
+++ b/srcpkgs/numlockx/template
@@ -5,7 +5,7 @@ revision=5
 build_style=gnu-configure
 makedepends="libX11-devel libSM-devel libXext-devel libXtst-devel"
 short_desc="Activate NumLock at startup"
-maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
+maintainer="Orphaned <orphan@voidlinux.org>
 license="MIT"
 homepage="http://www.mike-devlin.com/linux/README-numlockx.htm"
 distfiles="${DEBIAN_SITE}/main/n/${pkgname}/${pkgname}_${version}.orig.tar.gz"
diff --git a/srcpkgs/offo-hyphenation/template b/srcpkgs/offo-hyphenation/template
index 1a1306dca5db..aad25e9da3a4 100644
--- a/srcpkgs/offo-hyphenation/template
+++ b/srcpkgs/offo-hyphenation/template
@@ -5,7 +5,7 @@ revision=2
 hostmakedepends="unzip"
 depends="apache-fop>=1.1_2"
 short_desc="Hypenation patterns for apache FOP - precompiled version"
-maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
+maintainer="Orphaned <orphan@voidlinux.org>
 license="GPL-2.0-or-later, Apache-2.0, LPPL-1.3b, TeX"
 homepage="http://offo.sourceforge.net/hyphenation/"
 distfiles="${SOURCEFORGE_SITE}/offo/${pkgname}/${version}/${pkgname}-binary.zip
diff --git a/srcpkgs/openjpeg/template b/srcpkgs/openjpeg/template
index ecd38c66ebb2..bd44b0834a07 100644
--- a/srcpkgs/openjpeg/template
+++ b/srcpkgs/openjpeg/template
@@ -7,7 +7,7 @@ configure_args="--disable-static"
 hostmakedepends="pkg-config"
 makedepends="libpng-devel lcms2-devel tiff-devel doxygen"
 short_desc="Open-source JPEG 2000 codec written in C language"
-maintainer="Carlo Dormeletti <carloDOTdormelettiATaliceDOTit>"
+maintainer="Orphaned <orphan@voidlinux.org>
 license="BSD-2-Clause"
 homepage="http://www.openjpeg.org/"
 distfiles="$SOURCEFORGE_SITE/openjpeg.mirror/${version}/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/psutils/template b/srcpkgs/psutils/template
index bed735154227..a76504929eb4 100644
--- a/srcpkgs/psutils/template
+++ b/srcpkgs/psutils/template
@@ -3,7 +3,7 @@ pkgname="psutils"
 version="p17"
 revision=4
 short_desc="Set of utilities to manipulate PostScript files"
-maintainer="Carlo Dormeletti <carloDOTdormelettiATaliceDOTit>"
+maintainer="Orphaned <orphan@voidlinux.org>
 license="AJCD-License"
 hostmakedepends="perl"
 makedepends="ghostscript"

From b6f0e546a76b0a243e42c22c1149be79a254767a Mon Sep 17 00:00:00 2001
From: HadetTheUndying <hadet@protonmail.com>
Date: Fri, 15 Jan 2021 16:25:56 -0600
Subject: [PATCH 0558/2024] mesa: update to 21.0.1

Closes: #29520 [via git-merge-pr]
Closes: #27956
---
 srcpkgs/mesa/patches/add-use-elf-tls.patch | 16 +++++-----
 srcpkgs/mesa/patches/gen-git_sha1_h.patch  | 34 ----------------------
 srcpkgs/mesa/template                      | 21 ++++++-------
 3 files changed, 20 insertions(+), 51 deletions(-)
 delete mode 100644 srcpkgs/mesa/patches/gen-git_sha1_h.patch

diff --git a/srcpkgs/mesa/patches/add-use-elf-tls.patch b/srcpkgs/mesa/patches/add-use-elf-tls.patch
index 617d8c0e9464..e10fdfa225bc 100644
--- a/srcpkgs/mesa/patches/add-use-elf-tls.patch
+++ b/srcpkgs/mesa/patches/add-use-elf-tls.patch
@@ -2,26 +2,24 @@ Upstream: https://gitlab.freedesktop.org/mesa/mesa/issues/966
 Status: Not fixed upstream
 
 diff --git meson.build meson.build
-index d228de0..972cd79 100644
+index 932eb13..1d1a4be 100644
 --- meson.build
 +++ meson.build
-@@ -392,7 +392,8 @@ if with_egl and not (with_platform_drm or with_platform_surfaceless or with_plat
- endif
+@@ -448,7 +448,8 @@ endif
  
  # Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS.
  use_elf_tls = false
--if not ['windows', 'freebsd', 'openbsd'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29)
+-if not ['windows', 'freebsd', 'openbsd', 'haiku'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29)
 +with_use_elf_tls = get_option('use-elf-tls')
 +if not ['windows', 'freebsd', 'openbsd'].contains(host_machine.system()) and with_use_elf_tls and (not with_platform_android or get_option('platform-sdk-version') >= 29)
    pre_args += '-DUSE_ELF_TLS'
    use_elf_tls = true
  endif
-
 diff --git meson_options.txt meson_options.txt
-index b768c15..2533220 100644
+index fc73f6e..2d9e4a2 100644
 --- meson_options.txt
 +++ meson_options.txt
-@@ -366,3 +366,9 @@ option(
+@@ -445,6 +445,12 @@ option(
    value : 25,
    description : 'Android Platform SDK version. Default: Nougat version.'
  )
@@ -31,3 +29,7 @@ index b768c15..2533220 100644
 +  value : true,
 +  description : 'Build support for initial-exec TLS model'
 +)
+ option(
+   'zstd',
+   type : 'combo',
+
diff --git a/srcpkgs/mesa/patches/gen-git_sha1_h.patch b/srcpkgs/mesa/patches/gen-git_sha1_h.patch
deleted file mode 100644
index 20b4bc23e940..000000000000
--- a/srcpkgs/mesa/patches/gen-git_sha1_h.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- src/intel/common/meson.build	2021-01-29 19:33:19.836871900 +0100
-+++ -	2021-02-14 14:36:02.838935228 +0100
-@@ -42,8 +42,8 @@
- )
- 
- libintel_common = static_library(
--  ['intel_common', genX_xml_h],
--  files_libintel_common,
-+  'intel_common',
-+  [files_libintel_common, genX_xml_h, sha1_h],
-   include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel],
-   c_args : [no_override_init_args],
-   gnu_symbol_visibility : 'hidden',
---- src/gallium/frontends/lavapipe/meson.build	2021-01-29 19:33:19.784871800 +0100
-+++ -	2021-02-14 14:36:36.898986675 +0100
-@@ -57,7 +57,7 @@
- 
- liblavapipe_st = static_library(
-   'lavapipe_st',
--  [liblvp_files, lvp_entrypoints, lvp_extensions_c ],
-+  [liblvp_files, lvp_entrypoints, lvp_extensions_c , sha1_h],
-   link_with : [ libvulkan_wsi ],
-   c_args : [ lvp_flags ],
-   gnu_symbol_visibility : 'hidden',
---- src/freedreno/common/meson.build	2021-01-29 19:33:19.570870900 +0100
-+++ -	2021-02-14 14:37:08.623233120 +0100
-@@ -27,6 +27,7 @@
-     'freedreno_uuid.c',
-     'freedreno_uuid.h',
-     'freedreno_guardband.h',
-+    sha1_h
-   ],
-   include_directories : [inc_freedreno, inc_include, inc_src, inc_gallium],
-   c_args : [no_override_init_args],
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 1e622adebf95..fd6d0c77b651 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,13 +1,13 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=20.3.4
+version=21.0.1
 revision=1
 wrksrc="mesa-${version}"
 build_style=meson
-configure_args="-Dglvnd=true -Dshared-glapi=true -Dgbm=true -Degl=true
- -Dosmesa=gallium -Dgles1=true -Dgles2=true -Dglx=dri -Ddri3=true
- -Dlmsensors=true -Dplatforms=x11,wayland
- -Dllvm=true -Db_lto=false -Dcpp_std=gnu++14"
+configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
+ -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri -Ddri3=enabled
+ -Dlmsensors=enabled -Dplatforms=x11,wayland
+ -Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++14"
 hostmakedepends="gettext flex llvm pkg-config python3-Mako glslang
  wayland-protocols wayland-devel"
 makedepends="elfutils-devel expat-devel libXdamage-devel libXvMC-devel
@@ -23,7 +23,7 @@ license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
 changelog="https://docs.mesa3d.org/relnotes/${version}.html"
 distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=dc21a987ec1ff45b278fe4b1419b1719f1968debbb80221480e44180849b4084
+checksum=379fc984459394f2ab2d84049efdc3a659869dc1328ce72ef0598506611712bb
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" -Duse-elf-tls=false"
@@ -124,12 +124,12 @@ fi
 
 if [ "$_have_vmware" ]; then
 	_gallium_drivers+=",svga"
-	configure_args+=" -Dgallium-xa=true"
+	configure_args+=" -Dgallium-xa=enabled"
 	subpackages+=" libxatracker"
 	# transitional dummy packages
 	subpackages+=" mesa-vmwgfx-dri"
 else
-	configure_args+=" -Dgallium-xa=false"
+	configure_args+=" -Dgallium-xa=disabled"
 fi
 
 # enabled currently by amd drivers
@@ -141,10 +141,10 @@ if [ "$_have_opencl" ]; then
 fi
 
 if [ "$_have_hwdec" ]; then
-	configure_args+=" -Dgallium-vdpau=true -Dgallium-va=true -Dgallium-xvmc=true"
+	configure_args+=" -Dgallium-vdpau=enabled -Dgallium-va=enabled -Dgallium-xvmc=enabled"
 	subpackages+=" mesa-vaapi mesa-vdpau mesa-XvMC"
 else
-	configure_args+=" -Dgallium-vdpau=false -Dgallium-va=false -Dgallium-xvmc=false"
+	configure_args+=" -Dgallium-vdpau=disabled -Dgallium-va=disabled -Dgallium-xvmc=disabled"
 fi
 
 # empty values introduced by leading comma are not allowed; the whole enumeration can be empty
@@ -173,6 +173,7 @@ post_configure() {
 			-e "s; /usr/lib/; ${XBPS_CROSS_BASE}/usr/lib/;g" \
 			-e "s;-L/usr/lib;-L${XBPS_CROSS_BASE}/usr/lib;g" \
 			-e "s;-I/usr/include;-I${XBPS_CROSS_BASE}/usr/include;g" \
+			-e "s;-isystem;-I${XBPS_CROSS_BASE};g" \
 			\;
 	fi
 }

From 54e723fedffa94583642d7b8655d2f9bebc241fc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Apr 2021 19:57:08 +0200
Subject: [PATCH 0559/2024] bluedevil: update to 5.21.4.

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

diff --git a/srcpkgs/bluedevil/template b/srcpkgs/bluedevil/template
index 7bf2a1623e61..ea9050223564 100644
--- a/srcpkgs/bluedevil/template
+++ b/srcpkgs/bluedevil/template
@@ -1,6 +1,6 @@
 # Template file for 'bluedevil'
 pkgname=bluedevil
-version=5.21.3
+version=5.21.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/bluedevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=1b1ff32ed88ff087fe33992aaa56ddfcb03361ad3b17ee09a351ab93ec2215f7
+checksum=e115d1851f6ce251fc7447936cd929c6c222c91fd832ce7c39f15d10a68c4653
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"

From 6fdfef583267b64e38f9a9a7310d39153593ee3a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Apr 2021 19:57:10 +0200
Subject: [PATCH 0560/2024] breeze-gtk: update to 5.21.4.

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

diff --git a/srcpkgs/breeze-gtk/template b/srcpkgs/breeze-gtk/template
index 4c1a29faf59b..5367cb1d2f00 100644
--- a/srcpkgs/breeze-gtk/template
+++ b/srcpkgs/breeze-gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-gtk'
 pkgname=breeze-gtk
-version=5.21.3
+version=5.21.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules sassc python3 python3-cairo"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/breeze-gtk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=ac45fe545269a70aba4878fdae306d7c6a621e9f7478981f9c0b3a5a42f2abf4
+checksum=912c425f9b9c39af02458c63f93704b274f0324c4b4b23ea30461a027b46520d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel"

From 8c87e5f2bce5bb0f97863521336bb286f352e152 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Apr 2021 19:57:19 +0200
Subject: [PATCH 0561/2024] breeze: update to 5.21.4.

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

diff --git a/srcpkgs/breeze/template b/srcpkgs/breeze/template
index ffa237717f46..e5e09f62f066 100644
--- a/srcpkgs/breeze/template
+++ b/srcpkgs/breeze/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze'
 pkgname=breeze
-version=5.21.3
+version=5.21.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/breeze"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=838ad341c16a32331574d6c2588c48cba54033dd95ff33e56f17d880911b353b
+checksum=d52db46df07302ea3f139ae88dd3b3b15aaab7d632b9910b87c3dac5eee5d0d8
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From ba1eaa9660cd6556a7841a24ae3b8cf2240e2100 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Apr 2021 19:57:20 +0200
Subject: [PATCH 0562/2024] kactivitymanagerd: update to 5.21.4.

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

diff --git a/srcpkgs/kactivitymanagerd/template b/srcpkgs/kactivitymanagerd/template
index 415e0b49b766..1e79fe1bc41b 100644
--- a/srcpkgs/kactivitymanagerd/template
+++ b/srcpkgs/kactivitymanagerd/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivitymanagerd'
 pkgname=kactivitymanagerd
-version=5.21.3
+version=5.21.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kactivitymanagerd"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=83a1241edd4b3fb50545eb62d4dd2a73bfb8367d71e65af2017f26275736b7f4
+checksum=2684b61713223f7d8f1e064689fef13e54f2ade6b767a6229294e25bfce54a71
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DRUN_RESULT_VAR=0"

From ba190fa48423cfa299f35dda7ebd742e59eaa9a4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Apr 2021 19:57:23 +0200
Subject: [PATCH 0563/2024] kde-cli-tools: update to 5.21.4.

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

diff --git a/srcpkgs/kde-cli-tools/template b/srcpkgs/kde-cli-tools/template
index 09b6911bb35d..c73632d962af 100644
--- a/srcpkgs/kde-cli-tools/template
+++ b/srcpkgs/kde-cli-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-cli-tools'
 pkgname=kde-cli-tools
-version=5.21.3
+version=5.21.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kde-cli-tools"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=f72ed4e939a85fc1643784f2fe413b743f3e9f8ce7c8a7ef0dd792d7ffc87542
+checksum=01426b8c6be7cec804a44b74c3d79354f6f5509cbc176360f4ab43f330586ec3
 
 post_install() {
 	ln -sf ../lib/libexec/kf5/kdesu ${DESTDIR}/usr/bin

From d060ed609624068d35212c774c99b10cec455d9a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Apr 2021 19:57:25 +0200
Subject: [PATCH 0564/2024] kde-gtk-config5: update to 5.21.4.

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

diff --git a/srcpkgs/kde-gtk-config5/template b/srcpkgs/kde-gtk-config5/template
index 9ec0d55ae6cf..6266aa84519f 100644
--- a/srcpkgs/kde-gtk-config5/template
+++ b/srcpkgs/kde-gtk-config5/template
@@ -1,6 +1,6 @@
 # Template file for 'kde-gtk-config5'
 pkgname=kde-gtk-config5
-version=5.21.3
+version=5.21.4
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kde-gtk-config"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=30e88dded1de4f5d096afa20c6ce148da800123c5e8318e44c0540258555de9d
+checksum=c8034212a9a10877e61917084003bece052e3b65aac0197014b1c1840b0df03c
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons"

From a85d86d508256231a0419195160f674279f0ad0a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Apr 2021 19:57:26 +0200
Subject: [PATCH 0565/2024] kdecoration: update to 5.21.4.

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

diff --git a/srcpkgs/kdecoration/template b/srcpkgs/kdecoration/template
index 766d5be82542..f7ee00e3acd1 100644
--- a/srcpkgs/kdecoration/template
+++ b/srcpkgs/kdecoration/template
@@ -1,6 +1,6 @@
 # Template file for 'kdecoration'
 pkgname=kdecoration
-version=5.21.3
+version=5.21.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdecoration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=c5d14b8dd6983f22cbf4d34461e912fd38cd49114d01fb25635d7a1a9c7e4319
+checksum=0a5db022018b958934dd678bf47eceb4233808808b06be2cfd5adb3700ba7e00
 
 kdecoration-devel_package() {
 	short_desc+=" - development"

From bbe40cf3e5346704636d6fa8c716c4f5a208a66e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Apr 2021 19:57:29 +0200
Subject: [PATCH 0566/2024] kdeplasma-addons5: update to 5.21.4.

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

diff --git a/srcpkgs/kdeplasma-addons5/template b/srcpkgs/kdeplasma-addons5/template
index 97107c364012..ff7a41442c8c 100644
--- a/srcpkgs/kdeplasma-addons5/template
+++ b/srcpkgs/kdeplasma-addons5/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeplasma-addons5'
 pkgname=kdeplasma-addons5
-version=5.21.3
+version=5.21.4
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kdeplasma-addons"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname%5}-${version}.tar.xz"
-checksum=6121ed8b1ad433cdb531aaf8658b41f4b4744c869bae72c109c46a6652570185
+checksum=2de617d0a750224d73a6a2d91d99508a6d725fab0f2be7b0b3c47dc3cdf056a2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 4951e36af32d688d80f69789f8674649150e5eeb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Apr 2021 19:57:30 +0200
Subject: [PATCH 0567/2024] kgamma5: update to 5.21.4.

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

diff --git a/srcpkgs/kgamma5/template b/srcpkgs/kgamma5/template
index be38eb87607a..89c6110d8c47 100644
--- a/srcpkgs/kgamma5/template
+++ b/srcpkgs/kgamma5/template
@@ -1,6 +1,6 @@
 # Template file for 'kgamma5'
 pkgname=kgamma5
-version=5.21.3
+version=5.21.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kgamma5"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=892c0cf1cc988c8291da4ef080d70df3211920a5dbe99275afdf796a1ae71941
+checksum=544387a3ab1fa630c979f8b447d3779f1f86e5d6ab7967935a8b44114f1bf6e7
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel kdoctools"

From c75706da96246ff315d5c084218cbb3a8ea334e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Apr 2021 19:57:33 +0200
Subject: [PATCH 0568/2024] khotkeys: update to 5.21.4.

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

diff --git a/srcpkgs/khotkeys/template b/srcpkgs/khotkeys/template
index cf1bd1f18060..8bb7989c4206 100644
--- a/srcpkgs/khotkeys/template
+++ b/srcpkgs/khotkeys/template
@@ -1,6 +1,6 @@
 # Template file for 'khotkeys'
 pkgname=khotkeys
-version=5.21.3
+version=5.21.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/khotkeys"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=74051ad637ab49bab81391f8789253e1e0e275a0aa7971ca553dff5a56866ad8
+checksum=a3f42777930145b2757eff95d468fd945c34db111d144d823e89521a3f5a6616
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From c3679331ea34245679eb987e82ce755179acef1e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Apr 2021 19:57:35 +0200
Subject: [PATCH 0569/2024] kinfocenter: update to 5.21.4.

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

diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template
index 18ffe7fad1c1..f3854c636e4e 100644
--- a/srcpkgs/kinfocenter/template
+++ b/srcpkgs/kinfocenter/template
@@ -1,6 +1,6 @@
 # Template file for 'kinfocenter'
 pkgname=kinfocenter
-version=5.21.3
+version=5.21.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2"
 homepage="https://invent.kde.org/plasma/kinfocenter"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=e2cc48fdd873a16baea5e8b8c20e1e97a5c14acfae00458ff261f52abaad44c2
+checksum=3e5c3fed0156f3464bb30ebb9e0822c4141d71802dfa8995961f84c548771394
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel kdoctools-devel"

From 28bcb31141252932e4b863281600cc374a6c25ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Apr 2021 19:57:37 +0200
Subject: [PATCH 0570/2024] kmenuedit: update to 5.21.4.

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

diff --git a/srcpkgs/kmenuedit/template b/srcpkgs/kmenuedit/template
index 4eeb1f4c3a1e..0115325e3485 100644
--- a/srcpkgs/kmenuedit/template
+++ b/srcpkgs/kmenuedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kmenuedit'
 pkgname=kmenuedit
-version=5.21.3
+version=5.21.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2"
 homepage="https://invent.kde.org/plasma/kmenuedit"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=524aeb87739b0320bcd38551b367cff017c26a830669de7c91aaaa10a8d28339
+checksum=d022bb6486663fd1db8b627794be5eb557fa0daa45b27bb69d834fa84494b8c2

From a4c7ab0893d140048f4568cc92e02c3b9a5e8920 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Apr 2021 19:57:39 +0200
Subject: [PATCH 0571/2024] kscreen: update to 5.21.4.

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

diff --git a/srcpkgs/kscreen/template b/srcpkgs/kscreen/template
index 67a24dfa2291..7697487c6d13 100644
--- a/srcpkgs/kscreen/template
+++ b/srcpkgs/kscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreen'
 pkgname=kscreen
-version=5.21.3
+version=5.21.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=95e20c0967c1dcb5521dddcd6444f3a51a8b6ab5a1bd1e586d6d202469eb2fb9
+checksum=d9d1225d5e4d5e062275c88bb879b96bde0167783d1a3722e737baa67dad3ed9
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From e10f675f5cad51f616c0f543d47ae72fff6bf5fd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Apr 2021 19:57:41 +0200
Subject: [PATCH 0572/2024] kscreenlocker: update to 5.21.4.

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

diff --git a/srcpkgs/kscreenlocker/template b/srcpkgs/kscreenlocker/template
index ef8a40bd507f..366f02bb7270 100644
--- a/srcpkgs/kscreenlocker/template
+++ b/srcpkgs/kscreenlocker/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreenlocker'
 pkgname=kscreenlocker
-version=5.21.3
+version=5.21.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kscreenlocker"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0012c4f0394bc6cd522a8fc4ed78f02e641b55d1baf8a81f6fd926c538bf54c2
+checksum=6492531abacf0078936247090d1c3038c44d5ae3a61593fe474b503847ba24fd
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wayland-devel"

From b69e66828827aca14d4838e9a46fe12127fae465 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Apr 2021 19:57:43 +0200
Subject: [PATCH 0573/2024] ksshaskpass: update to 5.21.4.

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

diff --git a/srcpkgs/ksshaskpass/template b/srcpkgs/ksshaskpass/template
index c249a0801ccf..6d61a29d9a14 100644
--- a/srcpkgs/ksshaskpass/template
+++ b/srcpkgs/ksshaskpass/template
@@ -1,6 +1,6 @@
 # Template file for 'ksshaskpass'
 pkgname=ksshaskpass
-version=5.21.3
+version=5.21.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,5 +12,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/ksshaskpass"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=da0e1b06673afb12789fd028f2d428d980b85912ceb5e715bc710f5edb9f8299
+checksum=c1b0479dc4ae0a183c41e4e546801df5332387026b101b735a8024dd8109447e
 alternatives="ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/ksshaskpass"

From 733d06d1c3e78c1a78ab821cc318fbd07872e373 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Apr 2021 19:57:45 +0200
Subject: [PATCH 0574/2024] ksysguard: update to 5.21.4.

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

diff --git a/srcpkgs/ksysguard/template b/srcpkgs/ksysguard/template
index 1c789b769e57..3603a4f413c9 100644
--- a/srcpkgs/ksysguard/template
+++ b/srcpkgs/ksysguard/template
@@ -1,6 +1,6 @@
 # Template file for 'ksysguard'
 pkgname=ksysguard
-version=5.21.3
+version=5.21.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2"
 homepage="https://invent.kde.org/plasma/ksysguard"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=4ee3595e30a932846dd2ad668231c2fdc7086135ba51d83e3bc6a685658b417b
+checksum=cd1482653c35c5e04e6940346836fcd0655c213fc191da30685cb10cd05ae582

From 3389948821fcbf4c96ade0234f5534058a266e20 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Apr 2021 19:57:47 +0200
Subject: [PATCH 0575/2024] kwallet-pam: update to 5.21.4.

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

diff --git a/srcpkgs/kwallet-pam/template b/srcpkgs/kwallet-pam/template
index eb983c580742..f080436e2182 100644
--- a/srcpkgs/kwallet-pam/template
+++ b/srcpkgs/kwallet-pam/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet-pam'
 pkgname=kwallet-pam
-version=5.21.3
+version=5.21.4
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwallet-pam"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=4372d688ccc5e996e8bc1683939786f40dce3f21113067a5ab21f84ca688d6b6
+checksum=6fce31384897e4913f03cffe6719c7f69618893676a2f44ca62bb21971f27c68

From ef5b89c62c152693fd6147679587b6a7b501f87e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Apr 2021 19:57:48 +0200
Subject: [PATCH 0576/2024] kwayland-integration: update to 5.21.4.

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

diff --git a/srcpkgs/kwayland-integration/template b/srcpkgs/kwayland-integration/template
index 2e776bae0067..ad92891b6f81 100644
--- a/srcpkgs/kwayland-integration/template
+++ b/srcpkgs/kwayland-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-integration'
 pkgname=kwayland-integration
-version=5.21.3
+version=5.21.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0c7641e27a38094077a204ca10c410b2f4f92c0a077b32a22bb5d5ae572b1c4f
+checksum=139cefb81cb852a699b15e77724cf4fb17adf9d8724b0d4955cdf9567fad6ee4

From 854194c7f5563605e3ebca0c56e6bb3cb815edfc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Apr 2021 19:57:50 +0200
Subject: [PATCH 0577/2024] kwayland-server: update to 5.21.4.

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

diff --git a/srcpkgs/kwayland-server/template b/srcpkgs/kwayland-server/template
index d2f628b980d8..b63423810c51 100644
--- a/srcpkgs/kwayland-server/template
+++ b/srcpkgs/kwayland-server/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland-server'
 pkgname=kwayland-server
-version=5.21.3
+version=5.21.4
 revision=1
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/kwayland-server"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=4409119a0e8c6dae5295490f965b26c1160b8df863cce6e46287a5ffe9d26a34
+checksum=ff32f4e6b92fc900db41780cb2f2645c472e6ec5d3999aa17fb0fba807df71d6
 
 kwayland-server-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 9fbef675fec2815c62c3997c49fd812a4a272199 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Apr 2021 19:57:56 +0200
Subject: [PATCH 0578/2024] kwin: update to 5.21.4.

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

diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index b0959c40f5eb..0306c2416f00 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -1,6 +1,6 @@
 # Template file for 'kwin'
 pkgname=kwin
-version=5.21.3
+version=5.21.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -16,7 +16,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwin"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7c38049930f63875719c4405991c13ab436d2a2d2ad401b006e94250dd8d205a
+checksum=a9cbcf293c58bef10650399a7fe15c08b54fd009a0d9d859f75b54bc6c87232f
 patch_args=-Np1
 
 build_options="pipewire"

From 6556a416188a707bc5f00fbf77647c50778a5241 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Apr 2021 19:57:58 +0200
Subject: [PATCH 0579/2024] kwrited: update to 5.21.4.

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

diff --git a/srcpkgs/kwrited/template b/srcpkgs/kwrited/template
index 2ae02d6ae5be..6dc820129b8f 100644
--- a/srcpkgs/kwrited/template
+++ b/srcpkgs/kwrited/template
@@ -1,6 +1,6 @@
 # Template file for 'kwrited'
 pkgname=kwrited
-version=5.21.3
+version=5.21.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kwrited"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=ddccbb23c1ce510efc4f84cf4a59fc1aaa7f344e8d24b35b4603a3583149d606
+checksum=8708c5f41dd32531a25bd9099cd15c39439769f7c17e4481b44f9f7572f03ac3

From 3df646ccd6d360887e560757f624e158bab473d7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Apr 2021 19:57:59 +0200
Subject: [PATCH 0580/2024] libkscreen: update to 5.21.4.

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

diff --git a/srcpkgs/libkscreen/template b/srcpkgs/libkscreen/template
index ca36af1d0663..c20d49199a89 100644
--- a/srcpkgs/libkscreen/template
+++ b/srcpkgs/libkscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'libkscreen'
 pkgname=libkscreen
-version=5.21.3
+version=5.21.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libkscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6a6809a3db3a8c0b86869eae8df37b80ad017292dbee9d26077a22626f0f4dc8
+checksum=ac09ad2e30920f4fbbb44d061cae5114d75ef0d1a765a4fbbf73b94f03a3152c
 
 libkscreen-devel_package() {
 	short_desc+=" - development"

From 5da40b9dd1067da1ff673245b8cc7ec7b29f3a00 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Apr 2021 19:58:01 +0200
Subject: [PATCH 0581/2024] libksysguard: update to 5.21.4.

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

diff --git a/srcpkgs/libksysguard/template b/srcpkgs/libksysguard/template
index ddbefd3b1872..fe88776a8145 100644
--- a/srcpkgs/libksysguard/template
+++ b/srcpkgs/libksysguard/template
@@ -1,6 +1,6 @@
 # Template file for 'libksysguard'
 pkgname=libksysguard
-version=5.21.3.1
+version=5.21.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth qt5-host-tools qt5-qmake"
@@ -10,8 +10,8 @@ short_desc="KDE libksysguard"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/libksysguard"
-distfiles="${KDE_SITE}/plasma/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e370db775b575106f9d228596d3aa0da3ba568da9c2cf76de6e1d8ab60945e59
+distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
+checksum=ec094b59a7e111359b550731dafe4d9b92f17ae2c4d663275d97332e1bc5f16b
 
 build_options="webengine"
 

From bd164b46008b842d28135e2d5a564f2e9e499161 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Apr 2021 19:58:03 +0200
Subject: [PATCH 0582/2024] milou: update to 5.21.4.

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

diff --git a/srcpkgs/milou/template b/srcpkgs/milou/template
index 038e8ec75231..896fbeb475b2 100644
--- a/srcpkgs/milou/template
+++ b/srcpkgs/milou/template
@@ -1,6 +1,6 @@
 # Template file for 'milou'
 pkgname=milou
-version=5.21.3
+version=5.21.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LPGL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/milou"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=ce070712259d601915b327fbf2747d39d3e5b728a24f05e83deed8818e077361
+checksum=6a72ab3cbadff8bb7999abc1fcdef30ec067cf0afb3ff18f0defe55bd8dfd578
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 65466d1f55bc0b137bcccf5e4cccc39e095249a8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Apr 2021 19:58:07 +0200
Subject: [PATCH 0583/2024] oxygen: update to 5.21.4.

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

diff --git a/srcpkgs/oxygen/template b/srcpkgs/oxygen/template
index fb21143e2008..04dbfa6e6316 100644
--- a/srcpkgs/oxygen/template
+++ b/srcpkgs/oxygen/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen'
 pkgname=oxygen
-version=5.21.3
+version=5.21.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/oxygen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=0afcd178aaaedba660603f1177055db395af4d6693233bf31226ae4a3a0ed29b
+checksum=f2039dd6ccd251c12651f3da77ed890b62360e115f1a6be678fe9f39fc6decb4

From c36c852fd2e71c0bee2b41a8b841ab3308e9f561 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Apr 2021 19:58:09 +0200
Subject: [PATCH 0584/2024] plasma-browser-integration: update to 5.21.4.

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

diff --git a/srcpkgs/plasma-browser-integration/template b/srcpkgs/plasma-browser-integration/template
index b2bd239158d7..00b22fc38d2e 100644
--- a/srcpkgs/plasma-browser-integration/template
+++ b/srcpkgs/plasma-browser-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-browser-integration'
 pkgname=plasma-browser-integration
-version=5.21.3
+version=5.21.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-browser-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=deb4e4de2b821942b4d3096f2193d92459bb6b4b6bdedfe80f77efb1a949e9c3
+checksum=76f815739ffc133d82c578248302f26a1cd3262e8cf878824248b9e90b51d693
 
 if [ "${CROSS_BUILD}" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From f2f654d1a96cdb7f1923572d7ee9d1f21c38158a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Apr 2021 19:58:16 +0200
Subject: [PATCH 0585/2024] plasma-desktop: update to 5.21.4.

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

diff --git a/srcpkgs/plasma-desktop/template b/srcpkgs/plasma-desktop/template
index 816ffbdb3823..c33eb1e56726 100644
--- a/srcpkgs/plasma-desktop/template
+++ b/srcpkgs/plasma-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-desktop'
 pkgname=plasma-desktop
-version=5.21.3
+version=5.21.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2"
 homepage="https://invent.kde.org/plasma/plasma-desktop"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=de4f62f6e4612fd796387825cd755edde4784c0386c0d0552deb3b3c44993e2f
+checksum=c9635c82ffa8fa9b22aa474e8aa2e8f9d912615137f039f5ee6080000c283bb7
 replaces="user-manager>=0"
 python_version=3
 

From 7e09a5ecb8f3258d67056940249c61ae983aa0d5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Apr 2021 19:58:18 +0200
Subject: [PATCH 0586/2024] plasma-disks: update to 5.21.4.

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

diff --git a/srcpkgs/plasma-disks/template b/srcpkgs/plasma-disks/template
index b7d780c44811..6139669b263d 100644
--- a/srcpkgs/plasma-disks/template
+++ b/srcpkgs/plasma-disks/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-disks'
 pkgname=plasma-disks
-version=5.21.3
+version=5.21.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-disks"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=58850de94434f61925bb579fdf9eff54f66512f6ca42a7cfba5c2ce8ee6d47a1
+checksum=af186ba88170fe832f218a1438d142ed2ee6aff9ec967fe9003c6c84008451c2

From 2ad4fc3605b13017e282561b69ddf841c7563179 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Apr 2021 19:58:20 +0200
Subject: [PATCH 0587/2024] plasma-firewall: update to 5.21.4.

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

diff --git a/srcpkgs/plasma-firewall/template b/srcpkgs/plasma-firewall/template
index 744f97c1b8e8..fbb12a61c14e 100644
--- a/srcpkgs/plasma-firewall/template
+++ b/srcpkgs/plasma-firewall/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-firewall'
 pkgname=plasma-firewall
-version=5.21.3
+version=5.21.4
 revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools kcmutils kauth kcoreaddons gettext"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only"
 homepage="https://invent.kde.org/network/plasma-firewall"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=7ca5bda3bdf7dab10726976aca5d838e651dcb0f30deb540623546fea762f52f
+checksum=e79bb3ca1eb9b0beb999f1b6212af1eeb8c25fc7c04369a45487e909afaac9c6

From 5249b8dcdf888c4317e04aa925773433b80bebd0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Apr 2021 19:58:21 +0200
Subject: [PATCH 0588/2024] plasma-integration: update to 5.21.4.

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

diff --git a/srcpkgs/plasma-integration/template b/srcpkgs/plasma-integration/template
index b40868ba4024..83c8a510a492 100644
--- a/srcpkgs/plasma-integration/template
+++ b/srcpkgs/plasma-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-integration'
 pkgname=plasma-integration
-version=5.21.3
+version=5.21.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=c1e34f98af9e17062cc10897d49b62867a4957f40469bd2ca01cb546a35bb425
+checksum=1cc280a93fab2c9c461deb172ee22da34a5100c3cd31ad8ebf0a9c405899422e

From 2e957ad8c3a35f569be55ad013f00373266ca0a6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Apr 2021 19:58:24 +0200
Subject: [PATCH 0589/2024] plasma-nm: update to 5.21.4.

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

diff --git a/srcpkgs/plasma-nm/template b/srcpkgs/plasma-nm/template
index 5b3e24414233..5a62ab615e6d 100644
--- a/srcpkgs/plasma-nm/template
+++ b/srcpkgs/plasma-nm/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-nm'
 pkgname=plasma-nm
-version=5.21.3
+version=5.21.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-nm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=771c9a4d3f3acdf8c66f7ff1891790c8a7cfa4053500f1e96617b43f4f39fb34
+checksum=e3d01fdd78ee6d1b0bc9753e1386ffb03c318498feac856fae377a397d6ec1bf
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From fe6cff07d1056902be0bbf870d1f195e61e6bd5d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Apr 2021 19:58:26 +0200
Subject: [PATCH 0590/2024] plasma-pa: update to 5.21.4.

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

diff --git a/srcpkgs/plasma-pa/template b/srcpkgs/plasma-pa/template
index 00d1547388c5..90b368c578ec 100644
--- a/srcpkgs/plasma-pa/template
+++ b/srcpkgs/plasma-pa/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-pa'
 pkgname=plasma-pa
-version=5.21.3
+version=5.21.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-pa"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=77453789506c489b36d8b23ba874834f240daf9c9ea2e60dfa3f735decefe99b
+checksum=e9575c6bb4d73e3b45f9bdd256ed0cdc0e36014a1676abe2ad8d6ab5f1838fe5
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"

From 20df756b5c9ab5d7aaeb6438429ec99232e897eb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Apr 2021 19:58:28 +0200
Subject: [PATCH 0591/2024] plasma-sdk: update to 5.21.4.

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

diff --git a/srcpkgs/plasma-sdk/template b/srcpkgs/plasma-sdk/template
index 58eb38cd6376..650530213e76 100644
--- a/srcpkgs/plasma-sdk/template
+++ b/srcpkgs/plasma-sdk/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-sdk'
 pkgname=plasma-sdk
-version=5.21.3
+version=5.21.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-sdk"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=9c20dec0545a5d1bb4e362b5778acbf2a1e65dabc7f9c07b9c84a155e4594b2b
+checksum=40037c485cb4bbd9afbd237d96b65cdef41b8b3e35ab2f27a7f5c6d206a6c0b2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 78eac0e6dbd11035be160108d08a57a8c5251399 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Apr 2021 19:58:30 +0200
Subject: [PATCH 0592/2024] plasma-systemmonitor: update to 5.21.4.

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

diff --git a/srcpkgs/plasma-systemmonitor/template b/srcpkgs/plasma-systemmonitor/template
index e57ccefd171e..8f751f5b5b4a 100644
--- a/srcpkgs/plasma-systemmonitor/template
+++ b/srcpkgs/plasma-systemmonitor/template
@@ -1,7 +1,7 @@
 # Template file for 'plasma-systemmonitor'
 pkgname=plasma-systemmonitor
-version=5.21.3
-revision=2
+version=5.21.4
+revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake
  kconfig kcoreaddons"
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only OR GPL-3.0-only, LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://invent.kde.org/plasma/plasma-systemmonitor"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=941e7a48d8c68ed072848110764e80e3596aea66a6fb99913301cc7f2bfe3df0
+checksum=849407cf2b9333140cee9ca18ca34e1c4351a8597fea47a475eec68c8dc1b99a

From d84963b0e2571abc81e83d543ec3c984e73ad55c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Apr 2021 19:58:31 +0200
Subject: [PATCH 0593/2024] plasma-thunderbolt: update to 5.21.4.

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

diff --git a/srcpkgs/plasma-thunderbolt/template b/srcpkgs/plasma-thunderbolt/template
index 5c027622d3e8..c06c4bf5e882 100644
--- a/srcpkgs/plasma-thunderbolt/template
+++ b/srcpkgs/plasma-thunderbolt/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-thunderbolt'
 pkgname=plasma-thunderbolt
-version=5.21.3
+version=5.21.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kcmutils
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-thunderbolt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b559889b8569ef7d11cd48efac480644fb146dfabaaf147cd7f32d5e6e5a16c8
+checksum=0dc69a2e9c5fe692457771e503894f70ade69951b6cd838a7f71fa5025042983
 
 do_check() {
 	: # Requires running dbus and bolt services

From f0f16d3a7a59c1a92cc99b1c84e5c323a3a00a81 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Apr 2021 19:58:33 +0200
Subject: [PATCH 0594/2024] plasma-vault: update to 5.21.4.

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

diff --git a/srcpkgs/plasma-vault/template b/srcpkgs/plasma-vault/template
index ba43e7b4eaac..298bab530466 100644
--- a/srcpkgs/plasma-vault/template
+++ b/srcpkgs/plasma-vault/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-vault'
 pkgname=plasma-vault
-version=5.21.3
+version=5.21.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/KDE/plasma-vault"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=323d3d025546524b82b0258e861d5392b65c3f7a7ad9a2c25d98f487bcc1a9e0
+checksum=c577135b04d7b35227183100fcae08eaf6df5ef41c4ecf43e0706a329ef8a48d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From c3d60c6a76b57b5ad4547da58f6f9975587b2bcf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Apr 2021 19:58:50 +0200
Subject: [PATCH 0595/2024] plasma-workspace-wallpapers: update to 5.21.4.

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

diff --git a/srcpkgs/plasma-workspace-wallpapers/template b/srcpkgs/plasma-workspace-wallpapers/template
index e9f0807416b8..15857d3f4186 100644
--- a/srcpkgs/plasma-workspace-wallpapers/template
+++ b/srcpkgs/plasma-workspace-wallpapers/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace-wallpapers'
 pkgname=plasma-workspace-wallpapers
-version=5.21.3
+version=5.21.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -10,4 +10,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace-wallpapers"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=95a6e9da0a652e6584f3727227813fe79a9c4defa7d789126a31fceff09853e2
+checksum=c706e4293b3c0552503abc55eaa0d971203b23ad252804f0fb95b9b040fad8d7

From 7ff5e1dd1d0ce0d9e8fdee859f4da28cf7e4a534 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Apr 2021 19:58:56 +0200
Subject: [PATCH 0596/2024] plasma-workspace: update to 5.21.4.

---
 srcpkgs/plasma-workspace/patches/panelspacer-musl.patch | 9 ---------
 srcpkgs/plasma-workspace/template                       | 6 +++---
 2 files changed, 3 insertions(+), 12 deletions(-)
 delete 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
deleted file mode 100644
index 184c349ce628..000000000000
--- a/srcpkgs/plasma-workspace/patches/panelspacer-musl.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- 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 015319ed3d03..fe80db9ce3d3 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=2
+version=5.21.4
+revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
 hostmakedepends="extra-cmake-modules iso-codes pkg-config kdoctools kcoreaddons
@@ -20,7 +20,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/plasma/plasma-workspace"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=80602e458ebabbf1685c918485bff4cb30eaae71cfd2bf2c4c9cea7a58b74ab6
+checksum=ba0b184570b62be84be2f8108fccadd08de8f3abf8a0f615a6f06f829bd628d5
 
 build_options="pipewire"
 

From 2b9f79f33afd6866aa11e2c0727997308ee1bc02 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Apr 2021 19:58:58 +0200
Subject: [PATCH 0597/2024] polkit-kde-agent: update to 5.21.4.

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

diff --git a/srcpkgs/polkit-kde-agent/template b/srcpkgs/polkit-kde-agent/template
index 7fc9b2a992d3..373cc02cc25a 100644
--- a/srcpkgs/polkit-kde-agent/template
+++ b/srcpkgs/polkit-kde-agent/template
@@ -1,6 +1,6 @@
 # Template file for 'polkit-kde-agent'
 pkgname=polkit-kde-agent
-version=5.21.3
+version=5.21.4
 revision=1
 wrksrc="${pkgname}-1-${version}"
 build_style=cmake
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://commits.kde.org/polkit-kde-agent"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-1-${version}.tar.xz"
-checksum=1b6802f688a8c0e83dc065503447a2e79967c67083799e4896b51813809b171b
+checksum=b236f87213247a858acb9a7b82dba71f579c3febb3cee189b96584e588a6e251

From d25eab6831ac1675c847d3987103803cf91823b9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Apr 2021 19:59:01 +0200
Subject: [PATCH 0598/2024] powerdevil: update to 5.21.4.

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

diff --git a/srcpkgs/powerdevil/template b/srcpkgs/powerdevil/template
index 385648f67dd0..5495b2cfcd23 100644
--- a/srcpkgs/powerdevil/template
+++ b/srcpkgs/powerdevil/template
@@ -1,6 +1,6 @@
 # Template file for 'powerdevil'
 pkgname=powerdevil
-version=5.21.3
+version=5.21.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/powerdevil"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=ffcbc2ca715377e6652f65744601c95ba0babbde7a15d4f4e8a3fa0ad85e6652
+checksum=c6f1729dff9ce611c2094d930067fb4f364f6f3d4d78ea2ee07c5bb4db990445

From 2ba92b681729d98facfb87562de7858232f6eaed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Apr 2021 19:59:03 +0200
Subject: [PATCH 0599/2024] sddm-kcm: update to 5.21.4.

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

diff --git a/srcpkgs/sddm-kcm/template b/srcpkgs/sddm-kcm/template
index e3dbe3ede0ea..5b11a4751a45 100644
--- a/srcpkgs/sddm-kcm/template
+++ b/srcpkgs/sddm-kcm/template
@@ -1,6 +1,6 @@
 # Template file for 'sddm-kcm'
 pkgname=sddm-kcm
-version=5.21.3
+version=5.21.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/sddm-kcm"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=5f52bc7dd194f26c9f6fec8a0872026a1eb972fb25cdc0753bda981faf7b98ba
+checksum=3396f33e7ae12661fc9722d96a37ee274588212bae886538423a9e4ee2052401

From 5aab572359df5d843b7da046a56f818a0c77453b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Apr 2021 19:59:05 +0200
Subject: [PATCH 0600/2024] systemsettings: update to 5.21.4.

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

diff --git a/srcpkgs/systemsettings/template b/srcpkgs/systemsettings/template
index ef8de924cf78..7ad8cbdcf84a 100644
--- a/srcpkgs/systemsettings/template
+++ b/srcpkgs/systemsettings/template
@@ -1,6 +1,6 @@
 # Template file for 'systemsettings'
 pkgname=systemsettings
-version=5.21.3
+version=5.21.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2"
 homepage="https://invent.kde.org/plasma/systemsettings"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=1d9518fa792970859d49965209138ee9944a9e1db00ed2eea3337481c4a3d623
+checksum=034b0c384cdbf38d126daf4dced6f2d42995b76f9b9268b30eb6a1d59c20ed04

From dd23b07e61a9868bac05796a4223515c03661e49 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Apr 2021 19:59:07 +0200
Subject: [PATCH 0601/2024] xdg-desktop-portal-kde: update to 5.21.4.

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

diff --git a/srcpkgs/xdg-desktop-portal-kde/template b/srcpkgs/xdg-desktop-portal-kde/template
index 16a4dbf7294a..e6b92b916fdc 100644
--- a/srcpkgs/xdg-desktop-portal-kde/template
+++ b/srcpkgs/xdg-desktop-portal-kde/template
@@ -1,6 +1,6 @@
 # Template file for 'xdg-desktop-portal-kde'
 pkgname=xdg-desktop-portal-kde
-version=5.21.3
+version=5.21.4
 revision=1
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://phabricator.kde.org/source/xdg-desktop-portal-kde/"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=3012df6b6127bf7800b7be1fd8674213d0748e17050862dd13b2ca34f89a2117
+checksum=efbf69b0623db15d1a44725a88b3e6b5d0631bc0ebc88d0e695ff01df7da7406

From 66d06ee65cdec5f4e46b747686bc2233ec0d2926 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 7 Apr 2021 00:00:35 +0200
Subject: [PATCH 0602/2024] gv: make template parse at all

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

diff --git a/srcpkgs/gv/template b/srcpkgs/gv/template
index f809256e5c31..e15cfeb71f7b 100644
--- a/srcpkgs/gv/template
+++ b/srcpkgs/gv/template
@@ -3,7 +3,7 @@ pkgname=gv
 version=3.7.4
 revision=4
 build_style=gnu-configure
-maintainer="Orphaned <orphan@voidlinux.org>
+maintainer="Orphaned <orphan@voidlinux.org>"
 homepage="http://www.gnu.org/software/gv/"
 license="GPL-2"
 short_desc="Postscript and PDF viewer"

From ab0824ef126b3d94c2805bb6095c5f0a98a240ed Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 7 Apr 2021 00:01:38 +0200
Subject: [PATCH 0603/2024] gtklp: make template parse

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

diff --git a/srcpkgs/gtklp/template b/srcpkgs/gtklp/template
index 8e22c8871795..a50d8cd59e90 100644
--- a/srcpkgs/gtklp/template
+++ b/srcpkgs/gtklp/template
@@ -7,7 +7,7 @@ configure_args="--enable-ssl --with-cups-config=${XBPS_CROSS_BASE}/usr/bin/cups-
 hostmakedepends="automake libtool pkg-config gettext"
 makedepends="openssl-devel gtk+-devel cups-devel"
 short_desc="Gtk frontend to cups - IPP support"
-maintainer="Orphaned <orphan@voidlinux.org>
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://gtklp.sirtobi.com/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${version}/${pkgname}-${version}.src.tar.gz"

From 5cfd38e1e0b0715142c26774fb8d256d9a42e305 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 7 Apr 2021 00:02:46 +0200
Subject: [PATCH 0604/2024] leafpad: make template parse

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

diff --git a/srcpkgs/leafpad/template b/srcpkgs/leafpad/template
index c0091b05d3bd..cb1cc66e9fe8 100644
--- a/srcpkgs/leafpad/template
+++ b/srcpkgs/leafpad/template
@@ -7,7 +7,7 @@ hostmakedepends="intltool pkg-config"
 makedepends="gettext-devel gtk+-devel desktop-file-utils hicolor-icon-theme"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="GTK+ Simple text editor"
-maintainer="Orphaned <orphan@voidlinux.org>
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://tarot.freeshell.org/leafpad/"
 distfiles="http://download-mirror.savannah.gnu.org/releases/leafpad/leafpad-${version}.tar.gz"

From bf0c1f1698fb571dce7444adcaf37331889af3b2 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 7 Apr 2021 00:04:02 +0200
Subject: [PATCH 0605/2024] librtlsdr: fix template parsing

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

diff --git a/srcpkgs/librtlsdr/template b/srcpkgs/librtlsdr/template
index 9e62cd6153b2..58ca0e394bee 100644
--- a/srcpkgs/librtlsdr/template
+++ b/srcpkgs/librtlsdr/template
@@ -6,7 +6,7 @@ build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="libusb-devel"
 short_desc="Turns your Realtek RTL2832 based DVB dongle into a SDR receiver"
-maintainer="Orphaned <orphan@voidlinux.org>
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://osmocom.org/projects/rtl-sdr/wiki"
 distfiles="https://github.com/steve-m/${pkgname}/archive/${version}.tar.gz"

From 6099dcbfc639d8c35e373638f635c25d50e450fc Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 7 Apr 2021 00:04:24 +0200
Subject: [PATCH 0606/2024] libXaw3d: fix template parsing

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

diff --git a/srcpkgs/libXaw3d/template b/srcpkgs/libXaw3d/template
index bc59565dffe5..f0241c7cc871 100644
--- a/srcpkgs/libXaw3d/template
+++ b/srcpkgs/libXaw3d/template
@@ -8,7 +8,7 @@ configure_args="--disable-static --enable-internationalization --enable-multipla
 hostmakedepends="automake bison libtool pkg-config"
 makedepends="libXmu-devel libXpm-devel xorg-util-macros"
 short_desc="X Athena Widget 3d library"
-maintainer="Orphaned <orphan@voidlinux.org>
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT/X11"
 homepage="https://cgit.freedesktop.org/xorg/lib/libXaw3d"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"

From a5a5dc252f36f8233eccea050959e55bd53aba91 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 7 Apr 2021 00:04:47 +0200
Subject: [PATCH 0607/2024] numlockx: fix template parsing

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

diff --git a/srcpkgs/numlockx/template b/srcpkgs/numlockx/template
index 77075643a293..908f2eb8ea54 100644
--- a/srcpkgs/numlockx/template
+++ b/srcpkgs/numlockx/template
@@ -5,7 +5,7 @@ revision=5
 build_style=gnu-configure
 makedepends="libX11-devel libSM-devel libXext-devel libXtst-devel"
 short_desc="Activate NumLock at startup"
-maintainer="Orphaned <orphan@voidlinux.org>
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://www.mike-devlin.com/linux/README-numlockx.htm"
 distfiles="${DEBIAN_SITE}/main/n/${pkgname}/${pkgname}_${version}.orig.tar.gz"

From b8885aa8aef3e02a819ad20c39490e651b483f3b Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 7 Apr 2021 00:05:11 +0200
Subject: [PATCH 0608/2024] offo-hyphenation: fix template parsing

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

diff --git a/srcpkgs/offo-hyphenation/template b/srcpkgs/offo-hyphenation/template
index aad25e9da3a4..0fcb7f5fc98e 100644
--- a/srcpkgs/offo-hyphenation/template
+++ b/srcpkgs/offo-hyphenation/template
@@ -5,7 +5,7 @@ revision=2
 hostmakedepends="unzip"
 depends="apache-fop>=1.1_2"
 short_desc="Hypenation patterns for apache FOP - precompiled version"
-maintainer="Orphaned <orphan@voidlinux.org>
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, Apache-2.0, LPPL-1.3b, TeX"
 homepage="http://offo.sourceforge.net/hyphenation/"
 distfiles="${SOURCEFORGE_SITE}/offo/${pkgname}/${version}/${pkgname}-binary.zip

From d24c7e86826170e1c6e8bddc9c0933991e4e63ea Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 7 Apr 2021 00:05:37 +0200
Subject: [PATCH 0609/2024] openjpeg: fix template parsing

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

diff --git a/srcpkgs/openjpeg/template b/srcpkgs/openjpeg/template
index bd44b0834a07..9fad97e00c59 100644
--- a/srcpkgs/openjpeg/template
+++ b/srcpkgs/openjpeg/template
@@ -7,7 +7,7 @@ configure_args="--disable-static"
 hostmakedepends="pkg-config"
 makedepends="libpng-devel lcms2-devel tiff-devel doxygen"
 short_desc="Open-source JPEG 2000 codec written in C language"
-maintainer="Orphaned <orphan@voidlinux.org>
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="http://www.openjpeg.org/"
 distfiles="$SOURCEFORGE_SITE/openjpeg.mirror/${version}/${pkgname}-${version}.tar.gz"

From 5895dcfccc27d771cf827563434021c5a544c471 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 7 Apr 2021 00:06:03 +0200
Subject: [PATCH 0610/2024] psutils: fix template parsing

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

diff --git a/srcpkgs/psutils/template b/srcpkgs/psutils/template
index a76504929eb4..d377334ebb6a 100644
--- a/srcpkgs/psutils/template
+++ b/srcpkgs/psutils/template
@@ -3,7 +3,7 @@ pkgname="psutils"
 version="p17"
 revision=4
 short_desc="Set of utilities to manipulate PostScript files"
-maintainer="Orphaned <orphan@voidlinux.org>
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="AJCD-License"
 hostmakedepends="perl"
 makedepends="ghostscript"

From f894e5896675215184e4430548cb8c569cb37934 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 7 Apr 2021 00:09:31 +0200
Subject: [PATCH 0611/2024] JAI: make template parse

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

diff --git a/srcpkgs/JAI/template b/srcpkgs/JAI/template
index 0ff28d418bfd..16abfd487d5f 100644
--- a/srcpkgs/JAI/template
+++ b/srcpkgs/JAI/template
@@ -4,7 +4,7 @@ version=1.1.3
 revision=4
 archs="i686 x86_64"
 short_desc="Java Advanced Imaging Library - binary version"
-maintainer="Orphaned <orphan@voidlinux.org>
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="custom:Oracle Binary Code License"
 homepage="https://java.net/projects/jai-core"
 repository=nonfree

From 35276b77b7a678817db597b19da8733fe46c6ada Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 7 Apr 2021 00:09:35 +0200
Subject: [PATCH 0612/2024] brother-*: make templates parse

---
 srcpkgs/brother-brscan3/template             | 2 +-
 srcpkgs/brother-dcp197c-cupswrapper/template | 2 +-
 srcpkgs/brother-dcp197c-lpr/template         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/brother-brscan3/template b/srcpkgs/brother-brscan3/template
index 3b2ef4a8bbe2..38bf432986e9 100644
--- a/srcpkgs/brother-brscan3/template
+++ b/srcpkgs/brother-brscan3/template
@@ -8,7 +8,7 @@ hostmakedepends="tar"
 makedepends="sane-devel curl"
 depends="sane"
 short_desc="SANE scanner driver for brscan3-compatible Brother scanners"
-maintainer="Orphaned <orphan@voidlinux.org>
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="custom:BrotherEULA"
 homepage="http://support.brother.com/g/b/index.aspx"
 nopie=yes
diff --git a/srcpkgs/brother-dcp197c-cupswrapper/template b/srcpkgs/brother-dcp197c-cupswrapper/template
index b74f204c586e..e60c4e77bb21 100644
--- a/srcpkgs/brother-dcp197c-cupswrapper/template
+++ b/srcpkgs/brother-dcp197c-cupswrapper/template
@@ -6,7 +6,7 @@ archs="i686 x86_64"
 create_wrksrc=yes
 depends="brother-dcp197c-lpr cups"
 short_desc="CUPS wrapper driver for the brother DCP-197C printer/scanner"
-maintainer="Orphaned <orphan@voidlinux.org>
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://support.brother.com/g/b/index.aspx"
 distfiles="http://download.brother.com/welcome/dlf005405/dcp197ccupswrapper-${version}-1.i386.deb"
diff --git a/srcpkgs/brother-dcp197c-lpr/template b/srcpkgs/brother-dcp197c-lpr/template
index 71c03d029100..0e2125a1143e 100644
--- a/srcpkgs/brother-dcp197c-lpr/template
+++ b/srcpkgs/brother-dcp197c-lpr/template
@@ -6,7 +6,7 @@ archs="i686 x86_64"
 create_wrksrc=yes
 depends="a2ps ghostscript"
 short_desc="LPR driver for the brother DCP-197C printer/scanner"
-maintainer="Orphaned <orphan@voidlinux.org>
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="http://support.brother.com/g/b/index.aspx"
 distfiles="http://download.brother.com/welcome/dlf005403/dcp197clpr-${version}-1.i386.deb"

From f4e727f49e04d5ce7029be68ba81cd142a8a811e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 6 Apr 2021 14:00:56 -0400
Subject: [PATCH 0613/2024] python3-pytools: update to 2021.2.3.

---
 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 2d679f9f9a93..e1c2bd5f80d9 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.2
+version=2021.2.3
 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=7d3c37714c0ccdfe40296f526927735080e9defb8e09dd3d438e5328badadf14
+checksum=5f953063afe8218ef42d71dd461ce8f9587899ea561db19c64f2701a08eee57e
 
 post_install() {
 	vlicense LICENSE

From 1b750b18581e254e199e15fe4456f099db25edd8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 6 Apr 2021 14:02:08 -0400
Subject: [PATCH 0614/2024] python3-pyopencl: update to 2021.1.6.

---
 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 811a5ca6290d..f1539c2c8b86 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.5
+version=2021.1.6
 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=aaa438b87fbb6d5a185b22666ad0ada5f396a0ac259db95a59620e7900d3b837
+checksum=b618e8105cdd36df8bd2f511ca9d8e509a12c0f886e5848b12320c4a9dfefbb0
 
 do_configure() {
 	./configure.py --cl-inc-dir=${XBPS_CROSS_BASE}/usr/include \

From f1de3117e7bdf9c550a153dc801fcfad11c3e41a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 6 Apr 2021 14:24:25 -0400
Subject: [PATCH 0615/2024] python3-hypothesis: update to 6.8.5.

---
 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 587e6b28d8c2..3b6a52476d8d 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.4
+version=6.8.5
 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=8ce759ea4c1792ce0456353a2f2ef0061323545ce4cf010ae8a65966304523bf
+checksum=8282c734fe29f8fc5c478e7880aa26470997fcd73cb3f96d0ecd47ab19786947
 
 do_check() {
 	# Manually run the tests that tox considers part of the "full" suite,

From f7f6e93969bfac2b50ddd728ad5ef11e5ba7f4ff Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 6 Apr 2021 14:32:26 -0400
Subject: [PATCH 0616/2024] xpra: update to 4.1.2.

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

diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template
index 73cb2de90061..302effb9ded3 100644
--- a/srcpkgs/xpra/template
+++ b/srcpkgs/xpra/template
@@ -1,6 +1,6 @@
 # Template file for 'xpra'
 pkgname=xpra
-version=4.1.1
+version=4.1.2
 revision=1
 build_style=python3-module
 make_install_args="$(vopt_with docs)"
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later"
 homepage="https://xpra.org/"
 changelog="https://raw.githubusercontent.com/Xpra-org/xpra/master/docs/CHANGELOG.md"
 distfiles="https://github.com/Xpra-org/xpra/archive/v${version}.tar.gz"
-checksum=7958ddd3aadcffad5e06c80e44e54d7528db73ed68f8cd2e64753ae15f62e177
+checksum=2b7b05ec77ee0c16a8312e231d8429699b5b2aada7b549c72f5521a5f8563dfe
 conf_files="/etc/xpra/xpra.conf /etc/xpra/xorg.conf /etc/xpra/conf.d/*"
 
 system_groups="xpra"

From 9e39b2bbfdaad3578aa16fea8618b293f96b2e5d Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Tue, 6 Apr 2021 17:55:12 -0300
Subject: [PATCH 0617/2024] openvpn: update to 2.5.1.

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

diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template
index 29c0f10ddea8..cbad158b7c7f 100644
--- a/srcpkgs/openvpn/template
+++ b/srcpkgs/openvpn/template
@@ -1,7 +1,7 @@
 # Template file for 'openvpn'
 pkgname=openvpn
-version=2.5.0
-revision=2
+version=2.5.1
+revision=1
 build_style=gnu-configure
 configure_args="$(vopt_enable pkcs11) --disable-systemd
  $(vopt_if mbedtls --with-crypto-library=mbedtls)"
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://www.openvpn.net"
 distfiles="http://build.openvpn.net/downloads/releases/${pkgname}-${version}.tar.xz"
-checksum=029a426e44d656cb4e1189319c95fe6fc9864247724f5599d99df9c4c3478fbd
+checksum=40930489c837c05f6153f38e1ebaec244431ef1a034e4846ff732d71d59ff194
 
 build_options="mbedtls pkcs11"
 build_options_default="pkcs11"
@@ -21,6 +21,9 @@ desc_option_mbedtls="Build with mbedtls support"
 desc_option_pkcs11="Enable support for PKCS#11"
 vopt_conflict mbedtls pkcs11
 
+# tests can't run in CI
+make_check=extended
+
 post_install() {
 	vmkdir usr/share/examples/${pkgname}
 	cp -r sample/sample-config-files/* ${DESTDIR}/usr/share/examples/${pkgname}

From 35da94ae8e966ff2410d38a5c3566c176cc698da Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 7 Apr 2021 10:41:57 +0200
Subject: [PATCH 0618/2024] fzf: update to 0.27.0.

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

diff --git a/srcpkgs/fzf/template b/srcpkgs/fzf/template
index a3c30e7a3895..cbd5d39dd152 100644
--- a/srcpkgs/fzf/template
+++ b/srcpkgs/fzf/template
@@ -1,6 +1,6 @@
 # Template file for 'fzf'
 pkgname=fzf
-version=0.26.0
+version=0.27.0
 revision=1
 build_style=go
 go_import_path="github.com/junegunn/fzf"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://github.com/junegunn/fzf"
 changelog="https://raw.githubusercontent.com/junegunn/fzf/master/CHANGELOG.md"
 distfiles="https://github.com/junegunn/fzf/archive/${version}.tar.gz"
-checksum=a8dc01f16b3bf453fdc9e9a2cd0ca39db7a1b44386517bb7859805b053aa7810
+checksum=265c569f3b0c3c210b45831b80d4fba260c5956f3ebf88d2c5c8f9f6d759e388
 
 post_install() {
 	cd ${wrksrc}

From cdb17511e66fa6cc38506c796f5beea27877a305 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 7 Apr 2021 13:45:36 +0200
Subject: [PATCH 0619/2024] nsd: update to 4.3.6.

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

diff --git a/srcpkgs/nsd/template b/srcpkgs/nsd/template
index 4c7cf99afea0..355079a68e47 100644
--- a/srcpkgs/nsd/template
+++ b/srcpkgs/nsd/template
@@ -1,7 +1,7 @@
 # Template file for 'nsd'
 pkgname=nsd
-version=4.3.5
-revision=2
+version=4.3.6
+revision=1
 build_style=gnu-configure
 configure_args="--enable-ratelimit --enable-ratelimit-default-is-off
  --with-libevent=${XBPS_CROSS_BASE}/usr --with-ssl=${XBPS_CROSS_BASE}/usr"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://www.nlnetlabs.nl/projects/nsd/"
 changelog="https://github.com/NLnetLabs/nsd/blob/NSD_${version//./_}_REL/doc/ChangeLog"
 distfiles="https://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=7da2b43e30b3d7f307722c608f719bfb169f0d985c764a34fa0669dc33484472
+checksum=bee6c0cf5525acc41dade9ec9e29435299211b0de290059878f7e53249e75f18
 system_accounts="nsd"
 nsd_homedir=/var/db/nsd
 make_dirs="/var/db/nsd 0755 nsd nsd"

From bc0c03490f657f26e671c2697810a71614b330e3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 7 Apr 2021 13:51:13 +0200
Subject: [PATCH 0620/2024] ipe: update to 7.2.24.

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

diff --git a/srcpkgs/ipe/template b/srcpkgs/ipe/template
index af22b4c8bcb5..f322cdbfaca1 100644
--- a/srcpkgs/ipe/template
+++ b/srcpkgs/ipe/template
@@ -1,6 +1,6 @@
 # Template file for 'ipe'
 pkgname=ipe
-version=7.2.23
+version=7.2.24
 revision=1
 _tools_commit=v7.2.20.1
 hostmakedepends="pkg-config qt5-qmake qt5-tools qt5-host-tools"
@@ -10,9 +10,9 @@ 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
+distfiles="https://github.com/otfried/ipe/releases/download/v${version}/ipe-${version}-src.tar.gz
  https://github.com/otfried/ipe-tools/archive/${_tools_commit}.tar.gz"
-checksum="a19ba29822e63fc7c12c3b85ca5bb58f9ee72fdf566e148af79206b5dc1f757b
+checksum="feb879f24d1dce25910790770446d50b03e46ee2ebd7d28157b1705971644f6f
  233f5629986ade3d70de6dd1af85d578d6aa0f92f9bcd1ecd4e8e5a94b508376"
 nocross="something with gsl"
 
diff --git a/srcpkgs/ipe/update b/srcpkgs/ipe/update
deleted file mode 100644
index 473b18a7828a..000000000000
--- a/srcpkgs/ipe/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore='*.*.*.*'

From 257d4f19bbaba99609c4c955d3891de73d93b013 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 7 Apr 2021 14:02:27 +0200
Subject: [PATCH 0621/2024] curl: force use of gmtime_r

---
 srcpkgs/curl/template | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index ef608fb425f6..f8a721a2cbad 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -1,7 +1,7 @@
 # Template file for 'curl'
 pkgname=curl
 version=7.76.0
-revision=1
+revision=2
 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)
@@ -27,6 +27,9 @@ build_options="gnutls gssapi ldap rtmp ssh ssl zstd"
 build_options_default="ssh ssl zstd"
 vopt_conflict ssl gnutls
 
+# force usage of gmtime_r, fix in https://github.com/curl/curl/pull/6859
+CFLAGS="-DHAVE_GMTIME_R -DTIME_WITH_SYS_TIME"
+
 pre_configure() {
 	export CFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=2/}"
 	export CFLAGS="${CFLAGS/-I${XBPS_CROSS_BASE}\/usr\/include/}"

From ff3ba79b9813273d531bc6bbc53f1399e832cce1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 7 Apr 2021 17:34:02 +0200
Subject: [PATCH 0622/2024] linux5.10: update to 5.10.28.

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

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 065727898423..e283aa86771c 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.27
+version=5.10.28
 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=d99dc9662951299c53a0a8d8c8d0a72a16ff861d20e927c0f9b14f63282d69d9
+checksum=4dfc3aea719556e63e90b8692e9d4b779ad1cb2a9a4823bf721e30004e7ac354
 python_version=3
 patch_args="-Np1"
 

From a66c8a03e9ea6caac877c0e5a77fb1d05fe5ce57 Mon Sep 17 00:00:00 2001
From: Alex <60660439+AlexDltg@users.noreply.github.com>
Date: Wed, 7 Apr 2021 18:14:50 +0200
Subject: [PATCH 0623/2024] intellij-idea-community-edition: update to 2021.1.

---
 srcpkgs/intellij-idea-community-edition/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/intellij-idea-community-edition/template b/srcpkgs/intellij-idea-community-edition/template
index dac8726ad47a..460f8429da73 100644
--- a/srcpkgs/intellij-idea-community-edition/template
+++ b/srcpkgs/intellij-idea-community-edition/template
@@ -1,6 +1,6 @@
 # Template file for 'intellij-idea-community-edition'
 pkgname=intellij-idea-community-edition
-version=2020.3.3
+version=2021.1
 revision=1
 archs="i686 x86_64"
 depends="virtual?java-environment giflib libXtst hicolor-icon-theme"
@@ -9,7 +9,7 @@ maintainer="John <me@johnnynator.dev>"
 license="Apache-2.0"
 homepage="https://www.jetbrains.org/"
 distfiles="https://download.jetbrains.com/idea/ideaIC-${version}-no-jbr.tar.gz"
-checksum=200b759b0d0410a9cae57d839c5f2b0f1e454b1b340206cf3edc2d03d29558be
+checksum=becd31e78d430db7a3edf381343f6722926e6e16b35d39371b74786decc40617
 repository=nonfree
 nopie=yes
 python_version=3

From 96ceee94f944c0e229257ce30a5c78f56656ad0d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 6 Apr 2021 19:08:31 +0200
Subject: [PATCH 0624/2024] wire-desktop: use System electron

---
 srcpkgs/wire-desktop/template | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/wire-desktop/template b/srcpkgs/wire-desktop/template
index edb4bb21be61..27054cc542d7 100644
--- a/srcpkgs/wire-desktop/template
+++ b/srcpkgs/wire-desktop/template
@@ -1,22 +1,16 @@
 # Template file for 'wire-desktop'
 pkgname=wire-desktop
 version=3.24.2939
-revision=1
+revision=2
 wrksrc="${pkgname}-linux-${version}"
 hostmakedepends="nodejs yarn git"
+depends="electron10"
 short_desc="Wire for desktop"
 maintainer="Young Jin Park <youngjinpark20@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://wire.com"
 distfiles="https://github.com/wireapp/wire-desktop/archive/linux/${version}.tar.gz"
 checksum=69e70d39286f29b2fb186da30ec828be0a30329c457e829111b863223ed64127
-nocross=yes
-
-case "$XBPS_TARGET_MACHINE" in
-	*-musl) broken="glibc artefacts are installed" ;;
-	i686*) broken="yarn" ;;
-	ppc*) broken="electron" ;;
-esac
 
 pre_build() {
 	yarn
@@ -28,9 +22,13 @@ do_build() {
 
 do_install() {
 	vmkdir usr/lib/wire-desktop
-	vcopy wrap/dist/linux-unpacked/* usr/lib/wire-desktop
+	vinstall wrap/dist/linux-unpacked/resources/app.asar 644 usr/lib/wire-desktop
 	vmkdir usr/bin
-	ln -sf /usr/lib/wire-desktop/wire-desktop ${DESTDIR}/usr/bin/
+	cat << EOF > "wire-desktop.sh"
+#!/bin/sh
+exec electron10 "/usr/lib/wire-desktop/app.asar" "\$@"
+EOF
+	vbin wire-desktop.sh wire-desktop
 	vmkdir usr/share/icons/hicolor/256x256/apps
 	vcopy resources/icons/256x256.png usr/share/icons/hicolor/256x256/apps/wire-desktop.png
 	vmkdir usr/share/icons/hicolor/32x32/apps

From 0ab173711e19ea2bf72120ec047af829bb151aa6 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Wed, 7 Apr 2021 16:22:43 +0300
Subject: [PATCH 0625/2024] fish-shell: update to 3.2.2

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

diff --git a/srcpkgs/fish-shell/template b/srcpkgs/fish-shell/template
index 800a781f214e..35ce6f0967ea 100644
--- a/srcpkgs/fish-shell/template
+++ b/srcpkgs/fish-shell/template
@@ -1,7 +1,7 @@
 # Template file for 'fish-shell'
 pkgname=fish-shell
-version=3.2.1
-revision=2
+version=3.2.2
+revision=1
 wrksrc="fish-${version}"
 build_style=cmake
 hostmakedepends="gettext"
@@ -13,7 +13,7 @@ maintainer="Nathan Owens <ndowens04@gmail.com>"
 license="GPL-2.0-only"
 homepage="https://fishshell.com/"
 distfiles="https://github.com/fish-shell/fish-shell/releases/download/${version}/fish-${version}.tar.xz"
-checksum=d8e49f4090d3778df17dd825e4a2a80192015682423cd9dd02b6675d65c3af5b
+checksum=5944da1a8893d11b0828a4fd9136ee174549daffb3d0adfdd8917856fe6b4009
 register_shell="/bin/fish /usr/bin/fish"
 # tests don't work as root
 make_check=extended

From 1adeebd0c3743b61c939261373af870d1d0757a7 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 7 Apr 2021 19:20:42 +0300
Subject: [PATCH 0626/2024] eqonomize: update to 1.5.2.

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

diff --git a/srcpkgs/eqonomize/template b/srcpkgs/eqonomize/template
index 6b5c1b6b7f7d..9197b9c36b2c 100644
--- a/srcpkgs/eqonomize/template
+++ b/srcpkgs/eqonomize/template
@@ -1,6 +1,6 @@
 # Template file for 'eqonomize'
 pkgname=eqonomize
-version=1.5.0
+version=1.5.2
 revision=1
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools"
@@ -12,4 +12,4 @@ license="GPL-3.0-or-later"
 homepage="http://eqonomize.github.io"
 changelog="https://raw.githubusercontent.com/Eqonomize/Eqonomize/master/ChangeLog"
 distfiles="https://github.com/Eqonomize/Eqonomize/releases/download/v${version}/${pkgname}-${version}.tar.gz"
-checksum=6ca5383d49f65aa521faf4103b7d2910bad9dd277319a1ce4d92669d2d490672
+checksum=6184b42d1bd5cb54dcd450e2db184ba8b6096ecd839eb432ade08190e32cc6ee

From 01609aa8053d33037d12506fbbe1ee6eb9d4baf1 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 14 Dec 2020 03:57:40 +0100
Subject: [PATCH 0627/2024] llvm10: remove

---
 common/shlibs                                 |   1 -
 srcpkgs/llvm10/INSTALL.msg                    |   1 +
 .../llvm10/files/llvm-Config-llvm-config.h    |   9 --
 .../files/patches/llvm/llvm-001-musl.patch    |  58 ----------
 .../llvm/llvm-002-musl-ppc64-elfv2.patch      |  26 -----
 .../patches/llvm/llvm-003-secureplt.patch     |  11 --
 .../patches/llvm/llvm-004-override-opt.patch  |  18 ---
 .../patches/llvm/llvm-005-ppc-bigpic.patch    |  38 -------
 .../llvm/llvm-006-aarch64-mf_exec.patch       |  25 -----
 .../patches/llvm/llvm-007-ppc-d85007.patch    |  86 ---------------
 srcpkgs/llvm10/template                       | 104 +-----------------
 srcpkgs/llvm10/update                         |   2 -
 12 files changed, 5 insertions(+), 374 deletions(-)
 create mode 100644 srcpkgs/llvm10/INSTALL.msg
 delete mode 100644 srcpkgs/llvm10/files/llvm-Config-llvm-config.h
 delete mode 100644 srcpkgs/llvm10/files/patches/llvm/llvm-001-musl.patch
 delete mode 100644 srcpkgs/llvm10/files/patches/llvm/llvm-002-musl-ppc64-elfv2.patch
 delete mode 100644 srcpkgs/llvm10/files/patches/llvm/llvm-003-secureplt.patch
 delete mode 100644 srcpkgs/llvm10/files/patches/llvm/llvm-004-override-opt.patch
 delete mode 100644 srcpkgs/llvm10/files/patches/llvm/llvm-005-ppc-bigpic.patch
 delete mode 100644 srcpkgs/llvm10/files/patches/llvm/llvm-006-aarch64-mf_exec.patch
 delete mode 100644 srcpkgs/llvm10/files/patches/llvm/llvm-007-ppc-d85007.patch
 delete mode 100644 srcpkgs/llvm10/update

diff --git a/common/shlibs b/common/shlibs
index 40faf29b113a..70be7e00c51d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1012,7 +1012,6 @@ libuchardet.so.0 uchardet-0.0.6_1
 libgtksourceviewmm-3.0.so.0 gtksourceviewmm-3.2.0_1
 libyajl.so.2 yajl-2.0.1_1
 libconfuse.so.2 confuse-3.2.1_1
-libLLVM-10.so libllvm10-10.0.0_1
 liblldb.so.11 lldb-11.0.0_1
 libclang.so.11 libclang-11.0.0_1
 libclang-cpp.so.11 libclang-cpp-11.0.0_1
diff --git a/srcpkgs/llvm10/INSTALL.msg b/srcpkgs/llvm10/INSTALL.msg
new file mode 100644
index 000000000000..3e12657af34c
--- /dev/null
+++ b/srcpkgs/llvm10/INSTALL.msg
@@ -0,0 +1 @@
+llvm10 is no longer provided by Void Linux
diff --git a/srcpkgs/llvm10/files/llvm-Config-llvm-config.h b/srcpkgs/llvm10/files/llvm-Config-llvm-config.h
deleted file mode 100644
index 2fa08c9be696..000000000000
--- a/srcpkgs/llvm10/files/llvm-Config-llvm-config.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <bits/wordsize.h>
-
-#if __WORDSIZE == 32
-#include "llvm-config-32.h"
-#elif __WORDSIZE == 64
-#include "llvm-config-64.h"
-#else
-#error "Unknown word size"
-#endif
diff --git a/srcpkgs/llvm10/files/patches/llvm/llvm-001-musl.patch b/srcpkgs/llvm10/files/patches/llvm/llvm-001-musl.patch
deleted file mode 100644
index a0eddbf58be1..000000000000
--- a/srcpkgs/llvm10/files/patches/llvm/llvm-001-musl.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From faca3fbd15d0c3108493c3c54cd93138e049ac43 Mon Sep 17 00:00:00 2001
-From: Andrea Brancaleoni <miwaxe@gmail.com>
-Date: Tue, 8 Sep 2015 22:03:02 +0200
-Subject: [PATCH 3/3] musl
-
----
- include/llvm/Analysis/TargetLibraryInfo.h | 9 +++++++++
- lib/Support/DynamicLibrary.cpp            | 2 +-
- lib/Support/Unix/Signals.inc              | 6 +++---
- utils/unittest/googletest/src/gtest.cc    | 1 +
- 5 files changed, 17 insertions(+), 6 deletions(-)
-
-diff --git a/include/llvm/Analysis/TargetLibraryInfo.h b/include/llvm/Analysis/TargetLibraryInfo.h
-index e0a1ee3..465b65a 100644
---- a/include/llvm/Analysis/TargetLibraryInfo.h
-+++ b/include/llvm/Analysis/TargetLibraryInfo.h
-@@ -18,6 +18,15 @@
- #include "llvm/IR/PassManager.h"
- #include "llvm/Pass.h"
- 
-+#undef fopen64
-+#undef fseeko64
-+#undef fstat64
-+#undef fstatvfs64
-+#undef ftello64
-+#undef lstat64
-+#undef stat64
-+#undef tmpfile64
-+
- namespace llvm {
- template <typename T> class ArrayRef;
- 
-diff --git a/utils/unittest/googletest/src/gtest.cc b/utils/unittest/googletest/src/gtest.cc
-index 5780764..1d548c1 100644
---- a/utils/unittest/googletest/src/gtest.cc
-+++ b/utils/unittest/googletest/src/gtest.cc
-@@ -128,6 +128,7 @@
- 
- #if GTEST_CAN_STREAM_RESULTS_
- # include <arpa/inet.h>  // NOLINT
-+# include <sys/socket.h>  // NOLINT
- # include <netdb.h>  // NOLINT
- # include <sys/socket.h>  // NOLINT
- # include <sys/types.h>  // NOLINT
--- 
-2.5.1
-
---- a/lib/Support/Unix/DynamicLibrary.inc
-+++ b/lib/Support/Unix/DynamicLibrary.inc
-@@ -102,7 +102,7 @@ static void *DoSearch(const char* SymbolName) {
- 
- // This macro returns the address of a well-known, explicit symbol
- #define EXPLICIT_SYMBOL(SYM) \
--   if (!strcmp(SymbolName, #SYM)) return &SYM
-+   if (!strcmp(SymbolName, #SYM)) return (void *)&SYM
- 
- // Under glibc we have a weird situation. The stderr/out/in symbols are both
- // macros and global variables because of standards requirements. So, we
diff --git a/srcpkgs/llvm10/files/patches/llvm/llvm-002-musl-ppc64-elfv2.patch b/srcpkgs/llvm10/files/patches/llvm/llvm-002-musl-ppc64-elfv2.patch
deleted file mode 100644
index 1ff8aaa239ca..000000000000
--- a/srcpkgs/llvm10/files/patches/llvm/llvm-002-musl-ppc64-elfv2.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-This patches LLVM to use ELFv2 on ppc64 uncoditionally unless overridden. We
-need this because unlike most distros we use ELFv2 for both glibc and musl
-on big endian ppc64.
-
---- a/lib/Target/PowerPC/PPCTargetMachine.cpp
-+++ b/lib/Target/PowerPC/PPCTargetMachine.cpp
-@@ -213,9 +213,8 @@ static PPCTargetMachine::PPCABI computeTargetABI(const Triple &TT,
- 
-   switch (TT.getArch()) {
-   case Triple::ppc64le:
--    return PPCTargetMachine::PPC_ABI_ELFv2;
-   case Triple::ppc64:
--    return PPCTargetMachine::PPC_ABI_ELFv1;
-+    return PPCTargetMachine::PPC_ABI_ELFv2;
-   default:
-     return PPCTargetMachine::PPC_ABI_UNKNOWN;
-   }
---- a/test/CodeGen/PowerPC/ppc64-elf-abi.ll
-+++ b/test/CodeGen/PowerPC/ppc64-elf-abi.ll
-@@ -1,4 +1,5 @@
--; RUN: llc -verify-machineinstrs -mtriple=powerpc64-unknown-linux-gnu < %s | FileCheck %s -check-prefix=CHECK-ELFv1
-+; RUN: llc -verify-machineinstrs -mtriple=powerpc64-unknown-linux-gnu < %s | FileCheck %s -check-prefix=CHECK-ELFv2
-+; RUN: llc -verify-machineinstrs -mtriple=powerpc64-unknown-linux-musl < %s | FileCheck %s -check-prefix=CHECK-ELFv2
- ; RUN: llc -verify-machineinstrs -mtriple=powerpc64-unknown-linux-gnu -target-abi elfv1 < %s | FileCheck %s -check-prefix=CHECK-ELFv1
- ; RUN: llc -verify-machineinstrs -mtriple=powerpc64-unknown-linux-gnu -target-abi elfv2 < %s | FileCheck %s -check-prefix=CHECK-ELFv2
- ; RUN: llc -verify-machineinstrs -mtriple=powerpc64le-unknown-linux-gnu < %s | FileCheck %s -check-prefix=CHECK-ELFv2
diff --git a/srcpkgs/llvm10/files/patches/llvm/llvm-003-secureplt.patch b/srcpkgs/llvm10/files/patches/llvm/llvm-003-secureplt.patch
deleted file mode 100644
index fcbaba86335e..000000000000
--- a/srcpkgs/llvm10/files/patches/llvm/llvm-003-secureplt.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- llvm/lib/Target/PowerPC/PPCSubtarget.cpp
-+++ llvm/lib/Target/PowerPC/PPCSubtarget.cpp
-@@ -150,7 +150,7 @@ void PPCSubtarget::initSubtargetFeatures(StringRef CPU, StringRef FS) {
- 
-   if ((TargetTriple.isOSFreeBSD() && TargetTriple.getOSMajorVersion() >= 13) ||
-       TargetTriple.isOSNetBSD() || TargetTriple.isOSOpenBSD() ||
--      TargetTriple.isMusl())
-+      isTargetLinux())
-     SecurePlt = true;
- 
-   if (HasSPE && IsPPC64)
diff --git a/srcpkgs/llvm10/files/patches/llvm/llvm-004-override-opt.patch b/srcpkgs/llvm10/files/patches/llvm/llvm-004-override-opt.patch
deleted file mode 100644
index 30d1e14e193e..000000000000
--- a/srcpkgs/llvm10/files/patches/llvm/llvm-004-override-opt.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-This allows us to override the optimization level as not all platforms can
-deal with -O3.
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -893,6 +893,12 @@ if( MINGW AND NOT "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" )
-   llvm_replace_compiler_option(CMAKE_CXX_FLAGS_RELEASE "-O3" "-O2")
- endif()
- 
-+set(VOID_CXX_OPT_FLAGS "" CACHE STRING "Optimization level to use")
-+
-+if(NOT VOID_CXX_OPT_FLAGS STREQUAL "")
-+  llvm_replace_compiler_option(CMAKE_CXX_FLAGS_RELEASE "-O3" "${VOID_CXX_OPT_FLAGS}")
-+endif()
-+
- # Put this before tblgen. Else we have a circular dependence.
- add_subdirectory(lib/Demangle)
- add_subdirectory(lib/Support)
diff --git a/srcpkgs/llvm10/files/patches/llvm/llvm-005-ppc-bigpic.patch b/srcpkgs/llvm10/files/patches/llvm/llvm-005-ppc-bigpic.patch
deleted file mode 100644
index 4e0045d97d35..000000000000
--- a/srcpkgs/llvm10/files/patches/llvm/llvm-005-ppc-bigpic.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From f3dbdd49c06bfafc1d6138094cf42889c14d38b6 Mon Sep 17 00:00:00 2001
-From: Samuel Holland <samuel@sholland.org>
-Date: Sun, 3 Nov 2019 10:57:27 -0600
-Subject: [PATCH] [LLVM][PowerPC] Assume BigPIC if no PIC level is specified
-
----
- llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp  | 2 +-
- llvm/lib/Target/PowerPC/PPCMCInstLower.cpp | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp b/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp
-index 269b84b4e8d..03246a5242c 100644
---- llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp
-+++ llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp
-@@ -488,7 +488,7 @@ void PPCAsmPrinter::EmitTlsCall(const MachineInstr *MI,
- 
-   // Add 32768 offset to the symbol so we follow up the latest GOT/PLT ABI.
-   if (Kind == MCSymbolRefExpr::VK_PLT && Subtarget->isSecurePlt() &&
--      M->getPICLevel() == PICLevel::BigPIC)
-+      M->getPICLevel() != PICLevel::SmallPIC)
-     TlsRef = MCBinaryExpr::createAdd(
-         TlsRef, MCConstantExpr::create(32768, OutContext), OutContext);
-   const MachineOperand &MO = MI->getOperand(2);
-diff --git a/llvm/lib/Target/PowerPC/PPCMCInstLower.cpp b/llvm/lib/Target/PowerPC/PPCMCInstLower.cpp
-index 027e6bd1ba0..ae461f4eea9 100644
---- llvm/lib/Target/PowerPC/PPCMCInstLower.cpp
-+++ llvm/lib/Target/PowerPC/PPCMCInstLower.cpp
-@@ -116,7 +116,7 @@ static MCOperand GetSymbolRef(const MachineOperand &MO, const MCSymbol *Symbol,
-   const MCExpr *Expr = MCSymbolRefExpr::create(Symbol, RefKind, Ctx);
-   // If -msecure-plt -fPIC, add 32768 to symbol.
-   if (Subtarget->isSecurePlt() && TM.isPositionIndependent() &&
--      M->getPICLevel() == PICLevel::BigPIC &&
-+      M->getPICLevel() != PICLevel::SmallPIC &&
-       MO.getTargetFlags() == PPCII::MO_PLT)
-     Expr =
-         MCBinaryExpr::createAdd(Expr, MCConstantExpr::create(32768, Ctx), Ctx);
--- 
-2.23.0
diff --git a/srcpkgs/llvm10/files/patches/llvm/llvm-006-aarch64-mf_exec.patch b/srcpkgs/llvm10/files/patches/llvm/llvm-006-aarch64-mf_exec.patch
deleted file mode 100644
index a64a317ee6cf..000000000000
--- a/srcpkgs/llvm10/files/patches/llvm/llvm-006-aarch64-mf_exec.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Fix failures in AllocationTests/MappedMemoryTest.* on aarch64:
-
-    Failing Tests (8):
-        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.AllocAndRelease/3
-        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.DuplicateNear/3
-        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.EnabledWrite/3
-        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.MultipleAllocAndRelease/3
-        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.SuccessiveNear/3
-        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.UnalignedNear/3
-        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.ZeroNear/3
-        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.ZeroSizeNear/3
-
-Upstream-Issue: https://bugs.llvm.org/show_bug.cgi?id=14278#c10
-
---- a/lib/Support/Unix/Memory.inc
-+++ b/lib/Support/Unix/Memory.inc
-@@ -59,7 +59,7 @@
-     return PROT_READ | PROT_WRITE | PROT_EXEC;
-   case llvm::sys::Memory::MF_EXEC:
- #if (defined(__FreeBSD__) || defined(__POWERPC__) || defined (__ppc__) || \
--     defined(_POWER) || defined(_ARCH_PPC))
-+     defined(_POWER) || defined(_ARCH_PPC) || (defined(__linux__) && defined(__aarch64__)))
-     // On PowerPC, having an executable page that has no read permission
-     // can have unintended consequences.  The function InvalidateInstruction-
-     // Cache uses instructions dcbf and icbi, both of which are treated by
diff --git a/srcpkgs/llvm10/files/patches/llvm/llvm-007-ppc-d85007.patch b/srcpkgs/llvm10/files/patches/llvm/llvm-007-ppc-d85007.patch
deleted file mode 100644
index 59d8f08003a1..000000000000
--- a/srcpkgs/llvm10/files/patches/llvm/llvm-007-ppc-d85007.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From cf54ca458afff1f7827bfbbc939429a00496c4f7 Mon Sep 17 00:00:00 2001
-From: Tom Stellard <tstellar@redhat.com>
-Date: Tue, 18 Aug 2020 10:54:49 -0700
-Subject: [PATCH] [PowerPC] PPCBoolRetToInt: Skip translation if there is
- ConstantExpr
-
-PPCBoolRetToInt collects PHI, Argument, Call and Constant defs related to an `i1` value which later is translated to an `i32`/`i64` value. The `translate` method expects an `i1` value. However, if the `Constant` is a `ConstantExpr`, the type of the `ConstantExpr` might not be `i1`.
-
-Fixes https://bugs.llvm.org/show_bug.cgi?id=46923 which causes ICE
-```
-llvm-project/llvm/lib/IR/Constants.cpp:1924: static llvm::Constant *llvm::ConstantExpr::getZExt(llvm::Constant *, llvm::Type *, bool): Assertion `C->getType()->getScalarSizeInBits() < Ty->getScalarSizeInBits()&& "SrcTy must be smaller than DestTy for ZExt!"' failed.
-```
-
-Differential Revision: https://reviews.llvm.org/D85007
----
- llvm/lib/Target/PowerPC/PPCBoolRetToInt.cpp |  8 ++++--
- llvm/test/CodeGen/PowerPC/pr46923.ll        | 31 +++++++++++++++++++++
- 2 files changed, 37 insertions(+), 2 deletions(-)
- create mode 100644 llvm/test/CodeGen/PowerPC/pr46923.ll
-
-diff --git a/llvm/lib/Target/PowerPC/PPCBoolRetToInt.cpp b/llvm/lib/Target/PowerPC/PPCBoolRetToInt.cpp
-index 2259a29f838..cfe3b3ce2e9 100644
---- llvm/lib/Target/PowerPC/PPCBoolRetToInt.cpp
-+++ llvm/lib/Target/PowerPC/PPCBoolRetToInt.cpp
-@@ -90,6 +90,9 @@ class PPCBoolRetToInt : public FunctionPass {
- 
-   // Translate a i1 value to an equivalent i32/i64 value:
-   Value *translate(Value *V) {
-+    assert(V->getType() == Type::getInt1Ty(V->getContext()) &&
-+           "Expect an i1 value");
-+
-     Type *IntTy = ST->isPPC64() ? Type::getInt64Ty(V->getContext())
-                                 : Type::getInt32Ty(V->getContext());
- 
-@@ -227,8 +230,9 @@ class PPCBoolRetToInt : public FunctionPass {
-     // CallInst. Potentially, bitwise operations (AND, OR, XOR, NOT) and sign
-     // extension could also be handled in the future.
-     for (Value *V : Defs)
--      if (!isa<PHINode>(V) && !isa<Constant>(V) &&
--          !isa<Argument>(V) && !isa<CallInst>(V))
-+      if ((!isa<PHINode>(V) && !isa<Constant>(V) && !isa<Argument>(V) &&
-+           !isa<CallInst>(V)) ||
-+          isa<ConstantExpr>(V))
-         return false;
- 
-     for (Value *V : Defs)
-diff --git a/llvm/test/CodeGen/PowerPC/pr46923.ll b/llvm/test/CodeGen/PowerPC/pr46923.ll
-new file mode 100644
-index 00000000000..d6f65508848
---- /dev/null
-+++ llvm/test/CodeGen/PowerPC/pr46923.ll
-@@ -0,0 +1,31 @@
-+; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
-+; RUN: llc -verify-machineinstrs -mtriple=powerpc64le-unknown-unknown \
-+; RUN:   -ppc-asm-full-reg-names < %s | FileCheck %s
-+
-+@bar = external constant i64, align 8
-+
-+define i1 @foo() {
-+; CHECK-LABEL: foo:
-+; CHECK:       # %bb.0: # %entry
-+; CHECK-NEXT:    crxor 4*cr5+lt, 4*cr5+lt, 4*cr5+lt
-+; CHECK-NEXT:    li r3, 0
-+; CHECK-NEXT:    li r4, 1
-+; CHECK-NEXT:    isel r3, r4, r3, 4*cr5+lt
-+; CHECK-NEXT:    blr
-+entry:
-+  br label %next
-+
-+next:
-+  br i1 undef, label %true, label %false
-+
-+true:
-+  br label %end
-+
-+false:
-+  br label %end
-+
-+end:
-+  %a = phi i1 [ icmp ugt (i64 0, i64 ptrtoint (i64* @bar to i64)), %true ],
-+              [ icmp ugt (i64 0, i64 2), %false ]
-+  ret i1 %a
-+}
--- 
-2.18.1
-
diff --git a/srcpkgs/llvm10/template b/srcpkgs/llvm10/template
index b800da58d1ca..5d25a8986553 100644
--- a/srcpkgs/llvm10/template
+++ b/srcpkgs/llvm10/template
@@ -1,109 +1,13 @@
 # Template file for 'llvm10'
 pkgname=llvm10
 version=10.0.0
-revision=7
-wrksrc="llvm-${version}.src"
-build_style=cmake
-configure_args="
- -DCMAKE_BUILD_TYPE=Release
- -DLLVM_INSTALL_UTILS=ON
- -DLLVM_BUILD_LLVM_DYLIB=ON
- -DLLVM_LINK_LLVM_DYLIB=ON
- -DLLVM_ENABLE_RTTI=ON
- -DLLVM_ENABLE_FFI=ON
- -DLLVM_BINUTILS_INCDIR=/usr/include"
-hostmakedepends="groff perl python3 zlib-devel libffi-devel swig"
-makedepends="python3-devel zlib-devel libffi-devel libedit-devel
- libxml2-devel binutils-devel libatomic-devel"
-depends="libllvm10"
-short_desc="Low Level Virtual Machine"
+revision=8
+build_style=meta
+short_desc="Low Level Virtual Machine (removed package)"
 maintainer="q66 <daniel@octaforge.org>"
-license="NCSA"
+license="metapackage"
 homepage="https://www.llvm.org"
-distfiles="https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/llvm-${version}.src.tar.xz"
-checksum="df83a44b3a9a71029049ec101fb0077ecbbdf5fe41e395215025779099a98fdf"
-lib32disabled=yes
-python_version=3
-
-conflicts="llvm11>=0"
-
-subpackages="libllvm10"
-
-post_patch() {
-	# patches
-	cd ${XBPS_BUILDDIR}/llvm-${version}.src
-	for i in ${FILESDIR}/patches/llvm/llvm-*.patch; do
-		msg_normal "Applying $i to llvm\n"
-		patch -sNp1 -i ${i}
-	done
-}
-
-pre_configure() {
-	# Vastly reduce size of debugging symbols:
-	CFLAGS=${CFLAGS/ -g/ -g1}
-	CXXFLAGS=${CXXFLAGS/ -g/ -g1}
-
-	# since gcc9, the build likes to blow up for ppc32 apparently because
-	# of clang being too large for a 24-bit relative call to the PLT, so
-	# optimize for size instead
-	case "$XBPS_TARGET_MACHINE" in
-		mips*-musl|ppc|ppc-musl) configure_args+=" -DVOID_CXX_OPT_FLAGS=-Os" ;;
-	esac
-
-	if [ "$CROSS_BUILD" ]; then
-		msg_normal "Building host tblgen\n"
-		mkdir -p build/HOST
-		cd build/HOST
-		CC="$BUILD_CC" CXX="$BUILD_CXX" CFLAGS="$BUILD_CFLAGS" \
-			CXXFLAGS="$BUILD_CXXFLAGS" LDFLAGS="$BUILD_LDFLAGS" \
-			cmake ../.. -DCMAKE_BUILD_TYPE=Release
-		make ${makejobs} -C utils/TableGen
-		configure_args+=" -DLLVM_TABLEGEN=${wrksrc}/build/HOST/bin/llvm-tblgen"
-		cd ../..
-	fi
-
-	case "$XBPS_TARGET_MACHINE" in
-		i686*) _arch="X86";;
-		x86_64*) _arch="X86";;
-		armv5*) _arch="Armv5te";;
-		armv6*) _arch="Armv6";;
-		armv7*) _arch="Armv7";;
-		aarch64*) _arch="AArch64";;
-		mips*) _arch="Mips";;
-		ppc*) _arch="PowerPC";;
-	esac
-	configure_args+=" -DLLVM_TARGET_ARCH=${_arch}"
-	configure_args+=" -DLLVM_HOST_TRIPLE=${XBPS_CROSS_TRIPLET:-$XBPS_TRIPLET}"
-	configure_args+=" -DLLVM_DEFAULT_TARGET_TRIPLE=${XBPS_CROSS_TRIPLET:-$XBPS_TRIPLET}"
-}
-
-do_install() {
-	vlicense LICENSE.TXT
-
-	cd build
-	cmake -DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr -P cmake_install.cmake
-
-	# Fix permissions of static libs
-	chmod -x ${DESTDIR}/usr/lib/*.a
-
-	# Required for multilib.
-	if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
-		for _header in llvm-config; do
-			mv ${DESTDIR}/usr/include/llvm/Config/${_header}{,-64}.h
-			vinstall ${FILESDIR}/llvm-Config-${_header}.h 644 \
-				usr/include/llvm/Config ${_header}.h
-		done
-	fi
-
-	# Remove llvm-config-host in cross builds.
-	if [ "$CROSS_BUILD" ]; then
-		rm -f ${DESTDIR}/usr/bin/llvm-config-host
-	fi
-}
 
 libllvm10_package() {
 	short_desc+=" - runtime library"
-	pkg_install() {
-		vmove "usr/lib/libLLVM-*.so*"
-	}
 }
diff --git a/srcpkgs/llvm10/update b/srcpkgs/llvm10/update
deleted file mode 100644
index 3d09eaff3738..000000000000
--- a/srcpkgs/llvm10/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site=https://releases.llvm.org/
-pattern="'\K[\d\.]*(?=')"

From dc0bdac98d47bdd6861ed02a961fda9a229ad44c Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Wed, 7 Apr 2021 18:20:28 +0200
Subject: [PATCH 0628/2024] tdrop: update to 0.4.0.

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

diff --git a/srcpkgs/tdrop/template b/srcpkgs/tdrop/template
index 7b3e766dbc5e..d2e9668b03a1 100644
--- a/srcpkgs/tdrop/template
+++ b/srcpkgs/tdrop/template
@@ -1,14 +1,14 @@
 # Template file for 'tdrop'
 pkgname=tdrop
-version=0.3.0
-revision=2
+version=0.4.0
+revision=1
 depends="bash xdotool xprop xwininfo"
 short_desc="Turn terminal emulator or any program into dropdown window"
 maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://github.com/noctuid/tdrop"
 distfiles="https://github.com/noctuid/tdrop/archive/${version}.tar.gz"
-checksum=127467b5e5b8d0b973297fb2a84494e89c82f739dc2126867922635a8c0b7c9a
+checksum=ef4c644ad6c2c350b2e0f97ae2712e9871e13a6baef9065bcc1d8125eb073bb1
 
 do_install() {
 	vbin tdrop

From b9b5c10561b6ba938518d9e5a62b1f7def504c3a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 7 Apr 2021 17:33:32 +0200
Subject: [PATCH 0629/2024] x42-plugins: update to 20210407.

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

diff --git a/srcpkgs/x42-plugins/template b/srcpkgs/x42-plugins/template
index 001e3d36459b..259a5efa11c8 100644
--- a/srcpkgs/x42-plugins/template
+++ b/srcpkgs/x42-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'x42-plugins'
 pkgname=x42-plugins
-version=20210114
+version=20210407
 revision=1
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ maintainer="tibequadorian <tibequadorian@posteo.de>"
 license="GPL-2.0-or-later"
 homepage="https://x42-plugins.com"
 distfiles="https://gareus.org/misc/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=c54880fe4e596c8fd2918f1adb416cc91c2a3f1c4cb5e88574484517ff1ed8e0
+checksum=af27427a918aacc1e8792caeae0dbcd355dafeca0fff37b3a7f3e6f8364ae575
 
 pre_build() {
 	export OPTIMIZATIONS="-fomit-frame-pointer -O3 -fno-finite-math-only -DNDEBUG"

From 955da71fc875e10833de61dc1fba93f005fa800e Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Wed, 7 Apr 2021 09:18:18 +0200
Subject: [PATCH 0630/2024] google-chrome: update to 89.0.4389.114

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

diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template
index 113145b1f3b1..a9663b7e8949 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,5 +1,5 @@
 # Template file for 'google-chrome'
-_chromeVersion=89.0.4389.90
+_chromeVersion=89.0.4389.114
 _chromeRevision=1
 _channel=stable
 
@@ -22,7 +22,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=f38a1699e1707dd76edadc671d54922992ea4fd2705d79645679a6abe3e9f7c1
+checksum=0ab92895e8b1b93a8d2591e0f89b32554af2ffc5a6f2bf9c1860a4ecb7a78b1b
 
 do_extract() {
 	mkdir -p ${DESTDIR}

From 95e9bf95ef4ca3ca791e653be59bed35d0cc4923 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Wed, 7 Apr 2021 13:04:08 +0200
Subject: [PATCH 0631/2024] vscode: update to 1.55.0

---
 srcpkgs/vscode/patches/dont-download-ffmpeg.patch |  2 +-
 srcpkgs/vscode/patches/fix_dir.patch              | 14 +++++++-------
 srcpkgs/vscode/patches/gulp.patch                 |  2 +-
 srcpkgs/vscode/patches/product.patch              |  9 +++++----
 srcpkgs/vscode/template                           |  4 ++--
 5 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
index cb7993a59f0f..0f62f1b7e07a 100644
--- a/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
+++ b/srcpkgs/vscode/patches/dont-download-ffmpeg.patch
@@ -1,5 +1,5 @@
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index e3ca3514bb62..f9157b7cbc6c 100644
+index a06f3f63d89..67aa7c4a7aa 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
 @@ -285,7 +285,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
diff --git a/srcpkgs/vscode/patches/fix_dir.patch b/srcpkgs/vscode/patches/fix_dir.patch
index 8132ac7e28c4..f27e7c283047 100644
--- a/srcpkgs/vscode/patches/fix_dir.patch
+++ b/srcpkgs/vscode/patches/fix_dir.patch
@@ -1,18 +1,18 @@
 diff --git a/resources/linux/bin/code.sh b/resources/linux/bin/code.sh
-index 516c05e4ee08..bddc6f0cef22 100755
+index 06973937f14..78f72c9e9ed 100755
 --- a/resources/linux/bin/code.sh
 +++ b/resources/linux/bin/code.sh
-@@ -36,7 +36,7 @@ else
- 		VSCODE_PATH="$(dirname $(readlink -f $0))/.."
+@@ -44,7 +44,7 @@ else
+ 		VSCODE_PATH="$(dirname "$(readlink -f "$0")")/.."
  	else
  		# else use the standard install location
 -		VSCODE_PATH="/usr/share/@@NAME@@"
 +		VSCODE_PATH="/usr/lib/@@NAME@@"
  	fi
  fi
-
+ 
 diff --git a/resources/linux/code-url-handler.desktop b/resources/linux/code-url-handler.desktop
-index b85525fbd042..dc7617051b95 100644
+index b85525fbd04..bab6df4eeb5 100644
 --- a/resources/linux/code-url-handler.desktop
 +++ b/resources/linux/code-url-handler.desktop
 @@ -2,7 +2,7 @@
@@ -25,7 +25,7 @@ index b85525fbd042..dc7617051b95 100644
  Type=Application
  NoDisplay=true
 diff --git a/resources/linux/code.desktop b/resources/linux/code.desktop
-index b975e1094a2c..a094cc36e810 100644
+index 62d6bfc47b4..a014f6748d0 100755
 --- a/resources/linux/code.desktop
 +++ b/resources/linux/code.desktop
 @@ -2,7 +2,7 @@
@@ -38,7 +38,7 @@ index b975e1094a2c..a094cc36e810 100644
  Type=Application
  StartupNotify=false
 @@ -14,5 +14,5 @@ Keywords=vscode;
-
+ 
  [Desktop Action new-empty-window]
  Name=New Empty Window
 -Exec=@@EXEC@@ --no-sandbox --new-window %F
diff --git a/srcpkgs/vscode/patches/gulp.patch b/srcpkgs/vscode/patches/gulp.patch
index 0b11414bcc6d..7870591997c4 100644
--- a/srcpkgs/vscode/patches/gulp.patch
+++ b/srcpkgs/vscode/patches/gulp.patch
@@ -1,5 +1,5 @@
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index e3ca3514bb62..b0942f2b9b89 100644
+index a06f3f63d89..7bdca3af3fb 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
 @@ -273,7 +273,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
diff --git a/srcpkgs/vscode/patches/product.patch b/srcpkgs/vscode/patches/product.patch
index feb7f5891baa..eb7b91d8b977 100644
--- a/srcpkgs/vscode/patches/product.patch
+++ b/srcpkgs/vscode/patches/product.patch
@@ -1,8 +1,8 @@
 diff --git a/product.json b/product.json
-index 207bcf8f512e..572fbfb39b56 100644
+index 3facf29bc27..45e3fab95a7 100644
 --- a/product.json
 +++ b/product.json
-@@ -22,12 +22,20 @@
+@@ -22,6 +22,9 @@
  	"licenseFileName": "LICENSE.txt",
  	"reportIssueUrl": "https://github.com/microsoft/vscode/issues/new",
  	"urlProtocol": "code-oss",
@@ -12,8 +12,9 @@ index 207bcf8f512e..572fbfb39b56 100644
  	"extensionAllowedProposedApi": [
  		"ms-vscode.vscode-js-profile-flame",
  		"ms-vscode.vscode-js-profile-table",
- 		"ms-vscode.github-browser",
- 		"ms-vscode.github-richnav"
+@@ -30,6 +33,11 @@
+ 		"ms-vscode.remotehub",
+ 		"ms-vscode.remotehub-insiders"
  	],
 +	"extensionsGallery": {
 +		"serviceUrl": "https://marketplace.visualstudio.com/_apis/public/gallery",
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index ee7d308e8875..58a277841efa 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.54.3
+version=1.55.0
 revision=1
 _electronver=9.4.1
 hostmakedepends="pkg-config python nodejs yarn tar git"
@@ -11,7 +11,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=ea2cf3481b9a878aa5d4000289d238551d0ad4fe04ca2f3fea35bbe86026a369
+checksum=5a208d6cfaf35ea4d098c858faf2dff14092d74534c1b5966df87f1d5be24ef0
 patch_args="-Np1"
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then

From db8fbfdff9c08960c08537fb9c5aa07bcdb2838b Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 6 Apr 2021 22:51:07 +0300
Subject: [PATCH 0632/2024] kvantum: update to 0.19.0.

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

diff --git a/srcpkgs/kvantum/template b/srcpkgs/kvantum/template
index e8f6c43262ac..f38084dbe0e5 100644
--- a/srcpkgs/kvantum/template
+++ b/srcpkgs/kvantum/template
@@ -1,6 +1,6 @@
 # Template file for 'kvantum'
 pkgname=kvantum
-version=0.18.0
+version=0.19.0
 revision=1
 wrksrc="Kvantum-${version}"
 build_wrksrc=Kvantum
@@ -13,7 +13,7 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/tsujan/Kvantum"
 distfiles="https://github.com/tsujan/Kvantum/archive/V${version}.tar.gz"
-checksum=79752525b5636009385864373618e5e747a9fa7047af46d7815e27934c9a3dfd
+checksum=de5ce3229f9d61e9d10dd8070206a0418ca64a96cde9d38c3481a219a917fe8e
 nocross="https://build.voidlinux.org/builders/aarch64-musl_builder/builds/21436/steps/shell_3/logs/stdio"
 
 post_install() {

From 29de2bb5ebc7cb3f81e275deb3d1989ddee103aa Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Wed, 7 Apr 2021 14:16:43 +0300
Subject: [PATCH 0633/2024] docker-cli: fix completion file name

Fixes #30056
---
 srcpkgs/docker-cli/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index 88db6440de5e..c337e08b39fa 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'docker-cli'
 pkgname=docker-cli
 version=20.10.5
-revision=1
+revision=2
 wrksrc="cli-${version}"
 build_style=go
 go_package="github.com/docker/cli/cmd/docker"
@@ -24,9 +24,9 @@ pre_build() {
 }
 
 post_install() {
-	vcompletion contrib/completion/fish/docker.fish fish
-	vcompletion contrib/completion/zsh/_docker zsh
-	vcompletion contrib/completion/bash/docker bash
+	vcompletion contrib/completion/fish/docker.fish fish docker
+	vcompletion contrib/completion/zsh/_docker zsh docker
+	vcompletion contrib/completion/bash/docker bash docker
 }
 
 docker_package() {

From 5e54f3f3505cbfe42a388bd14254b6d28fcac1e1 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 6 Apr 2021 22:41:26 +0300
Subject: [PATCH 0634/2024] papirus-icon-theme: update to 20210401.

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

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

From d78ecb00d49322e138da24aeb6f41da56e6776c0 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 6 Apr 2021 21:44:14 +0300
Subject: [PATCH 0635/2024] bmake: update to 20210314.

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

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

From 5ac000da807b322c0509e7bb14e320fa47207f13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 5 Apr 2021 22:08:45 -0300
Subject: [PATCH 0636/2024] iwd: update to 1.13.

Fix iwd.config(5) patch to act on .rst file, not the pre-generated .5
file - the build system re-generates it and overrode our change.
---
 srcpkgs/iwd/patches/resolvconf-default.patch | 37 ++++++++++++--------
 srcpkgs/iwd/template                         |  4 +--
 2 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/srcpkgs/iwd/patches/resolvconf-default.patch b/srcpkgs/iwd/patches/resolvconf-default.patch
index 257615e7b92a..79731282a844 100644
--- a/srcpkgs/iwd/patches/resolvconf-default.patch
+++ b/srcpkgs/iwd/patches/resolvconf-default.patch
@@ -1,6 +1,6 @@
---- src/resolve.c	2020-09-05 09:43:41.000000000 +0200
-+++ -	2020-10-27 20:27:39.193991880 +0100
-@@ -554,7 +554,7 @@
+--- src/resolve.c
++++ src/resolve.c
+@@ -604,7 +604,7 @@ static int resolve_init(void)
  			l_warn("[General].dns_resolve_method is deprecated, "
  				"use [Network].NameResolvingService");
  		else /* Default to systemd-resolved service. */
@@ -9,14 +9,23 @@
  	}
  
  	for (i = 0; resolve_method_ops_list[i].name; i++) {
---- src/iwd.config.5	2020-09-05 09:47:11.000000000 +0200
-+++ -	2020-11-01 22:37:16.517573954 +0100
-@@ -198,7 +198,7 @@
- \fBEnableNetworkConfiguration\fP and provides the choice of system
- resolver integration.
- .sp
--If not specified, \fBsystemd\fP is used as default.
-+If not specified, \fBresolvconf\fP is used as default.
- T}
- _
- T{
+--- src/iwd.config.rst
++++ src/iwd.config.rst
+@@ -194,7 +194,7 @@ The group ``[Network]`` contains network configuration related settings.
+        by default.  This setting can also be overriden on a per-network basis.
+ 
+    * - NameResolvingService
+-     - Values: resolvconf, **systemd**
++     - Values: **resolvconf**, systemd
+ 
+        Configures a DNS resolution method used by the system.
+ 
+@@ -202,7 +202,7 @@ The group ``[Network]`` contains network configuration related settings.
+        ``EnableNetworkConfiguration`` and provides the choice of system
+        resolver integration.
+ 
+-       If not specified, ``systemd`` is used as default.
++       If not specified, ``resolvconf`` is used as default.
+ 
+    * - RoutePriorityOffset
+      - Values: uint32 value (default: **300**)
diff --git a/srcpkgs/iwd/template b/srcpkgs/iwd/template
index 3274f358eedc..32a44f3a0555 100644
--- a/srcpkgs/iwd/template
+++ b/srcpkgs/iwd/template
@@ -1,6 +1,6 @@
 # Template file for 'iwd'
 pkgname=iwd
-version=1.12
+version=1.13
 revision=1
 build_style=gnu-configure
 configure_args="--disable-systemd-service --enable-pie
@@ -15,7 +15,7 @@ license="LGPL-2.1-or-later"
 homepage="https://iwd.wiki.kernel.org/"
 changelog="https://git.kernel.org/pub/scm/network/wireless/iwd.git/plain/ChangeLog"
 distfiles="${KERNEL_SITE}/network/wireless/${pkgname}-${version}.tar.xz"
-checksum=4238c394d35ee6e99291009424d5530183aa5367c6f4f5349a95a56c5c94a211
+checksum=b005f7ed0f0a96a2c6181c44560fc868533a18e7034bd4cb43ea0d40c21b4e7a
 make_dirs="/var/lib/iwd 0600 root root
  /var/lib/ead 0600 root root
  /etc/iwd 755 root root"

From feceb0d17fc40e803bbdb1318eb1a9ac4e7e87df Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Tue, 6 Apr 2021 15:58:08 +0300
Subject: [PATCH 0637/2024] xf86-input-libinput: update to 1.0.0.

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

diff --git a/srcpkgs/xf86-input-libinput/template b/srcpkgs/xf86-input-libinput/template
index d53574df255c..e1eac94db45b 100644
--- a/srcpkgs/xf86-input-libinput/template
+++ b/srcpkgs/xf86-input-libinput/template
@@ -1,6 +1,6 @@
 # Template file for 'xf86-input-libinput'
 pkgname=xf86-input-libinput
-version=0.30.0
+version=1.0.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="MIT"
 homepage="https://xorg.freedesktop.org/"
 distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
-checksum=f9c7f9fd41ae14061e0e9c3bd45fa170e5e21027a2bc5810034e1e748db996c0
+checksum=ef55c2f66ae65da476c400205692ff77c9192bdc16fb3a285ea252267cf28a74
 lib32disabled=yes
 
 post_install() {

From a57f3b6a842282f7d5b412a147e60adf8d1cfd2e Mon Sep 17 00:00:00 2001
From: KawaiiAmber <japaneselearning101@gmail.com>
Date: Thu, 18 Mar 2021 12:28:43 -0600
Subject: [PATCH 0638/2024] gstreamer1: update to 1.18.4

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

diff --git a/srcpkgs/gstreamer1/template b/srcpkgs/gstreamer1/template
index 58a66eaf06b2..4e4f8aadb3bd 100644
--- a/srcpkgs/gstreamer1/template
+++ b/srcpkgs/gstreamer1/template
@@ -1,6 +1,6 @@
 # Template file for 'gstreamer1'
 pkgname=gstreamer1
-version=1.18.3
+version=1.18.4
 revision=1
 wrksrc="gstreamer-${version}"
 build_style=meson
@@ -18,7 +18,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/gstreamer/gstreamer-${version}.tar.xz"
-checksum=0c2e09e18f2df69a99b5cb3bd53c597b3cc2e35cf6c98043bb86a66f3d312100
+checksum=9aeec99b38e310817012aa2d1d76573b787af47f8a725a65b833880a094dfbc5
 
 pre_check() {
 	# gst_gstdatetime is known to fail according to LFS

From c9d9a30b0c4aca67b131c40e5403de07398351a9 Mon Sep 17 00:00:00 2001
From: KawaiiAmber <japaneselearning101@gmail.com>
Date: Thu, 18 Mar 2021 12:29:13 -0600
Subject: [PATCH 0639/2024] gst-libav: update to 1.18.4

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

diff --git a/srcpkgs/gst-libav/template b/srcpkgs/gst-libav/template
index bfb62ea021ec..33d4087442ab 100644
--- a/srcpkgs/gst-libav/template
+++ b/srcpkgs/gst-libav/template
@@ -1,6 +1,6 @@
 # Template file for 'gst-libav'
 pkgname=gst-libav
-version=1.18.3
+version=1.18.4
 revision=1
 wrksrc="${pkgname}-${version}"
 build_style=meson
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=ad20546bcd78ac1e7cf194666d73c4f33efeb62647d2b6af22993b540699e91c
+checksum=344a463badca216c2cef6ee36f9510c190862bdee48dc4591c0a430df7e8c396
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) # Required by musl for M_SQRT1_2

From e743c901ed3f3066030d1d2ace4a59e3746217cc Mon Sep 17 00:00:00 2001
From: KawaiiAmber <japaneselearning101@gmail.com>
Date: Thu, 18 Mar 2021 12:29:36 -0600
Subject: [PATCH 0640/2024] gst-omx: update to 1.18.4

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

diff --git a/srcpkgs/gst-omx/template b/srcpkgs/gst-omx/template
index 8646c3c87ae6..98dccd403932 100644
--- a/srcpkgs/gst-omx/template
+++ b/srcpkgs/gst-omx/template
@@ -1,6 +1,6 @@
 # Template file for 'gst-omx'
 pkgname=gst-omx
-version=1.18.3
+version=1.18.4
 revision=1
 build_style=meson
 configure_args="-Dexamples=disabled -Dtarget=generic"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=ed0f26504e9a60e15055134410f156e40952336410f2a59bdbbda45e61e8b93f
+checksum=e35051cf891eb2f31d6fcf176ff37d985f97f33874ac31b0b3ad3b5b95035043

From baf5ba4b5f799f7175f410b3a785a253ab1200ba Mon Sep 17 00:00:00 2001
From: KawaiiAmber <japaneselearning101@gmail.com>
Date: Thu, 18 Mar 2021 12:30:02 -0600
Subject: [PATCH 0641/2024] gst-plugins-bad1: update to 1.18.4

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

diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index f56e0b414b24..446eac2f4091 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,6 +1,6 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
-version=1.18.3
+version=1.18.4
 revision=2
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
@@ -36,7 +36,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz"
-checksum=b7e34b6b86272588fbd8b314dadfa6ceff895198cfb59e2950378e9e31ff22e0
+checksum=74e806bc5595b18c70e9ca93571e27e79dfb808e5d2e7967afa952b52e99c85f
 
 build_options="gir gme"
 build_options_default="gir"

From 0efcf6ad45f708fc7fc31daf6b0edd64bcbaf470 Mon Sep 17 00:00:00 2001
From: KawaiiAmber <japaneselearning101@gmail.com>
Date: Thu, 18 Mar 2021 12:30:23 -0600
Subject: [PATCH 0642/2024] gst-plugins-base1: update to 1.18.4

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

diff --git a/srcpkgs/gst-plugins-base1/template b/srcpkgs/gst-plugins-base1/template
index f5065d2ea036..050521f071c3 100644
--- a/srcpkgs/gst-plugins-base1/template
+++ b/srcpkgs/gst-plugins-base1/template
@@ -1,6 +1,6 @@
 # Template file for 'gst-plugins-base1'
 pkgname=gst-plugins-base1
-version=1.18.3
+version=1.18.4
 revision=1
 wrksrc="${pkgname/1/}-${version}"
 build_style=meson
@@ -22,7 +22,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz"
-checksum=dbfa20283848f0347a223dd8523dfb62e09e5220b21b1d157a8b0c8b67ba9f52
+checksum=29e53229a84d01d722f6f6db13087231cdf6113dd85c25746b9b58c3d68e8323
 
 build_options="cdparanoia gir sndio"
 build_options_default="cdparanoia gir"

From 9840c25b5ac8dadb6ba4af545a8d7b32bc5cc199 Mon Sep 17 00:00:00 2001
From: KawaiiAmber <japaneselearning101@gmail.com>
Date: Thu, 18 Mar 2021 12:30:44 -0600
Subject: [PATCH 0643/2024] gst-plugins-good1: update to 1.18.4

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

diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 0a5daa610ee2..8c97c1415191 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,6 +1,6 @@
 # Template file for 'gst-plugins-good1'
 pkgname=gst-plugins-good1
-version=1.18.3
+version=1.18.4
 revision=1
 wrksrc="${pkgname/1/}-${version}"
 build_style=meson
@@ -23,7 +23,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz"
-checksum=9b3b8e05d4d6073bf929fb33e2d8f74dd81ff21fa5b50c3273c78dfa2ab9c5cb
+checksum=b6e50e3a9bbcd56ee6ec71c33aa8332cc9c926b0c1fae995aac8b3040ebe39b0
 
 build_options="gtk3"
 build_options_default="gtk3"

From ee82f75bd3fd378aa1b1d806f96322a208b8534e Mon Sep 17 00:00:00 2001
From: KawaiiAmber <japaneselearning101@gmail.com>
Date: Thu, 18 Mar 2021 12:30:56 -0600
Subject: [PATCH 0644/2024] gst-plugins-ugly1: update to 1.18.4

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

diff --git a/srcpkgs/gst-plugins-ugly1/template b/srcpkgs/gst-plugins-ugly1/template
index c5622645e30e..9e403f826de0 100644
--- a/srcpkgs/gst-plugins-ugly1/template
+++ b/srcpkgs/gst-plugins-ugly1/template
@@ -1,6 +1,6 @@
 # Template file for 'gst-plugins-ugly1'
 pkgname=gst-plugins-ugly1
-version=1.18.3
+version=1.18.4
 revision=1
 wrksrc="${pkgname/1/}-${version}"
 build_style=meson
@@ -16,5 +16,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz"
-checksum=70f7429b25dd2f714eb18e80af61b1363b1f63019e16cd28e086e3a619eaa992
+checksum=218df0ce0d31e8ca9cdeb01a3b0c573172cc9c21bb3d41811c7820145623d13c
 lib32disabled=yes

From ce15b5ef0c708ff41dd852aaf79405fd68a00bb2 Mon Sep 17 00:00:00 2001
From: KawaiiAmber <japaneselearning101@gmail.com>
Date: Fri, 19 Mar 2021 21:51:59 -0600
Subject: [PATCH 0645/2024] gstreamer-vaapi: update to 1.18.4

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

diff --git a/srcpkgs/gstreamer-vaapi/template b/srcpkgs/gstreamer-vaapi/template
index cb0a2596d8c9..f4d271f8b37f 100644
--- a/srcpkgs/gstreamer-vaapi/template
+++ b/srcpkgs/gstreamer-vaapi/template
@@ -1,6 +1,6 @@
 # Template file for 'gstreamer-vaapi'
 pkgname=gstreamer-vaapi
-version=1.18.3
+version=1.18.4
 revision=1
 build_style=meson
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="LGPL-2.1-or-later"
 homepage="https://gstreamer.freedesktop.org"
 changelog="https://raw.githubusercontent.com/GStreamer/gstreamer-vaapi/master/ChangeLog"
 distfiles="${homepage}/src/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.xz"
-checksum=ae9877f15757a661d4dfe6a09755a2faa959ab60752f14ca26b7ff10765e1f12
+checksum=92db98af86f3150d429c9ab17e88d2364f9c07a140c8f445ed739e8f10252aea
 
 pre_check() {
 	# Seems to need certain hardware to pass

From bf5a15034f38d6f11d25ab2fa8c49f0867430d3f Mon Sep 17 00:00:00 2001
From: KawaiiAmber <japaneselearning101@gmail.com>
Date: Fri, 19 Mar 2021 21:54:27 -0600
Subject: [PATCH 0646/2024] gst1-editing-services: update to 1.18.4

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

diff --git a/srcpkgs/gst1-editing-services/template b/srcpkgs/gst1-editing-services/template
index 89be86fa2383..457dec0424cf 100644
--- a/srcpkgs/gst1-editing-services/template
+++ b/srcpkgs/gst1-editing-services/template
@@ -1,6 +1,6 @@
 # Template file for 'gst1-editing-services'
 pkgname=gst1-editing-services
-version=1.18.3
+version=1.18.4
 revision=1
 wrksrc="${pkgname/gst1/gst}-${version}"
 build_style=meson
@@ -13,7 +13,7 @@ maintainer="Toyam Cox <Vaelatern@gmail.com>"
 license="LGPL-2.0-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/${pkgname/gst1/gst}/${pkgname/gst1/gst}-${version}.tar.xz"
-checksum=8ae139b13b1646a20ba63b0b90877d35813e24cd87642d325e751fc7cb175e20
+checksum=4687b870a7de18aebf50f45ff572ad9e0138020e3479e02a6f056a0c4c7a1d04
 
 do_check() {
 	: # Tests fail in older versions as well

From 2cc78cedcb04f6a6a8bbee4c0009f174c46d4f87 Mon Sep 17 00:00:00 2001
From: KawaiiAmber <japaneselearning101@gmail.com>
Date: Fri, 19 Mar 2021 21:56:13 -0600
Subject: [PATCH 0647/2024] gst1-python3: update to 1.18.4

Closes: #29558 [via git-merge-pr]
---
 srcpkgs/gst1-python3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gst1-python3/template b/srcpkgs/gst1-python3/template
index 8232e307b805..25bde3b7c46d 100644
--- a/srcpkgs/gst1-python3/template
+++ b/srcpkgs/gst1-python3/template
@@ -1,6 +1,6 @@
 # Template file for 'gst1-python3'
 pkgname=gst1-python3
-version=1.18.3
+version=1.18.4
 revision=1
 wrksrc="gst-python-${version}"
 build_style=meson
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/gst-python/gst-python-${version}.tar.xz"
-checksum=4e630735276e08ff4d70337aa5d91fd008e5f1ed3dc0993674cd5820e264259a
+checksum=cb68e08a7e825e08b83a12a22dcd6e4f1b328a7b02a7ac84f42f68f4ddc7098e

From 9507fcfd58e47b4366b895284dbd464011caa402 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 7 Apr 2021 20:39:08 +0200
Subject: [PATCH 0648/2024] elixir: update to 1.11.4.

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

diff --git a/srcpkgs/elixir/template b/srcpkgs/elixir/template
index 235e09288171..a02cf881b7ab 100644
--- a/srcpkgs/elixir/template
+++ b/srcpkgs/elixir/template
@@ -1,6 +1,6 @@
 # Template file for 'elixir'
 pkgname=elixir
-version=1.11.3
+version=1.11.4
 revision=1
 build_style=gnu-makefile
 make_check_target="test"
@@ -13,4 +13,4 @@ license="Apache-2.0"
 homepage="http://elixir-lang.org/"
 changelog="https://raw.githubusercontent.com/elixir-lang/elixir/v${version%.*}/CHANGELOG.md"
 distfiles="https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz"
-checksum=d961305e893f4fe1a177fa00233762c34598bc62ff88b32dcee8af27e36f0564
+checksum=85c7118a0db6007507313db5bddf370216d9394ed7911fe80f21e2fbf7f54d29

From e6172453baf8158e450981e54b65897a4fd8bd68 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 01:23:07 -0700
Subject: [PATCH 0649/2024] binfmt-support: fix license

Closes: #29802 [via git-merge-pr]
---
 srcpkgs/binfmt-support/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/binfmt-support/template b/srcpkgs/binfmt-support/template
index 4208b1969b05..252d05051cd3 100644
--- a/srcpkgs/binfmt-support/template
+++ b/srcpkgs/binfmt-support/template
@@ -1,13 +1,13 @@
 # Template file for 'binfmt-support'
 pkgname=binfmt-support
 version=2.2.1
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libpipeline-devel"
 short_desc="Register interpreters for various binary formats"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="GPL-3"
+license="GPL-2.0-or-later"
 homepage="http://packages.debian.org/en/sid/binfmt-support"
 distfiles="${DEBIAN_SITE}/main/b/binfmt-support/binfmt-support_$version.orig.tar.gz"
 checksum=9c9da3306501a834663ccd14023fc8d29bd08a34df74585e11f97735ea1fb31d

From e74a41464b1bfc7d0b35ec15b56e7dd30bc50d28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Wed, 7 Apr 2021 21:10:21 +0200
Subject: [PATCH 0650/2024] youtube-dl: update to 2021.04.07.

---
 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 de8650f38273..3c140d865306 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.04.01
+version=2021.04.07
 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=f098ef95933a33096f60cb8c3bfbde710f6f84c9cad1b093082584bdc4a089ef
+checksum=f5080aa885672628d63f4a3e0ff0976437b4ff2caef91321fc23cbf60c0da509
 
 do_check() {
 	PYTHON=/usr/bin/python3 make offlinetest

From 6fc63fd7d0cd0b25f78cac3d1ef3219323d8775e Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Wed, 7 Apr 2021 21:12:01 +0200
Subject: [PATCH 0651/2024] python3-pikepdf: update to 2.11.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 79b00fa25b28..5563037b0be2 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.10.0
+version=2.11.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=7a804515942049f846d548d3b817317f8136e06938737ff64b79c82d61908e27
+checksum=53bf432be00fcb2f2a56c44b64c1b75e4c8f9fe0dcc97721319c53939fed8047
 
 pre_build() {
 	vsed -i "s/__version__.*/__version__ = '${version}'/g" setup.py

From 5ccb5088467860defd919a8f530afc134495c688 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 31 Mar 2021 00:19:13 -0300
Subject: [PATCH 0652/2024] Manual: add 80 column line break suggestion.

Also:
- rework most of the language in the Introduction
- move note about special characters in pkgname or version
- note restrictions to version field are caused partly by xbps-checkvers
- fix indentation of 'maintainer' item
---
 Manual.md | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/Manual.md b/Manual.md
index 4439865e1d73..8c2afbaca71d 100644
--- a/Manual.md
+++ b/Manual.md
@@ -76,17 +76,19 @@ packages for XBPS, the `Void Linux` native packaging system.
 <a id="Introduction"></a>
 ## Introduction
 
-The `void-packages` repository contains all `source` packages that are the
-recipes to download, compile and build binary packages for `Void`.
-Those `source` package files are called `templates`.
+The `void-packages` repository contains all the
+recipes to download, compile and build binary packages for Void Linux.
+These `source` package files are called `templates`.
 
-The `template files` are `GNU bash` shell scripts that must define some required/optional
-`variables` and `functions` that are processed by `xbps-src` (the package builder)
-to generate the resulting binary packages.
+The `template` files are shell scripts that define `variables` and `functions`
+to be processed by `xbps-src`, the package builder, to generate binary packages.
+The shell used by `xbps-src` is GNU bash; `xbps-src` doesn't aim to be
+compatible with POSIX `sh`.
 
-By convention, all templates start with a comment briefly explaining what they
-are. In addition, pkgname and version can't have any characters in them that
-would require them to be quoted, so they are not quoted.
+By convention, all templates start with a comment saying that it is a
+`template file` for a certain package. Most of the lines should be kept under 80
+columns; variables that list many values can be split into new lines, with the
+continuation in the next line indented by one space.
 
 A simple `template` example is as follows:
 
@@ -447,10 +449,9 @@ Multiple licenses should be separated by commas, Example: `GPL-3.0-or-later, cus
   Note: `MIT`, `BSD`, `ISC` and custom licenses
   require the license file to be supplied with the binary package.
 
-- `maintainer` A string in the form of `name <user@domain>`.  The
-  email for this field must be a valid email that you can be reached
-  at.  Packages using `users.noreply.github.com` emails will not be
-  accepted.
+- `maintainer` A string in the form of `name <user@domain>`.  The email for this field
+must be a valid email that you can be reached at. Packages using
+`users.noreply.github.com` emails will not be accepted.
 
 - `pkgname` A string with the package name, matching `srcpkgs/<pkgname>`.
 
@@ -461,7 +462,12 @@ the generated `binary packages` have been modified.
 - `short_desc` A string with a brief description for this package. Max 72 chars.
 
 - `version` A string with the package version. Must not contain dashes or underscore
-and at least one digit is required. Shell's variable substition usage is not allowed.
+and at least one digit is required. Using bash's pattern substitution and prefix and
+suffix matching isn't supported, since this field needs to be parsed by
+`xbps-checkvers(1)`. Using variables in this field should be avoided.
+
+Neither `pkgname` or `version` should contain special characters which make it
+necessary to quote them, so they shouldn't be quoted in the template.
 
 <a id="optional_vars"></a>
 #### Optional variables

From 4f405566c4ada57dd761b927354c1ada31ff6c2d Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 6 Apr 2021 14:55:26 -0500
Subject: [PATCH 0653/2024] evtx: update to 0.7.2.

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

diff --git a/srcpkgs/evtx/template b/srcpkgs/evtx/template
index 9649e2f234da..905059bd1d28 100644
--- a/srcpkgs/evtx/template
+++ b/srcpkgs/evtx/template
@@ -1,6 +1,6 @@
 # Template file for 'evtx'
 pkgname=evtx
-version=0.7.1
+version=0.7.2
 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=ef4a543fb2d4ecad44d2a6229934f0723dc3cab9a3b4580f72227e6abef93fee
+checksum=31967e3b175a7e0ad4a5d786418066bde66d5ddd4d48626312f59f5081c61ca6

From 2f0fb9908439c93c7b3644f58302db0fe79b2b60 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 7 Apr 2021 19:46:21 -0500
Subject: [PATCH 0654/2024] sqlmap: update to 1.5.4.

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

diff --git a/srcpkgs/sqlmap/template b/srcpkgs/sqlmap/template
index 3bb7fbfdb6aa..a1cbfdedfaa5 100644
--- a/srcpkgs/sqlmap/template
+++ b/srcpkgs/sqlmap/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlmap'
 pkgname=sqlmap
-version=1.5.3
+version=1.5.4
 revision=1
 pycompile_dirs="usr/share/sqlmap"
 depends="python3"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://sqlmap.org"
 distfiles="https://github.com/sqlmapproject/sqlmap/archive/${version}.tar.gz"
-checksum=5cdd29b4a86913962ab1eecc1f59bd32a038d1573f70edb1760bf88f01347526
+checksum=5b86671338102e6f48761b2edd6b7b9db8280cdb788ca531df612ea7654d6743
 python_version=3
 
 do_install() {

From 03e8b5b68ddc2e3cb9beddd413a83713cfd59351 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 8 Apr 2021 02:48:58 +0200
Subject: [PATCH 0655/2024] wire-desktop: cba to find workarounds for this
 build system

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

diff --git a/srcpkgs/wire-desktop/template b/srcpkgs/wire-desktop/template
index 27054cc542d7..bfdda89383b7 100644
--- a/srcpkgs/wire-desktop/template
+++ b/srcpkgs/wire-desktop/template
@@ -12,6 +12,11 @@ homepage="https://wire.com"
 distfiles="https://github.com/wireapp/wire-desktop/archive/linux/${version}.tar.gz"
 checksum=69e70d39286f29b2fb186da30ec828be0a30329c457e829111b863223ed64127
 
+case "$XBPS_MACHINE" in
+	x86_64*|i686*) ;;
+	*) broken="oof" ;;
+esac
+
 pre_build() {
 	yarn
 }

From 6eff3db004156f3e327b6ce892f0aa69b4718881 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Apr 2021 20:24:21 -0400
Subject: [PATCH 0656/2024] cpp-utilities: update to 5.10.2.

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

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

From 5e2920208dd7f285a1f832f7a27aed84b963e6cf Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Apr 2021 20:26:00 -0400
Subject: [PATCH 0657/2024] qtutilities: update to 6.4.0.

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

diff --git a/srcpkgs/qtutilities/template b/srcpkgs/qtutilities/template
index 730bc3bc601f..e52be5259eaa 100644
--- a/srcpkgs/qtutilities/template
+++ b/srcpkgs/qtutilities/template
@@ -1,6 +1,6 @@
 # Template file for 'qtutilities'
 pkgname=qtutilities
-version=6.3.3
+version=6.4.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/qtutilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=7f9054cdabdbf6e0afd7f27ae8ced59121349b5fcf15ce2638b5aa852d46ab4a
+checksum=c6c06a4e6648529e34e7f9bd12058d74b5e28ad755f99213dfd7d551b630ed70
 
 qtutilities-devel_package() {
 	short_desc+=" - development files"

From 60a589cd6a6d347b423aba1cbeb978aa9f70d37e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Apr 2021 20:32:23 -0400
Subject: [PATCH 0658/2024] python3-hypothesis: update to 6.8.9.

---
 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 3b6a52476d8d..4f80d7b05c89 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.5
+version=6.8.9
 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=8282c734fe29f8fc5c478e7880aa26470997fcd73cb3f96d0ecd47ab19786947
+checksum=41147c391beab58898eb11296f3edc5d1b5dc7d58041f1bc3517e1d59414cbef
 
 do_check() {
 	# Manually run the tests that tox considers part of the "full" suite,

From 8e21a961077d593608f17a2efe9c47a30072c1a3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Apr 2021 20:33:13 -0400
Subject: [PATCH 0659/2024] python3-bokeh: update to 2.3.1.

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

diff --git a/srcpkgs/python3-bokeh/template b/srcpkgs/python3-bokeh/template
index 06b57a615c52..92762b7e9f05 100644
--- a/srcpkgs/python3-bokeh/template
+++ b/srcpkgs/python3-bokeh/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-bokeh'
 pkgname=python3-bokeh
-version=2.3.0
+version=2.3.1
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
@@ -15,7 +15,7 @@ license="BSD-3-Clause"
 homepage="https://bokeh.org"
 changelog="https://raw.githubusercontent.com/bokeh/bokeh/main/CHANGELOG"
 distfiles="${PYPI_SITE}/b/bokeh/bokeh-${version}.tar.gz"
-checksum=dd417708f90702190222b1068a645acae99e66d4b58d7a336d545aeaa04e9b40
+checksum=2f2fb8bab8ca8fa039f48b1f0bed56d3a847c75694ece1d206ffab645ff5beec
 
 do_check() {
 	echo "Tests have unpackaged dependencies and require fetching data; skipping"

From fbde1529b26192e98e625327bb820ea71b0301ff Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Apr 2021 20:42:54 -0400
Subject: [PATCH 0660/2024] grpc: update to 1.37.0.

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

diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index 97014392bc9f..8432151b47d7 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,6 +1,6 @@
 # Template file for 'grpc'
 pkgname=grpc
-version=1.36.4
+version=1.37.0
 revision=1
 _abseilver=6f9d96a1f41439ac172ee2ef7ccd8edf0e5d068c
 build_style=cmake
@@ -18,7 +18,7 @@ license="Apache-2.0"
 homepage="https://github.com/grpc/grpc"
 distfiles="${homepage}/archive/v${version}/${pkgname}-${version}.tar.gz
  https://github.com/abseil/abseil-cpp/archive/${_abseilver}/abseil-cpp-${_abseilver}.tar.gz"
-checksum="8eb9d86649c4d4a7df790226df28f081b97a62bf12c5c5fe9b5d31a29cd6541a
+checksum="c2dc8e876ea12052d6dd16704492fd8921df8c6d38c70c4708da332cf116df22
  62c27e7a633e965a2f40ff16b487c3b778eae440bab64cad83b34ef1cbe3aa93"
 
 if [ "$CROSS_BUILD" ]; then

From 2b18ece9d28413e911426f35d754bed17c3cb933 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Apr 2021 20:45:24 -0400
Subject: [PATCH 0661/2024] python3-grpcio: update to 1.37.0.

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

diff --git a/srcpkgs/python3-grpcio/template b/srcpkgs/python3-grpcio/template
index 41815f9c5c16..2a71470d9e4c 100644
--- a/srcpkgs/python3-grpcio/template
+++ b/srcpkgs/python3-grpcio/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-grpcio'
 pkgname=python3-grpcio
-version=1.36.1
+version=1.37.0
 revision=1
 archs="x86_64* i686* aarch64* armv[67]* ppc64le*"
 wrksrc="${pkgname#*-}-${version}"
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Apache-2.0"
 homepage="https://grpc.io"
 distfiles="${PYPI_SITE}/g/grpcio/grpcio-${version}.tar.gz"
-checksum=a66ea59b20f3669df0f0c6a3bd57b985e5b2d1dcf3e4c29819bb8dc232d0fd38
+checksum=b3ce16aa91569760fdabd77ca901b2288152eb16941d28edd9a3a75a0c4a8a85
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 65338896d971cdc3f09b4221ab2efe4c8d86348b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Apr 2021 21:09:14 -0400
Subject: [PATCH 0662/2024] python3-grpcio-tools: update to 1.37.0.

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

diff --git a/srcpkgs/python3-grpcio-tools/template b/srcpkgs/python3-grpcio-tools/template
index f03ea0368c4b..a23ba5554e78 100644
--- a/srcpkgs/python3-grpcio-tools/template
+++ b/srcpkgs/python3-grpcio-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-grpcio-tools'
 pkgname=python3-grpcio-tools
-version=1.36.1
+version=1.37.0
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Apache-2.0"
 homepage="https://grpc.io"
 distfiles="${PYPI_SITE}/g/grpcio-tools/grpcio-tools-${version}.tar.gz"
-checksum=80ef584f7b917f575e4b8f2ec59cd4a4d98c2046e801a735f3136b05742a36a6
+checksum=3ec510c1b6bfc32effc639acf9a055e72dab7a7b6757bf72f2132790d6a7cf1c
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 7e075f5662d9e0e2dd65f9214910d405ecaed103 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 3 Apr 2021 00:16:17 -0400
Subject: [PATCH 0663/2024] crun: update to 0.19.

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

diff --git a/srcpkgs/crun/template b/srcpkgs/crun/template
index e5415d3ee104..1f364f7fb58d 100644
--- a/srcpkgs/crun/template
+++ b/srcpkgs/crun/template
@@ -1,7 +1,7 @@
 # Template file for 'crun'
 pkgname=crun
-version=0.16
-revision=2
+version=0.19
+revision=1
 build_style=gnu-configure
 configure_args="--disable-systemd"
 hostmakedepends="pkg-config libtool python3 $(vopt_if man go-md2man)"
@@ -11,7 +11,7 @@ maintainer="Imran Khan <imrankhan@teknik.io>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/containers/crun"
 distfiles="https://github.com/containers/crun/releases/download/${version}/crun-${version}.tar.gz"
-checksum=fba02fe03dbb83570d4d00e0268e6c3b8ff5e7472e24c183ed8644ea208336dc
+checksum=8065b73ae37ccfb960915fa10051e2bf27850d1c2c69ffeb9eec17c6f198d1c9
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" argp-standalone"

From b6e2922d96884e70fbd05e35502bcd1549272124 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 3 Apr 2021 00:17:17 -0400
Subject: [PATCH 0664/2024] buildah: update to 1.20.0.

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

diff --git a/srcpkgs/buildah/template b/srcpkgs/buildah/template
index 86c7a21de131..16dcc457297c 100644
--- a/srcpkgs/buildah/template
+++ b/srcpkgs/buildah/template
@@ -1,6 +1,6 @@
 # Template file for 'buildah'
 pkgname=buildah
-version=1.19.6
+version=1.20.0
 revision=1
 build_style=go
 go_import_path=github.com/containers/buildah
@@ -16,7 +16,7 @@ license="Apache-2.0"
 homepage="https://github.com/containers/buildah"
 changelog="https://github.com/containers/buildah/blob/master/CHANGELOG.md"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=4f2e737521691abddfff7eaf6d7a7137db019c842de61d68054ccc2a6587c2fd
+checksum=6af8fd6ad6fdb515f4f806105c8fe3e4ceda63eaea6e33e3c7ac7b272fe61797
 
 post_build() {
 	make -C docs GOMD2MAN=go-md2man

From a21681cfe7d0a4befaeab50454fb798bb37c25e3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 3 Apr 2021 00:26:52 -0400
Subject: [PATCH 0665/2024] podman: update to 3.1.0.

---
 srcpkgs/podman/INSTALL.msg | 14 ++++----------
 srcpkgs/podman/template    |  8 ++++----
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/podman/INSTALL.msg b/srcpkgs/podman/INSTALL.msg
index 6d69c9281eb5..d9090de158e7 100644
--- a/srcpkgs/podman/INSTALL.msg
+++ b/srcpkgs/podman/INSTALL.msg
@@ -1,21 +1,15 @@
 `fuse-overlayfs` has been added as a runtime dependency to podman.
 podman will now prefer this storage driver to the `vfs` fallback driver.
+If you have existing containers that rely on the `vfs` driver, podman
+will display an error and refuse any further operation.
 
 To switch to the new storage driver, podman has to be reset:
 
     # podman system reset
 
-To keep the `vfs` driver, add this to `/etc/containers/storage.conf`
-or `~/.config/containers/storage.conf`:
+To instead keep using the `vfs` driver, add
 
     [storage]
     driver="vfs"
 
-Otherwise podman will display an error and refuse any further operation.
-
-Additionally the `btrfs` storage driver has been enabled. This driver is also
-available for rootless operation. Reset podman and add the following to your
-`storage.conf` to switch to this driver:
-
-    [storage]
-    driver="btrfs"
+to `/etc/containers/storage.conf` or `~/.config/containers/storage.conf`.
diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index ce8b655a444d..a875fdc013a9 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,9 +1,9 @@
 # Template file for 'podman'
 pkgname=podman
-version=3.0.1
-revision=3
+version=3.1.0
+revision=1
 build_style=go
-go_import_path="github.com/containers/podman/v2"
+go_import_path="github.com/containers/podman/v3"
 go_package="${go_import_path}/cmd/podman"
 go_build_tags="seccomp apparmor containers_image_ostree_stub"
 hostmakedepends="pkg-config go-md2man"
@@ -14,7 +14,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://podman.io/"
 distfiles="https://github.com/containers/libpod/archive/v${version}.tar.gz"
-checksum=259e682d6e90595573fe8880e0252cc8b08c813e19408b911c43383a6edd6852
+checksum=60031aa620cbfab641ffef9cb4e68240a0383c23ffd0276938684e98794bb5db
 
 if [ "$CROSS_BUILD" ]; then
 	go_build_tags+=" containers_image_openpgp"

From e47ef6522cba2f0db49f3ddb3ffd8733107d84c2 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Thu, 8 Apr 2021 09:24:17 +1000
Subject: [PATCH 0666/2024] libnpupnp: update to 4.1.2

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

diff --git a/srcpkgs/libnpupnp/template b/srcpkgs/libnpupnp/template
index 62df18fd7ebe..d709bb6c8632 100644
--- a/srcpkgs/libnpupnp/template
+++ b/srcpkgs/libnpupnp/template
@@ -1,6 +1,6 @@
 # Template file for 'libnpupnp'
 pkgname=libnpupnp
-version=4.1.1
+version=4.1.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="amak <amak.git@outlook.com>"
 license="BSD-3-Clause"
 homepage="https://www.lesbonscomptes.com/upmpdcli/npupnp-doc/libnpupnp.html"
 distfiles="https://www.lesbonscomptes.com/upmpdcli/downloads/libnpupnp-${version}.tar.gz"
-checksum=7e41d3933b956073b33c6ac6e61c81e83b428015ee871fd16d18b198bf3be960
+checksum=8b59b730b39daeb46ad89021d7fbfe7c5a2a71cd0f85bb537d593c8a82746981
 
 post_install() {
 	vlicense COPYING

From 264c47ba6d46c574ac3f5bd916d013fa604b9a3f Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Wed, 7 Apr 2021 18:55:13 +0200
Subject: [PATCH 0667/2024] osm2pgsql: update to 1.4.2.

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

diff --git a/srcpkgs/osm2pgsql/template b/srcpkgs/osm2pgsql/template
index 56b9dfe075e0..d4aae84f375d 100644
--- a/srcpkgs/osm2pgsql/template
+++ b/srcpkgs/osm2pgsql/template
@@ -1,6 +1,6 @@
 # Template file for 'osm2pgsql'
 pkgname=osm2pgsql
-version=1.4.1
+version=1.4.2
 revision=1
 build_style=cmake
 hostmakedepends="boost python3 python3-psycopg2"
@@ -11,4 +11,4 @@ maintainer="Nýx <n.y.x@bluewin.ch>"
 license="GPL-3.0-or-later"
 homepage="https://osm2pgsql.org"
 distfiles="https://github.com/openstreetmap/${pkgname}/archive/${version}.tar.gz"
-checksum=33c4817dceed99764b089ead0e8e2f67c4c6675e761772339b635800970e66e2
+checksum=fc68283930ccd468ed9b28685150741b16083fec86800a4b011884ae22eb061c

From cd95722b6b137c452edceab3b560fa7f2634d702 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 8 Apr 2021 00:03:37 -0400
Subject: [PATCH 0668/2024] Revert "grpc: update to 1.37.0."

The header grpcpp/impl/codegen/sync.h introduces an dependency on the
abseil header absl/synchronization/mutex.h, but grpc does not install
the abseil headers. Reverting back to v1.36 pending upstream resolution
or a suitable workaround is apparent.

This reverts commit fbe8cadae46ef3ab297a9b93eb14757be9576abe.
---
 srcpkgs/grpc/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index 8432151b47d7..7fbee33ef1c3 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,7 +1,8 @@
 # Template file for 'grpc'
 pkgname=grpc
-version=1.37.0
-revision=1
+reverts="1.37.0_1"
+version=1.36.4
+revision=2
 _abseilver=6f9d96a1f41439ac172ee2ef7ccd8edf0e5d068c
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON
@@ -18,7 +19,7 @@ license="Apache-2.0"
 homepage="https://github.com/grpc/grpc"
 distfiles="${homepage}/archive/v${version}/${pkgname}-${version}.tar.gz
  https://github.com/abseil/abseil-cpp/archive/${_abseilver}/abseil-cpp-${_abseilver}.tar.gz"
-checksum="c2dc8e876ea12052d6dd16704492fd8921df8c6d38c70c4708da332cf116df22
+checksum="8eb9d86649c4d4a7df790226df28f081b97a62bf12c5c5fe9b5d31a29cd6541a
  62c27e7a633e965a2f40ff16b487c3b778eae440bab64cad83b34ef1cbe3aa93"
 
 if [ "$CROSS_BUILD" ]; then

From a2fb49f571a3569734aaa3f5a30d80bfa9f92082 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 7 Apr 2021 19:33:04 -0500
Subject: [PATCH 0669/2024] solarus: update to 1.6.5.

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

diff --git a/srcpkgs/solarus/template b/srcpkgs/solarus/template
index a196b49e3b2a..e32114af3b9a 100644
--- a/srcpkgs/solarus/template
+++ b/srcpkgs/solarus/template
@@ -1,6 +1,6 @@
 # Template file for 'solarus'
 pkgname=solarus
-version=1.6.4
+version=1.6.5
 revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=cmake
@@ -13,7 +13,8 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="http://www.solarus-games.org/"
 distfiles="https://gitlab.com/solarus-games/solarus/-/archive/v${version}/solarus-v${version}.tar.bz2"
-checksum=b2e00a7df8953903ba022a8f392038e86f675cee714da19cf9a5f8535c42f349
+checksum=4b4ac59df8ab63ee2e305cbf48118d6be0cf9665968eb0b06dd1acdf4346516f
+make_check=extended
 
 solarus-devel_package() {
 	short_desc+=" - development files"

From 6988edc282a7c4691b8b52680ee9809f24a60c50 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 7 Apr 2021 19:33:11 -0500
Subject: [PATCH 0670/2024] solarus-quest-editor: update to 1.6.5.

---
 .../patches/QPainterPath.patch                | 30 -------------------
 srcpkgs/solarus-quest-editor/template         |  4 +--
 2 files changed, 2 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/solarus-quest-editor/patches/QPainterPath.patch

diff --git a/srcpkgs/solarus-quest-editor/patches/QPainterPath.patch b/srcpkgs/solarus-quest-editor/patches/QPainterPath.patch
deleted file mode 100644
index cd0eb6820a53..000000000000
--- a/srcpkgs/solarus-quest-editor/patches/QPainterPath.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- src/entities/jumper.cpp	2020-04-12 16:47:30.000000000 +0200
-+++ src/entities/jumper.cpp	2020-09-01 17:25:02.763555586 +0200
-@@ -17,6 +17,7 @@
- #include "entities/jumper.h"
- #include "map_model.h"
- #include <QPainter>
-+#include <QPainterPath>
- 
- namespace SolarusEditor {
- 
---- src/widgets/map_view.cpp	2020-04-12 16:47:30.000000000 +0200
-+++ src/widgets/map_view.cpp	2020-09-01 17:24:53.307555099 +0200
-@@ -39,6 +39,7 @@
- #include <QMenu>
- #include <QMouseEvent>
- #include <QScrollBar>
-+#include <QPainterPath>
- #include <QtMath>
- 
- namespace SolarusEditor {
---- src/widgets/tileset_view.cpp	2020-04-12 16:47:30.000000000 +0200
-+++ src/widgets/tileset_view.cpp	2020-09-01 17:24:38.430554331 +0200
-@@ -33,6 +33,7 @@
- #include <QMenu>
- #include <QMimeData>
- #include <QMouseEvent>
-+#include <QPainterPath>
- #include <QScrollBar>
- 
- namespace SolarusEditor {
diff --git a/srcpkgs/solarus-quest-editor/template b/srcpkgs/solarus-quest-editor/template
index 852254040a9b..d10243bd5896 100644
--- a/srcpkgs/solarus-quest-editor/template
+++ b/srcpkgs/solarus-quest-editor/template
@@ -1,6 +1,6 @@
 # Template file for 'solarus-quest-editor'
 pkgname=solarus-quest-editor
-version=1.6.4
+version=1.6.5
 revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=cmake
@@ -13,4 +13,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="http://www.solarus-games.org"
 distfiles="https://gitlab.com/solarus-games/${pkgname}/-/archive/v${version}/${pkgname}-v${version}.tar.bz2"
-checksum=2794e6bcfd865b34ff2962518398d24876a164fe0837d03f1a3614fb38810f8f
+checksum=d556e5b02c943953beaf1bf1c42c3c7ce02ed5c1821789c47afdc3aed715540d

From 0d1d49bb01de2065c4342d03f8af8d3e4155cb57 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 8 Apr 2021 08:26:29 +0200
Subject: [PATCH 0671/2024] wine: remove templateo file commited by mistake

---
 srcpkgs/wine/templateo | 158 -----------------------------------------
 1 file changed, 158 deletions(-)
 delete mode 100644 srcpkgs/wine/templateo

diff --git a/srcpkgs/wine/templateo b/srcpkgs/wine/templateo
deleted file mode 100644
index 71061a25eb8e..000000000000
--- a/srcpkgs/wine/templateo
+++ /dev/null
@@ -1,158 +0,0 @@
-# Template file for 'wine'
-pkgname=wine
-version=6.4
-revision=1
-_pkgver=${version/r/-r}
-create_wrksrc=yes
-build_wrksrc=wine-${_pkgver}
-build_style=gnu-configure
-configure_args="--bindir=/usr/libexec/wine"
-short_desc="Run Microsoft Windows applications"
-maintainer="Helmut Pozimski <helmut@pozimski.eu>"
-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="682a77c1fd12f56347ca2080d85fe17def1b655d3241d94582f87591d9d0cc3b
- c490127b2bbbe326923ad32a5b730dc4d7541a07085a9553929b64b52a556c58"
-
-build_options="mingw staging"
-build_options_default="mingw"
-desc_option_mingw="Use the MinGW cross compiler to build WinPE DLLs"
-desc_option_staging="Apply the wine-staging patchset"
-
-lib32mode=full
-archs="i686* x86_64*"
-
-_nopie=no
-if [ "$XBPS_TARGET_MACHINE" = i686-musl ]; then
-	# build system adds -fno-PIC for 32bit builds, which,
-	# coupled with our default pie toolchain, leads to textrels
-	# in the final binary; musl doesn't support those
-	_nopie=yes
-fi
-
-hostmakedepends="pkg-config flex gettext
- $(vopt_if mingw "cross-${XBPS_TARGET_MACHINE%-musl}-w64-mingw32")
- $(vopt_if staging 'autoconf')"
-makedepends="gettext-devel lcms2-devel zlib-devel ncurses-devel
- glu-devel libSM-devel libXext-devel libX11-devel libXpm-devel
- libXinerama-devel libXcomposite-devel libXmu-devel libXxf86vm-devel
- libXcursor-devel libXrandr-devel libXdamage-devel libXi-devel
- libldap-devel alsa-lib-devel libgphoto2-devel libxml2-devel
- libxslt-devel glib-devel freetype-devel pulseaudio-devel
- mpg123-devel libgsm-devel libopenal-devel giflib-devel libpng-devel
- v4l-utils-devel fontconfig-devel gnutls-devel dbus-devel sane-devel
- libpcap-devel cups-devel ocl-icd-devel vulkan-loader vkd3d-devel
- FAudio-devel gst-plugins-base1-devel"
-depends="libXi libXinerama libXcomposite libXcursor libOSMesa
- desktop-file-utils hicolor-icon-theme liberation-fonts-ttf
- gnutls wine-common>=${version}_${revision} libwine>=${version}_${revision}"
-make_check=extended
-
-case $XBPS_TARGET_MACHINE in
-	x86_64*) configure_args+=" --enable-win64 --libdir=/usr/lib"
-		_wine_suffix="64"
-		_wineserver_suffix=${_wine_suffix}
-		;;
-	*)
-		_wineserver_suffix="32"
-		;;
-esac
-
-if [ "$XBPS_LIBC" = "glibc" ]; then
-	hostmakedepends+=" prelink"
-fi
-
-_wine_libexec="/usr/libexec/wine"
-nopie_files="${_wine_libexec}/wine${_wine_suffix}"
-
-if [ "${_nopie}" = yes ]; then
-	nopie_files+=" ${_wine_libexec}/wineserver${_wineserver_suffix}"
-fi
-
-post_patch() {
-	if [ "${build_option_staging}" ]; then
-		"../wine-staging-${_pkgver}/patches/patchinstall.sh" --all
-	fi
-}
-
-pre_build() {
-	if [ "${_nopie}" = yes ]; then
-		make ${makejobs} LDFLAGS="$LDFLAGS -no-pie" \
-			tools/{widl/widl,winebuild/winebuild,winegcc/winegcc,wrc/wrc} \
-			loader/wine server/wineserver
-	fi
-}
-
-do_check() {
-	msg_warn "This testsuite might hang indefinitely\n"
-	make check
-}
-
-post_install() {
-	# Font aliasing settings for Win32 applications
-	install -d ${DESTDIR}/etc/fonts/conf.{avail,d}
-	install -m644 ${FILESDIR}/30-win32-aliases.conf ${DESTDIR}/etc/fonts/conf.avail
-	ln -s ../conf.avail/30-win32-aliases.conf ${DESTDIR}/etc/fonts/conf.d/30-win32-aliases.conf
-	mv ${DESTDIR}${_wine_libexec}/wineserver ${DESTDIR}${_wine_libexec}/wineserver${_wineserver_suffix}
-	vbin ${FILESDIR}/wine
-	vbin ${FILESDIR}/wineserver
-	for file in msiexec regedit regsvr32 wineboot winecfg winepath winemine winefile \
-		winedbg wineconsole notepad msidb widl winebuild winecpp winedump wineg++ \
-		winegcc winemaker wmc wrc function_grep.pl
-	do
-		mv ${DESTDIR}/usr/libexec/wine/${file} ${DESTDIR}/usr/bin/
-	done
-	case $XBPS_TARGET_MACHINE in
-		x86_64*)
-			ln -s ${_wine_libexec}/wine64 ${DESTDIR}/usr/bin/wine64
-		;;
-	esac
-}
-
-libwine_package() {
-	lib32mode=full
-	short_desc+=" - Runtime library"
-	replaces="libwine-unstable>=0"
-	pkg_install() {
-		vmove "usr/lib/*.so.*"
-		vmove usr/lib/wine
-	}
-}
-
-wine-devel_package() {
-	depends="libwine-${version}_${revision}"
-	short_desc+=" - development files"
-	replaces="wine-unstable-devel>=0"
-	pkg_install() {
-		vmove usr/include
-	}
-}
-
-wine-common_package() {
-	short_desc+=" - common files"
-	binfmts="/usr/bin/wine --magic MZ"
-	pkg_install() {
-		vmove usr/share
-		vmove etc/fonts
-		for file in wine wineserver msiexec regedit regsvr32 wineboot winecfg winepath winemine winefile winedbg wineconsole notepad msidb
-		do
-			vmove usr/bin/${file}
-		done
-	}
-}
-
-wine-tools_package() {
-	depends="wine-${version}_${revision}"
-	short_desc+=" - development tools"
-	if [ "${_nopie}" = yes ]; then
-		nopie=yes
-	fi
-	pkg_install() {
-		for file in widl winebuild winecpp winedump wineg++ winegcc winemaker wmc wrc function_grep.pl
-		do
-			vmove usr/bin/${file}
-		done
-	}
-}

From ed10585dca32c68a76f625024d9eb50b94a568c9 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 8 Apr 2021 08:32:20 +0200
Subject: [PATCH 0672/2024] linux5.4: update to 5.4.110.

---
 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 cd1fdb657f2e..da4e54344f58 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.109
+version=5.4.110
 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=ac6af4562717d030266fcddb0a3c44598610ca8c9c3a654725f58b9cbd61b7ee
+checksum=d0f6978440e8a4b266cb1847405a764bca83667541b9e4cdbbc161fb0dd9b228
 python_version=3
 patch_args="-Np1"
 

From 3b0dbf6ff278c3472683c605865acfe7aa1e2c1a Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 8 Apr 2021 08:33:17 +0200
Subject: [PATCH 0673/2024] linux4.19: update to 4.19.185.

---
 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 1fd96d526eaa..5cac6f099dd0 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.184
+version=4.19.185
 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=3dfaf6aae242cb4165d2c0df3405558264f86c3b04f7bbef71b99c83a87ab77c
+checksum=1689d78212997dae44b24bf037bc842d11d88e974d524af66f7864e5a8508597
 python_version=2 #unverified
 patch_args="-Np1"
 

From ed338d82d82c97d593daee73c34e36d76d0ea35f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 8 Apr 2021 10:46:27 +0200
Subject: [PATCH 0674/2024] python3-boto3: update to 1.17.47.

---
 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 abd7e94ef691..93abe914cbf3 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.39
+version=1.17.47
 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=c102ee7188ff80d188f5fc8be9117b2b157c4a08ea85a54946fb6ac206dbc1ac
+checksum=841ba34d61296a30128e16e987f66a999aea555f45d7fad9e85eb27f98ab05be
 
 post_install() {
 	vlicense LICENSE

From 5f5cbff29a2cbc5148dd365f54619c0a91ab65f9 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 8 Apr 2021 10:49:34 +0200
Subject: [PATCH 0675/2024] netpbm: update to 10.94.02.

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

diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template
index 6c7c6e388dab..72fc4b2d4611 100644
--- a/srcpkgs/netpbm/template
+++ b/srcpkgs/netpbm/template
@@ -1,9 +1,9 @@
 # Template file for 'netpbm'
 pkgname=netpbm
 # from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY
-version=10.94.01
+version=10.94.02
 revision=1
-_githash=dd12f603fa64ee403e4fa351eb1e95a27b26b599
+_githash=877641742255c9eeb82438eb54fd772f65e61e84
 _githash_guide=2d01412ab83361b8ed8d8db8f364cb223bd1c152
 create_wrksrc=yes
 build_wrksrc="netpbm-mirror-${_githash}"
@@ -16,7 +16,7 @@ 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="c84c8a0e4d9b3c7d3e05d6ba2becb9afb75bbbe6be2f20e6037847e18c352d71
+checksum="7d5104abe1046da49fb0aedc4f2bdcc077b559c998992d0e491cec74c742f31d
  794cf365b1c3b6b9b2f9536b8b173ccbcbc74a96cf6eaa4377aa4a684af4ad58"
 
 post_extract() {

From 4877475e05b44d8ab52fb02fb36eb19982e4c10b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 8 Apr 2021 16:03:52 +0200
Subject: [PATCH 0676/2024] plocate: update to 1.1.7.

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

diff --git a/srcpkgs/plocate/template b/srcpkgs/plocate/template
index 8fbece076403..1daec687219c 100644
--- a/srcpkgs/plocate/template
+++ b/srcpkgs/plocate/template
@@ -1,6 +1,6 @@
 # Template file for 'plocate'
 pkgname=plocate
-version=1.1.6
+version=1.1.7
 revision=1
 build_style=meson
 configure_args="
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later"
 homepage="https://plocate.sesse.net/"
 changelog="https://git.sesse.net/?p=plocate;a=blob_plain;f=NEWS;hb=HEAD"
 distfiles="https://plocate.sesse.net/download/plocate-${version}.tar.gz"
-checksum=bff5d80874639003ffba34a37778081ca0a75f89ea0ca3d1bee9309332bfdbd3
+checksum=c37cdc67851d25d1624ca3e3920184df0d5a3691f81b9d05bb02558ec41dd0d9
 
 system_accounts="_plocate"
 

From 5e9734be727140353ce4da66786849f9c392e94d 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:07:18 +0700
Subject: [PATCH 0677/2024] calligra: restore libkokross.so

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

diff --git a/common/shlibs b/common/shlibs
index 70be7e00c51d..296b93e5f22b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2403,6 +2403,7 @@ libpinktrace_0.9.so.9 pinktrace-0.9.1_1
 libsyd_1.0.so.0 sydbox-1.0.2_1
 libcsync.so.0 csync-0.50.0_1
 libcalligrasheetsodf.so.17 calligra-sheets-3.2.0_1
+libkokross.so.17 calligra-libs-3.2.1_3
 libkotext.so.17 calligra-libs-3.2.0_1
 libkoodf.so.17 calligra-libs-3.2.0_1
 libkarbonui.so.17 calligra-karbon-3.2.0_1
diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index 6d9a441ab173..9782b528067b 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
 # Template file for 'calligra'
 pkgname=calligra
 version=3.2.1
-revision=2
+revision=3
 build_style=cmake
 configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
  -DBUILD_TESTING=OFF"
@@ -15,7 +15,7 @@ makedepends="akonadi-contacts-devel akonadi5-devel ecm-devel eigen3.2
  libopenexr-devel libspnav-devel libvisio-devel libwpg-devel libwps-devel
  poppler-qt5-devel qca-qt5-devel threadweaver-devel marble5-devel
  kauth-devel kparts-devel kcmutils-devel kdelibs4support-devel
- ktextwidgets-devel kross-devel kservice-devel kcrash-devel"
+ ktextwidgets-devel kservice-devel kcrash-devel"
 depends="calligra-filters calligra-libs calligra-plugins calligra-karbon
  calligra-kexi calligra-stage calligra-sheets calligra-extras
  calligra-words calligra-handbook calligra-gemini calligra-plan"

From 7b1d2c56a0e2a1ac816928779dc95895bf6ca364 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Thu, 8 Apr 2021 19:26:40 +0300
Subject: [PATCH 0678/2024] glow: update to 1.4.1

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

diff --git a/srcpkgs/glow/template b/srcpkgs/glow/template
index cc1e6884674e..6b283d3d6ab7 100644
--- a/srcpkgs/glow/template
+++ b/srcpkgs/glow/template
@@ -1,6 +1,6 @@
 # Template file for 'glow'
 pkgname=glow
-version=1.4.0
+version=1.4.1
 revision=1
 build_style=go
 go_import_path=github.com/charmbracelet/glow
@@ -9,7 +9,7 @@ maintainer="klardotsh <josh@klar.sh>"
 license="MIT"
 homepage="https://github.com/charmbracelet/glow"
 distfiles="https://github.com/charmbracelet/glow/archive/v${version}.tar.gz"
-checksum=97d373e002332e54e2fb808ea38f098ca49e2b88038c115bd6d33d0b3b921495
+checksum=ff6dfd7568f0bac5144ffa3a429ed956dcbdb531487ef6e38ac61365322c9601
 
 post_install() {
 	vlicense LICENSE

From 57dda48d5accc64d97c85d2bb98f23b7e4b60cde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Thu, 8 Apr 2021 14:36:30 -0300
Subject: [PATCH 0679/2024] linux5.11: update to 5.11.12.

Also:
- clean up unused args and add a few comments
- remove XBPS_TARGET_MACHINE-dotconfig support as well as allmodconfig;
no sense to have those in the template itself
---
 srcpkgs/linux5.11/template | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/srcpkgs/linux5.11/template b/srcpkgs/linux5.11/template
index a75cd56b0de8..f8003c79ad10 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.11
+version=5.11.12
 revision=1
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -10,7 +10,7 @@ homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz
  https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz"
 checksum="04f07b54f0d40adfab02ee6cbd2a942c96728d87c1ef9e120d0cb9ba3fe067b4
- e5e0f6b2e0137e6a8afcfea7aca1c3f1ac1b5c72debcc79f3cb4ddd84df3f199"
+ ec443b0e6c9c10d94dc25b1662245d6421f75e223e7ea6de51e4f2c465b08164"
 skip_extraction="patch-${version}.xz"
 python_version=3
 patch_args="-Np1"
@@ -52,9 +52,6 @@ export KBUILD_BUILD_HOST=voidlinux
 if [ "$CROSS_BUILD" ]; then
 	_cross="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
 fi
-if [ "${_patchver}" ]; then
-	_version="EXTRAVERSION=${_patchver}"
-fi
 
 pre_patch() {
 	xzcat $XBPS_SRCDISTDIR/$pkgname-$version/patch-${version}.xz | patch -Np1
@@ -85,13 +82,6 @@ do_configure() {
 		msg_normal "Detected a .config file for your arch, using it.\n"
 		cp -f ${FILESDIR}/${subarch:-$arch}-dotconfig .config
 		make ${makejobs} ARCH=$arch ${_cross} oldconfig
-	elif [ -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig ]; then
-		msg_normal "Detected a .config file for your cpu family, using it.\n"
-		cp -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig .config
-		make ${makejobs} ARCH=$arch ${_cross} oldconfig
-	else
-		msg_normal "Defaulting to 'allmodconfig'.\n"
-		make ${makejobs} ARCH=$arch ${_cross} allmodconfig
 	fi
 	# Always use our revision to CONFIG_LOCALVERSION to match our pkg version.
 	sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config
@@ -109,8 +99,8 @@ do_build() {
 		mips*) _args="uImage modules dtbs"; arch=mips;;
 	esac
 	export LDFLAGS=
-	make ARCH=$arch ${_version} ${_cross} ${makejobs} prepare
-	make ARCH=$arch ${_version} ${_cross} ${makejobs} ${_args}
+	make ARCH=$arch ${_cross} ${makejobs} prepare
+	make ARCH=$arch ${_cross} ${makejobs} ${_args}
 }
 
 do_install() {
@@ -125,7 +115,7 @@ do_install() {
 		mips*) arch=mips;;
 	esac
 
-	# Run depmod after compressing modules.
+	# Run depmod after compressing modules - makes depmod.sh a noop
 	sed -i '2iexit 0' scripts/depmod.sh
 
 	# Install kernel, firmware and modules

From e399ce1903f22f33eb4cae7b34de80d64e080ac9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 6 Apr 2021 20:50:15 +0200
Subject: [PATCH 0680/2024] NetworkManager-openvpn: update to 1.8.14.

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

diff --git a/srcpkgs/NetworkManager-openvpn/template b/srcpkgs/NetworkManager-openvpn/template
index 82429aed9169..05673d7994db 100644
--- a/srcpkgs/NetworkManager-openvpn/template
+++ b/srcpkgs/NetworkManager-openvpn/template
@@ -1,7 +1,7 @@
 # Template file for 'NetworkManager-openvpn'
 pkgname=NetworkManager-openvpn
-version=1.8.12
-revision=2
+version=1.8.14
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="automake gettext-devel glib-devel intltool libtool pkg-config"
@@ -12,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0efda8878aaf0e6eb5071a053aea5d7f9d42aac097b3ff89e7cbc9233f815318
+checksum=e7419053fc3b5a7e25f1a7517c313ad4531b6ea280255524ebb85a70c76fdbeb
 system_accounts="_nm_openvpn"
 lib32disabled=yes
 _nm_openvpn_homedir="/var/empty"

From b9e73cf37635097ffb92f3521bac574705af65d1 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 8 Apr 2021 22:26:44 +0300
Subject: [PATCH 0681/2024] rssguard: update to 3.9.1.

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

diff --git a/srcpkgs/rssguard/template b/srcpkgs/rssguard/template
index ab7b3a9918d5..df1ccd7ede93 100644
--- a/srcpkgs/rssguard/template
+++ b/srcpkgs/rssguard/template
@@ -1,6 +1,6 @@
 # Template file for 'rssguard'
 pkgname=rssguard
-version=3.9.0
+version=3.9.1
 revision=1
 build_style=qmake
 configure_args="CONFIG+=release LRELEASE_EXECUTABLE=lrelease-qt5 USE_WEBENGINE=false"
@@ -12,7 +12,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="GPL-3.0-only"
 homepage="https://github.com/martinrotter/rssguard"
 distfiles="https://github.com/martinrotter/rssguard/archive/${version}.tar.gz"
-checksum=79ca9cccc6173e3a1f58ff49a5d9896d87e009ecd831619ce4ebe2e4e476d7a4
+checksum=312468a21a370159b0e10f6814071f6182314e196f2930402ffc307871e36fbf
 
 post_install() {
 	# Install rssguard icon manually

From 4c29b4c8910e0e4a42fd36320d41d0b0f5c0e00f Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 8 Apr 2021 22:34:59 +0200
Subject: [PATCH 0682/2024] linux5.11: fix ppc32

---
 srcpkgs/linux5.11/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/linux5.11/template b/srcpkgs/linux5.11/template
index f8003c79ad10..ad0b1ba7361b 100644
--- a/srcpkgs/linux5.11/template
+++ b/srcpkgs/linux5.11/template
@@ -70,7 +70,7 @@ do_configure() {
 		aarch64*) arch=arm64;;
 		ppc64le*) arch=powerpc; subarch=ppc64le;;
 		ppc64*) arch=powerpc; subarch=ppc64;;
-		ppc*) arch=powerpc;;
+		ppc*) arch=powerpc; subarch=ppc;;
 		mips*) arch=mips;;
 	esac
 

From ca7411ab49926d34d445bbac4eead6c2c9e58a4e Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 6 Apr 2021 21:48:47 +0300
Subject: [PATCH 0683/2024] dialog: update to 1.3.20210324.

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

diff --git a/srcpkgs/dialog/template b/srcpkgs/dialog/template
index 3a9f39fe1c1b..0d4c6871a960 100644
--- a/srcpkgs/dialog/template
+++ b/srcpkgs/dialog/template
@@ -1,9 +1,9 @@
 # Template file for 'dialog'
 pkgname=dialog
-_distver=1.3
-_date=20210117
-version="${_distver}.${_date}"
+version=1.3.20210324
 revision=1
+_distver=${version%.*}
+_date=${version##*.}
 wrksrc="${pkgname}-${_distver}-${_date}"
 build_style=gnu-configure
 configure_args="--with-ncursesw --disable-nls"
@@ -12,8 +12,9 @@ short_desc="Tool to display dialog boxes from shell scripts"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
 homepage="https://invisible-island.net/dialog/"
+changelog="https://invisible-island.net/dialog/CHANGES"
 distfiles="https://invisible-mirror.net/archives/${pkgname}/${pkgname}-${_distver}-${_date}.tgz"
-checksum=3c1ed08f44bcf6f159f2aa6fde765db94e8997b3eefb49d8b4c86691693c43e1
+checksum=01c2d1e2e9af9b083ea200caad084fdfda55178d5bbf4e42c9fff44935151653
 
 post_install() {
 	rm -r ${DESTDIR}/usr/lib

From 7ebd1afd59eda0f1551fcf5bad913685e098fd9b Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 8 Apr 2021 17:27:50 -0500
Subject: [PATCH 0684/2024] steam: update to 1.0.0.70.

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

diff --git a/srcpkgs/steam/template b/srcpkgs/steam/template
index 08690968c415..972db525e1eb 100644
--- a/srcpkgs/steam/template
+++ b/srcpkgs/steam/template
@@ -1,6 +1,6 @@
 # Template file for 'steam'
 pkgname=steam
-version=1.0.0.69
+version=1.0.0.70
 revision=1
 archs="i686 x86_64"
 wrksrc=steam-launcher
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom: Proprietary license"
 homepage="https://steampowered.com/"
 distfiles="http://repo.steampowered.com/${pkgname}/pool/${pkgname}/s/${pkgname}/${pkgname}_${version}.tar.gz"
-checksum=6f9838014a6b13f953ba726ce7d203946bb93bfd5d074901bc216ad04ab2c767
+checksum=9ff88a5778c7b00efb18f324d4cd0c282d5f438dad1201bc3e9822e3ff6a2dff
 repository=nonfree
 
 do_install() {

From 2b3a19ed81604b5e9ba2af70459760bd0407e446 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:42:17 +0700
Subject: [PATCH 0685/2024] k2pdfopt: remove package

* We've never shipped this package, the build was always broken.
* Build fail continously
* Even the successful build will crash because stack smashed.
---
 .../patches/01-CMakeLists.txt-fixes.patch     |  87 ------
 .../k2pdfopt/patches/02-header-fixes.patch    |  83 ------
 .../03-willuslib-ocrtess.c-tesscapi-fix.patch | 262 ------------------
 .../04-willuslib-wmupdfinfo.c-mupdf-fix.patch |  26 --
 .../patches/05-willuslib-bmpmupdf.c-fix.patch |   8 -
 srcpkgs/k2pdfopt/template                     |  18 --
 6 files changed, 484 deletions(-)
 delete mode 100644 srcpkgs/k2pdfopt/patches/01-CMakeLists.txt-fixes.patch
 delete mode 100644 srcpkgs/k2pdfopt/patches/02-header-fixes.patch
 delete mode 100644 srcpkgs/k2pdfopt/patches/03-willuslib-ocrtess.c-tesscapi-fix.patch
 delete mode 100644 srcpkgs/k2pdfopt/patches/04-willuslib-wmupdfinfo.c-mupdf-fix.patch
 delete mode 100644 srcpkgs/k2pdfopt/patches/05-willuslib-bmpmupdf.c-fix.patch
 delete mode 100644 srcpkgs/k2pdfopt/template

diff --git a/srcpkgs/k2pdfopt/patches/01-CMakeLists.txt-fixes.patch b/srcpkgs/k2pdfopt/patches/01-CMakeLists.txt-fixes.patch
deleted file mode 100644
index 07931dd43470..000000000000
--- a/srcpkgs/k2pdfopt/patches/01-CMakeLists.txt-fixes.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-diff --git CMakeLists.txt CMakeLists.txt
-index 4a2378b5e9..2ed0ccca4b 100644
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -54,0 +55 @@
-+  set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${JASPER_LIBRARY})
-@@ -57,11 +58 @@
--# paths from willuslib/wgs.c
--find_program(GHOSTSCRIPT_EXECUTABLE gs
--#  PATHS /usr/bin /usr/share/gs /usr/local/gs /opt/gs 
--#    /usr/share/gs* /usr/local/gs* /opt/gs*
--)
--if(GHOSTSCRIPT_EXECUTABLE)
--  set(HAVE_GHOSTSCRIPT 1)
--  message(STATUS "Found ghostscript executable")
--else()
--  message(STATUS "Could NOT find ghostscript executable")
--endif(GHOSTSCRIPT_EXECUTABLE)
-+set(HAVE_GHOSTSCRIPT 1)
-@@ -70 +60,0 @@
--# HAVE_GSL_LIB
-@@ -71,0 +62,6 @@
-+pkg_check_modules(GSL gsl)
-+if(GSL_FOUND)
-+  set(HAVE_GSL_LIB 1)
-+  include_directories(SYSTEM ${GSL_INCLUDEDIR})
-+  set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${GSL_LDFLAGS})
-+endif(GSL_FOUND)
-@@ -76,2 +71,0 @@
--pkg_check_modules(MUPDF mupdf)
--if(MUPDF_FOUND)
-@@ -79,7 +73 @@
--  # (includes jbig2dec, openjpeg, freetype)
--  include_directories(SYSTEM ${MUPDF_INCLUDEDIR})
--  message(STATUS "mupdf libraries: ${MUPDF_LDFLAGS}")
--  set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${MUPDF_LDFLAGS} 
--    -lmupdf-js-none -lopenjpeg -ljbig2dec -ljpeg -lfreetype
--  )
--endif(MUPDF_FOUND)
-+set(K2PDFOPT_LIB ${K2PDFOPT_LIB} -pthread -lmupdf -lmupdf-third -lopenjp2 -ljbig2dec -lfreetype -lharfbuzz)
-@@ -95,2 +91,14 @@
--# HAVE_LEPTONICA_LIB
--# HAVE_TESSERACT_LIB
-+
-+pkg_check_modules(LEPTONICA lept)
-+if(LEPTONICA_FOUND)
-+  set(HAVE_LEPTONICA_LIB 1)
-+  include_directories(SYSTEM ${LEPTONICA_INCLUDEDIR})
-+  set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${LEPTONICA_LDFLAGS} ${LEPTONICA_LIBRARIES})
-+endif(LEPTONICA_FOUND)
-+
-+pkg_check_modules(TESSERACT tesseract)
-+if(TESSERACT_FOUND)
-+  set(HAVE_TESSERACT_LIB 1)
-+  include_directories(SYSTEM ${TESSERACT_INCLUDEDIR})
-+  set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${TESSERACT_LDFLAGS})
-+endif(TESSERACT_FOUND)
-@@ -100 +108 @@
--SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DUSE_CMAKE -Wall")
-+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DUSE_CMAKE -Wall -Wextra")
-@@ -108,0 +117,2 @@
-+include_directories(${PROJECT_BINARY_DIR})
-+
-@@ -112 +121,0 @@
--# ms
-@@ -114 +123 @@
--target_link_libraries (k2pdfopt k2pdfoptlib willuslib ${K2PDFOPT_LIB})
-+target_link_libraries(k2pdfopt k2pdfoptlib willuslib ${K2PDFOPT_LIB})
-@@ -115,0 +125 @@
-+install(TARGETS k2pdfopt RUNTIME DESTINATION bin)
-diff --git willuslib/CMakeLists.txt willuslib/CMakeLists.txt
-index 463bbc95e7..104d02e360 100644
---- willuslib/CMakeLists.txt
-+++ willuslib/CMakeLists.txt
-@@ -9 +9 @@
--    ocrjocr.c ocrtess.c pdfwrite.c point2d.c render.c strbuf.c string.c
-+    ocrgocr.c ocrtess.c pdfwrite.c point2d.c render.c strbuf.c string.c
-@@ -24,0 +25,4 @@
-+if(TESSERACT_FOUND)
-+  set(WILLUSLIB_SRC ${WILLUSLIB_SRC} ocrtess.c)
-+endif(TESSERACT_FOUND)
-+
-@@ -29,3 +33 @@
--# HAVE_GOCR_LIB: ocrjocr.c
--# HAVE_TESSERACT_LIB: ocrtess.c 
--
-+# HAVE_GOCR_LIB: ocrgocr.c
diff --git a/srcpkgs/k2pdfopt/patches/02-header-fixes.patch b/srcpkgs/k2pdfopt/patches/02-header-fixes.patch
deleted file mode 100644
index 1b5667fc09ca..000000000000
--- a/srcpkgs/k2pdfopt/patches/02-header-fixes.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-diff --git willuslib/gslpolyfit.c willuslib/gslpolyfit.c
-index 5d2b6fbb85..f127bf054f 100644
---- willuslib/gslpolyfit.c
-+++ willuslib/gslpolyfit.c
-@@ -24,7 +24,10 @@
- #include <stdlib.h>
- #include "willus.h"
- #ifdef HAVE_GSL_LIB
--#include <gsl.h>
-+#include <gsl/gsl_poly.h>
-+#include <gsl/gsl_vector.h>
-+#include <gsl/gsl_multifit.h>
-+#include <gsl/gsl_matrix.h>
- #endif
- 
- void gslpolyfit(double *x,double *y0,int n,int d,double *c0)
-diff --git willuslib/bmp.c willuslib/bmp.c
-index 583644d565..b2c36d5673 100644
---- willuslib/bmp.c
-+++ willuslib/bmp.c
-@@ -37,7 +37,7 @@
- #include <jpeglib.h>
- #endif
- #ifdef HAVE_JASPER_LIB
--#include <jasper.h>
-+#include <jasper/jasper.h>
- #endif
- 
- #define BOUND(x,xmin,xmax)  if ((x)<(xmin)) (x)=(xmin); else { if ((x)>(xmax)) (x)=(xmax); }
-diff --git willuslib/ocrtess.c willuslib/ocrtess.c
-index e1366e1aab..58aaf97fb9 100644
---- willuslib/ocrtess.c
-+++ willuslib/ocrtess.c
-@@ -24,8 +24,9 @@
- #include <stdlib.h>
- #include <string.h>
- #include <ctype.h>
--#include <leptonica.h>
--#include <tesseract.h>
-+#include <locale.h>
-+#include <leptonica/allheaders.h>
-+#include <tesseract/capi.h>
- #include "willus.h"
- 
- 
-diff --git willuslib/wleptonica.c willuslib/wleptonica.c
-index a4e3cfd61d..a85be0949d 100644
---- willuslib/wleptonica.c
-+++ willuslib/wleptonica.c
-@@ -23,7 +23,7 @@
- #include "willus.h"
- 
- #ifdef HAVE_LEPTONICA_LIB
--#include <leptonica.h>
-+#include <leptonica/allheaders.h>
- 
- static void wlept_pix_from_bmp(PIX **pixptr,WILLUSBITMAP *bmp);
- static void wlept_bmp_from_pix(WILLUSBITMAP *bmp,PIX *pix);
-@@ -135,7 +135,7 @@ pixWrite("pixb.png",pixb,IFF_PNG);
-     dew1=dewarpCreate(pixb,1);
-     pixDestroy(&pixb);
-     dewarpaInsertDewarp(dewa,dew1);
--    dewarpBuildPageModel_ex(dew1,debug,fit_order);
-+    dewarpBuildPageModel(dew1,debug);
-     if (bmp1!=NULL)
-         {
-         PIX *pix2,*pix2d;
-
-diff --git willuslib/wmupdf.c willuslib/wmupdf.c
-index 81627efd4c..fcab84c1db 100644
---- willuslib/wmupdf.c
-+++ willuslib/wmupdf.c
-@@ -189,8 +189,8 @@ int wmupdf_remake_pdf(char *infile,char *outfile,WPDFPAGEINFO *pageinfo,int use_
-     pdf_write_opts.do_compress=1;
-     pdf_write_opts.do_linear=0;
-     pdf_write_opts.do_garbage=1; /* 2 and 3 don't work for this. */
--    pdf_write_opts.continue_on_error=0;
--    pdf_write_opts.errors=NULL;
-+    //pdf_write_opts.continue_on_error=0;
-+    //pdf_write_opts.errors=NULL;
-     write_failed=0;
-     wpdfpageinfo_sort(pageinfo);
-     xref=NULL;
diff --git a/srcpkgs/k2pdfopt/patches/03-willuslib-ocrtess.c-tesscapi-fix.patch b/srcpkgs/k2pdfopt/patches/03-willuslib-ocrtess.c-tesscapi-fix.patch
deleted file mode 100644
index adc76c83866f..000000000000
--- a/srcpkgs/k2pdfopt/patches/03-willuslib-ocrtess.c-tesscapi-fix.patch
+++ /dev/null
@@ -1,262 +0,0 @@
-diff -r -u0 willuslib/ocrtess.c willuslib/ocrtess.c
---- willuslib/ocrtess.c	2018-12-31 19:59:58.000000000 +0100
-+++ willuslib/ocrtess.c	2019-07-27 18:47:06.706765733 +0200
-@@ -29,0 +30,258 @@
-+
-+
-+/*
-+** ocr_type=0:  OEM_DEFAULT
-+** ocr_type=1:  OEM_TESSERACT_ONLY
-+** ocr_type=2:  OEM_LSTM_ONLY
-+** ocr_type=3:  OEM_TESSERACT_LSTM_COMBINED
-+*/
-+void *tess_capi_init(char *datapath,char *language,int ocr_type,FILE *out,
-+                     char *initstr,int maxlen,int *status)
-+
-+    {
-+    char original_locale[256];
-+    TessBaseAPI *api = TessBaseAPICreate();
-+
-+    /* willus mod, 11-24-16 */
-+    /* Tesseract needs "C" locale to correctly parse all data .traineddata files. */
-+
-+    strncpy(original_locale,setlocale(LC_ALL,NULL),255);
-+    original_locale[255]='\0';
-+    setlocale(LC_ALL,"C");
-+
-+    // Make the order of args a bit more forgiving than it used to be.
-+    const char* lang = "eng";
-+    TessPageSegMode pagesegmode = PSM_SINGLE_BLOCK;
-+    if (language!=NULL && language[0]!='\0')
-+        lang = language;
-+ 
-+/*
-+v4.00 loads either TESSERACT enginer, LSTM engine, or both.  No CUBE.
-+*/
-+    ocr_type=0; /* Ignore specified and use default */
-+    TessBaseAPISetOutputName(api, NULL);
-+    (*status)=TessBaseAPIInit2(api, datapath,lang,
-+              ocr_type==0 ? OEM_DEFAULT :
-+                (ocr_type==1 ? OEM_TESSERACT_ONLY :
-+                   (ocr_type==2 ? OEM_LSTM_ONLY :
-+                                  (OEM_TESSERACT_LSTM_COMBINED))));
-+    if ((*status)!=0)
-+        {
-+        /* willus mod, 11-24-16 */
-+        setlocale(LC_ALL,original_locale);
-+        TessBaseAPIEnd(api);
-+        TessBaseAPIDelete(api);
-+        return(NULL);
-+        }
-+    /*
-+    api.Init("tesscapi",lang,tesseract::OEM_DEFAULT,
-+           &(argv[arg]), argc - arg, NULL, NULL, false);
-+    */
-+    // We have 2 possible sources of pagesegmode: a config file and
-+    // the command line. For backwards compatability reasons, the
-+    // default in tesseract is tesseract::PSM_SINGLE_BLOCK, but the
-+    // default for this program is tesseract::PSM_AUTO. We will let
-+    // the config file take priority, so the command-line default
-+    // can take priority over the tesseract default, so we use the
-+    // value from the command line only if the retrieved mode
-+    // is still tesseract::PSM_SINGLE_BLOCK, indicating no change
-+    // in any config file. Therefore the only way to force
-+    // tesseract::PSM_SINGLE_BLOCK is from the command line.
-+    // It would be simpler if we could set the value before Init,
-+    // but that doesn't work.
-+    if (TessBaseAPIGetPageSegMode(api) == PSM_SINGLE_BLOCK)
-+        TessBaseAPISetPageSegMode(api, pagesegmode);
-+
-+    /*
-+    ** Initialization message
-+    */
-+    {
-+    char istr[1024];
-+
-+// printf("tessedit_ocr_engine_mode = %d\n",tessedit_ocr_engine_mode);
-+    sprintf(istr,"%s",TessVersion());
-+    sprintf(&istr[strlen(istr)],"\n    Tesseract data folder = '%s'",datapath==NULL?getenv("TESSDATA_PREFIX"):datapath);
-+    strcat(istr,"\n    Tesseract languages: ");
-+    char** languages = TessBaseAPIGetAvailableLanguagesAsVector(api);
-+/*
-+printf("OEM=%d\n",api->oem());
-+printf("Langs='%s'\n",api->GetInitLanguagesAsString());
-+printf("AnyTessLang()=%d\n",(int)api->tesseract()->AnyTessLang());
-+printf("AnyLSTMLang()=%d\n",(int)api->tesseract()->AnyLSTMLang());
-+printf("num_sub_langs()=%d\n",api->tesseract()->num_sub_langs());
-+printf("languages.size()=%d\n",(int)languages.size());
-+*/
-+    char* l = languages;
-+    int eng = 0;
-+    TessBaseAPI *lang1; 
-+    while (l != NULL)
-+        {
-+            eng=(int)TessBaseAPIOem(api);
-+            sprintf(&istr[strlen(istr)],"%s%s [%s]",l==languages?"":", ",l,
-+                    eng==2?"LSTM+Tess":(eng==1?"LSTM":"Tess"));
-+            l++;
-+        }
-+    
-+    TessDeleteTextArray(languages);
-+
-+    /*
-+    if (ocr_type==0 || ocr_type==3)
-+        sprintf(&istr[strlen(istr)],"[LSTM+] (lang=");
-+    else if (ocr_type==2)
-+        sprintf(&istr[strlen(istr)],"[LSTM] (lang=");
-+    strncpy(&istr[strlen(istr)],language,253-strlen(istr));
-+    istr[253]='\0';
-+    strcat(istr,")");
-+    */
-+    if (out!=NULL)
-+        fprintf(out,"%s\n",istr);
-+    if (initstr!=NULL)
-+        {
-+        strncpy(initstr,istr,maxlen-1);
-+        initstr[maxlen-1]='\0';
-+        }
-+    }
-+
-+
-+    /* Turn off LSTM debugging output */
-+    TessBaseAPISetVariable(api,"lstm_debug_level","0");
-+#if (WILLUSDEBUG & 1)
-+    TessBaseAPISetVariable(api,"lstm_debug_level","9");
-+    TessBaseAPISetVariable(api,"paragraph_debug_level","9");
-+    TessBaseAPISetVariable(api,"tessdata_manager_debug_level","9");
-+    TessBaseAPISetVariable(api,"tosp_debug_level","9");
-+    TessBaseAPISetVariable(api,"wordrec_debug_level","9");
-+    TessBaseAPISetVariable(api,"segsearch_debug_level","9");
-+#endif
-+    /* willus mod, 11-24-16 */
-+    setlocale(LC_ALL,original_locale);
-+    return((void *)api);
-+    }
-+
-+
-+int tess_capi_get_ocr(void *vapi,PIX *pix,char *outstr,int maxlen,int segmode,FILE *out)
-+
-+    {
-+    TessBaseAPI *api;
-+    static int old_segmode=-1;
-+
-+    api=(TessBaseAPI *)vapi;
-+    if (old_segmode != segmode)
-+        {
-+        old_segmode=segmode;
-+        TessBaseAPISetPageSegMode(api, (TessPageSegMode)segmode);
-+        }
-+    if (!TessBaseAPIProcessPage(api,pix,0,NULL,NULL,0,NULL))
-+        {
-+        /* pixDestroy(&pix); */
-+        if (out!=NULL)
-+            fprintf(out,"tesscapi:  Error during bitmap processing.\n");
-+        TessBaseAPIClear(api);
-+        return(-1);
-+        }
-+    char* text = TessBaseAPIGetUTF8Text(api);
-+    strncpy(outstr,text,maxlen-1);
-+    outstr[maxlen-1]='\0';
-+    TessDeleteText(text);
-+    TessBaseAPIClear(api);
-+    return(0);
-+    }
-+
-+
-+int tess_capi_get_ocr_multiword(void *vapi,PIX *pix,int segmode,
-+                                int **left,int **top,int **right,int **bottom,
-+                                int **ybase,char **text,int *nw,
-+                                FILE *out)
-+
-+    {
-+    TessBaseAPI *api;
-+    static int old_segmode=-1;
-+
-+    api=(TessBaseAPI *)vapi;
-+    if (old_segmode != segmode)
-+        {
-+        old_segmode=segmode;
-+        TessBaseAPISetPageSegMode(api, (TessPageSegMode)segmode);
-+        }
-+    if (!TessBaseAPIProcessPage(api,pix,0,NULL,NULL,0,NULL))
-+        {
-+        if (out!=NULL)
-+            fprintf(out,"tesscapi:  Error during bitmap processing.\n");
-+        TessBaseAPIClear(api);
-+        (*nw)=0;
-+        return(-1);
-+        }
-+    
-+    //(*nw)=api->GetOCRWords(left,top,right,bottom,ybase,text);
-+    
-+    int iword,nwords,totlen,it8;
-+    int *x0,*y0,*x1,*y1,*ybaseline;
-+    char *tutf8;
-+
-+    TessResultIterator *res_it = TessBaseAPIGetIterator(api);
-+    /* Count words */
-+    iword=0;
-+    totlen=0;
-+    while(TessResultIteratorNext(res_it, RIL_BLOCK))
-+        {
-+        if(!TessResultIteratorNext(res_it, RIL_WORD))
-+            {
-+            continue;
-+            }
-+        iword++;
-+        char* textstr = TessResultIteratorGetUTF8Text(res_it, RIL_WORD);
-+        totlen+=strlen(textstr)+1;
-+        }
-+    nwords = iword;
-+    
-+    x0=(*left)=(int *)malloc(sizeof(int)*5*nwords);
-+    y0=(*top)=&x0[nwords];
-+    x1=(*right)=&y0[nwords];
-+    y1=(*bottom)=&x1[nwords];
-+    ybaseline=(*ybase)=&y1[nwords];
-+    tutf8=(*text)=(char *)malloc(totlen);
-+    iword=0;
-+    it8=0;
-+    TessPageIteratorBegin( (TessPageIterator *) res_it);
-+    while (TessResultIteratorNext(res_it, RIL_BLOCK))
-+        {
-+        if (!TessResultIteratorNext(res_it, RIL_WORD))
-+            {
-+            continue;
-+            }
-+        char* textstr = TessResultIteratorGetUTF8Text(res_it, RIL_WORD);
-+        strcpy(&tutf8[it8],textstr);
-+        it8 += strlen(&tutf8[it8])+1;
-+        
-+        int bbleft, bbtop, bbright, bbbottom;
-+        int u1,v1,u2,v2;
-+        TessPageIteratorBoundingBox( (TessPageIterator *) res_it, RIL_WORD, &bbleft, &bbtop, &bbright, &bbbottom);
-+        TessPageIteratorBaseline( (TessPageIterator *) res_it, RIL_WORD, &u1, &v1, &u2, &v2);
-+        x0[iword]=bbleft;
-+        x1[iword]=bbright;
-+        y0[iword]=bbtop;
-+        y1[iword]=bbbottom;
-+        ybaseline[iword]=(v1+v2)/2;
-+        iword++;
-+        }
-+        
-+    TessResultIteratorDelete(res_it);
-+    
-+    (*nw) = iword;
-+    
-+    TessBaseAPIClear(api);
-+    return(0);
-+    }
-+
-+
-+void tess_capi_end(void *vapi)
-+
-+    {
-+    TessBaseAPI *api;
-+
-+    if (vapi==NULL)
-+        return;
-+    api=(TessBaseAPI *)vapi;
-+    TessBaseAPIEnd(api);
-+    TessBaseAPIDelete(api);
-+    }
diff --git a/srcpkgs/k2pdfopt/patches/04-willuslib-wmupdfinfo.c-mupdf-fix.patch b/srcpkgs/k2pdfopt/patches/04-willuslib-wmupdfinfo.c-mupdf-fix.patch
deleted file mode 100644
index 1b3bf4d057ad..000000000000
--- a/srcpkgs/k2pdfopt/patches/04-willuslib-wmupdfinfo.c-mupdf-fix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -r -w -u0 willuslib/wmupdfinfo.c willuslib/wmupdfinfo.c
---- willuslib/wmupdfinfo.c	2018-11-21 10:05:22.000000000 +0100
-+++ willuslib/wmupdfinfo.c	2019-07-27 19:56:23.418595275 +0200
-@@ -217 +217 @@
--		pdf_print_obj(ctx, out, pdf_resolve_indirect(ctx, obj), 1);
-+		pdf_print_obj(ctx, out, pdf_resolve_indirect(ctx, obj), 1, 1);
-@@ -224 +224 @@
--		pdf_print_obj(ctx, out, pdf_resolve_indirect(ctx, obj), 1);
-+		pdf_print_obj(ctx, out, pdf_resolve_indirect(ctx, obj), 1, 1);
-@@ -240 +240 @@
--        n=pdf_sprint_obj(ctx,NULL,0,robj,1);
-+        char* f = pdf_sprint_obj(ctx,NULL,0,&n,robj,1,1);
-@@ -245 +245 @@
--		    pdf_print_obj(ctx,out,robj,1);
-+		    pdf_print_obj(ctx,out,robj,1,1);
-@@ -249 +249,2 @@
--            pdf_sprint_obj(ctx,buf,n+2,robj,1);
-+            int len = 0;
-+            char* d = pdf_sprint_obj(ctx,buf,n+2,&len,robj,1,1);
-@@ -256,0 +258 @@
-+            fz_free(ctx, d);
-@@ -257,0 +260 @@
-+        fz_free(ctx, f);
-@@ -278 +281 @@
--		pdf_print_obj(ctx,out, pdf_resolve_indirect(ctx,obj), 1);
-+		pdf_print_obj(ctx,out, pdf_resolve_indirect(ctx,obj), 1, 1);
diff --git a/srcpkgs/k2pdfopt/patches/05-willuslib-bmpmupdf.c-fix.patch b/srcpkgs/k2pdfopt/patches/05-willuslib-bmpmupdf.c-fix.patch
deleted file mode 100644
index 7ed4528e8faf..000000000000
--- a/srcpkgs/k2pdfopt/patches/05-willuslib-bmpmupdf.c-fix.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff -r -w -u0 willuslib/bmpmupdf.c willuslib/bmpmupdf.c
---- willuslib/bmpmupdf.c	2018-11-20 21:13:12.000000000 +0100
-+++ willuslib/bmpmupdf.c	2019-07-27 20:12:37.386555334 +0200
-@@ -28 +28,3 @@
--void pdf_install_load_system_font_funcs(fz_context *ctx);
-+void pdf_install_load_system_font_funcs(fz_context *ctx)
-+{
-+}
diff --git a/srcpkgs/k2pdfopt/template b/srcpkgs/k2pdfopt/template
deleted file mode 100644
index a099962a8063..000000000000
--- a/srcpkgs/k2pdfopt/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'k2pdfopt'
-pkgname=k2pdfopt
-version=2.51
-revision=1
-wrksrc="${pkgname}_v${version}"
-build_style=cmake
-hostmakedepends="pkgconf unzip"
-makedepends="zlib-devel libpng-devel libjpeg-turbo-devel jasper-devel
- freetype-devel libopenjpeg2-devel jbig2dec-devel djvulibre-devel
- tesseract-ocr-devel leptonica-devel gsl-devel mupdf-devel harfbuzz-devel"
-depends="ghostscript"
-short_desc="Optimize PDF/DJVU files for mobile e-readers and smartphones"
-maintainer="John Eira <john.eira@web.de>"
-license="GPL-3.0-or-later"
-homepage="https://willus.com/k2pdfopt/"
-distfiles="http://willus.com/k2pdfopt/src/k2pdfopt_v${version}_src.zip"
-checksum="3e6e4d7aac9c9bed4c7854888a6a91213be10121be76e17f83e080e829ac5fde"
-broken="https://build.voidlinux.org/builders/x86_64-musl_builder/builds/22343/steps/shell_3/logs/stdio"

From ccf28e54604a1805b3c3913dd955b4a27f492295 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 8 Apr 2021 15:19:23 +0200
Subject: [PATCH 0686/2024] x42-plugins: update to 20210408.

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

diff --git a/srcpkgs/x42-plugins/template b/srcpkgs/x42-plugins/template
index 259a5efa11c8..76c74f6f7a32 100644
--- a/srcpkgs/x42-plugins/template
+++ b/srcpkgs/x42-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'x42-plugins'
 pkgname=x42-plugins
-version=20210407
+version=20210408
 revision=1
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ maintainer="tibequadorian <tibequadorian@posteo.de>"
 license="GPL-2.0-or-later"
 homepage="https://x42-plugins.com"
 distfiles="https://gareus.org/misc/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=af27427a918aacc1e8792caeae0dbcd355dafeca0fff37b3a7f3e6f8364ae575
+checksum=cdc1d958581556ba56a6984fb8c1c66144e4c7447c11417824239fb2fa787fe4
 
 pre_build() {
 	export OPTIMIZATIONS="-fomit-frame-pointer -O3 -fno-finite-math-only -DNDEBUG"

From 2b22544473c3143ec4169437e05ba870a4365c05 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 8 Apr 2021 23:43:03 +0300
Subject: [PATCH 0687/2024] fossil: update to 2.15.1, add changelog.

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

diff --git a/srcpkgs/fossil/template b/srcpkgs/fossil/template
index 7716cf704eaa..0e8afbbdadf4 100644
--- a/srcpkgs/fossil/template
+++ b/srcpkgs/fossil/template
@@ -1,6 +1,6 @@
 # Template file for 'fossil'
 pkgname=fossil
-version=2.15
+version=2.15.1
 revision=1
 build_style=configure
 configure_args="--disable-internal-sqlite --prefix=/usr"
@@ -10,8 +10,9 @@ short_desc="Simple, high-reliability, distributed software configuration managem
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://www.fossil-scm.org"
+changelog="https://www.fossil-scm.org/home/doc/trunk/www/changes.wiki"
 distfiles="https://www.fossil-scm.org/index.html/uv/fossil-src-${version}.tar.gz"
-checksum=671edda9a014474d0f07b4c616b37222e218275b3c8e5414657830c6f351877b
+checksum=80d27923c663b2a2c710f8ae8cd549862e04f8c04285706274c34ae3c8ca17d1
 
 post_extract() {
 	vsed -i 's/test_system_sqlite$/# &/' auto.def  # failing on cross

From 15b507c775fd9637f6a5a8b69840fc9d3bfe24c4 Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Thu, 8 Apr 2021 20:21:21 -0300
Subject: [PATCH 0688/2024] cinnamon-menus: update to 4.8.3.

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

diff --git a/srcpkgs/cinnamon-menus/template b/srcpkgs/cinnamon-menus/template
index 0452a1f464e4..0fd49ed716aa 100644
--- a/srcpkgs/cinnamon-menus/template
+++ b/srcpkgs/cinnamon-menus/template
@@ -1,6 +1,6 @@
 # Template file for 'cinnamon-menus'
 pkgname=cinnamon-menus
-version=4.8.2
+version=4.8.3
 revision=1
 build_style=meson
 build_helper=gir
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://github.com/linuxmint/cinnamon-menus"
 distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz"
-checksum=6c19ebcea0d35a7a65cd70f1cdca2c5c739467ac6d2c2a1c38a5d580296707bd
+checksum=b0a02ab0e37d67e761c24545123ec354e7fab0a504267e524892a953bcfd98d7
 
 cinnamon-menus-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From a44964d1509fae59e2c8a12de305ab0ceb018816 Mon Sep 17 00:00:00 2001
From: Gadzhi Kharkharov <me@kkga.me>
Date: Thu, 8 Apr 2021 22:57:27 +0300
Subject: [PATCH 0689/2024] zoxide: update to 0.6.0.

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

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

From 98f2b9efe6cb7a0de906728f9e0b0ec91c04efee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20Treffenst=C3=A4dt?=
 <lucas.treffenstaedt@tngtech.com>
Date: Thu, 8 Apr 2021 09:28:36 +0200
Subject: [PATCH 0690/2024] intellij-idea-ultimate-edition: update to 2021.1.

---
 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 177b6e669cb3..6b1e2474cd69 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.3
+version=2021.1
 revision=1
 archs="i686 x86_64"
-wrksrc="idea-IU-203.7717.56"
+wrksrc="idea-IU-211.6693.111"
 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=f1c90d475559f39cfd626c55d7882b774813de582b343c5164f3c0703145f86b
+checksum=fdfd7fda5b4215b9eea925e341f4947eda5319f1b92e1d0083457741e0555318
 repository=nonfree
 restricted=yes
 nopie=yes

From 6c79bd7740a596f9c953add08f318114111e1ea0 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 8 Apr 2021 08:02:57 +0300
Subject: [PATCH 0691/2024] libksba: update to 1.5.1.

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

diff --git a/srcpkgs/libksba/template b/srcpkgs/libksba/template
index 61037bbd4aaa..2a2aec4713aa 100644
--- a/srcpkgs/libksba/template
+++ b/srcpkgs/libksba/template
@@ -1,6 +1,6 @@
 # Template file for 'libksba'
 pkgname=libksba
-version=1.5.0
+version=1.5.1
 revision=1
 build_style=gnu-configure
 makedepends="libgpg-error-devel"
@@ -9,7 +9,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later,LGPL-3.0-or-later"
 homepage="https://www.gnupg.org/related_software/libksba/index.html"
 distfiles="https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=ae4af129216b2d7fdea0b5bf2a788cd458a79c983bb09a43f4d525cc87aba0ba
+checksum=b0f4c65e4e447d9a2349f6b8c0e77a28be9531e4548ba02c545d1f46dc7bf921
 
 libksba-devel_package() {
 	depends="libgpg-error-devel ${sourcepkg}>=${version}_${revision}"

From 57812c5da397a63fceab26b431c6a33893924fc9 Mon Sep 17 00:00:00 2001
From: claris <share@claris>
Date: Wed, 7 Apr 2021 23:48:00 -0700
Subject: [PATCH 0692/2024] OpenRCT2: update to 0.3.3, tweak template

- Add CC-BY-SA-4.0 license declaration (see
  <https://github.com/OpenRCT2/title-sequences/issues/3>)
- Remove unused `jansson-devel` makedep
- Explicitly disable unused dependency options when configuring
- Add missing make target `g2` (packs some data into a file, was previously
  being invoked as a dependency of `install`)
- Remove useless and incorrect mkdir line from `post_extract`
- Remove INSTALL.msg, add explicit zenity dep instead
---
 srcpkgs/OpenRCT2/INSTALL.msg |  5 -----
 srcpkgs/OpenRCT2/template    | 19 +++++++++++--------
 2 files changed, 11 insertions(+), 13 deletions(-)
 delete mode 100644 srcpkgs/OpenRCT2/INSTALL.msg

diff --git a/srcpkgs/OpenRCT2/INSTALL.msg b/srcpkgs/OpenRCT2/INSTALL.msg
deleted file mode 100644
index 70817138b9d2..000000000000
--- a/srcpkgs/OpenRCT2/INSTALL.msg
+++ /dev/null
@@ -1,5 +0,0 @@
-You must install a package that provides either the zenity or kdialog binaries:
-
-- zenity
-- qarma
-- kdialog
diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index b8ea8849863e..c5256b65287e 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -2,32 +2,36 @@
 # based on https://raw.githubusercontent.com/AluisioASG/void-packages/openrct2/srcpkgs/OpenRCT2/template
 # and https://github.com/void-linux/void-packages/issues/1014#issuecomment-417372421
 pkgname=OpenRCT2
-_objects_version=1.0.18
+_objects_version=1.0.21
 _titles_version=0.1.2c
-version=0.3.2
-revision=3
+version=0.3.3
+revision=1
 build_style=cmake
 configure_args="
  -DOPENRCT2_VERSION_TAG=${version}
  -DDOWNLOAD_TITLE_SEQUENCES=0
  -DDOWNLOAD_OBJECTS=0
+ -DDISABLE_DISCORD_RPC=1
+ -DDISABLE_GOOGLE_BENCHMARK=1
  $(vopt_if multiplayer '' '-DDISABLE_NETWORK=1')
  $(vopt_if scripting '-DENABLE_SCRIPTING=1' '')"
+make_build_target="all g2"
 hostmakedepends="pkg-config unzip"
 makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
- libpng-devel speexdsp-devel jansson-devel icu-devel zlib-devel json-c++
+ libpng-devel speexdsp-devel icu-devel zlib-devel json-c++
  $(vopt_if multiplayer 'libcurl-devel openssl-devel')
  $(vopt_if scripting duktape-devel)"
+depends="zenity"
 short_desc="Open source re-implementation of RollerCoaster Tycoon 2"
 maintainer="klardotsh <josh@klar.sh>"
-license="GPL-3.0-or-later"
+license="GPL-3.0-or-later, CC-BY-SA-4.0"
 homepage="https://openrct2.io"
 # use title-sequences.zip to match CMakeLists instruction
 distfiles="https://github.com/OpenRCT2/OpenRCT2/archive/v${version}.tar.gz
  https://github.com/OpenRCT2/objects/releases/download/v${_objects_version}/objects.zip
  https://github.com/OpenRCT2/title-sequences/releases/download/v${_titles_version}/title-sequences.zip"
-checksum="66c1c7ae8c765397e324b1aac59907bd5197dbad88597133aaba8a9480627c36
- bf8a28b7ccebaf58e4e9eb2540534632830534cf0b3f73677521dc555878c682
+checksum="71f9d1ae8477e1e9881a6f9759bddac71346e8ba42238d22514ae3d872b54fd2
+ b081f885311f9afebc41d9dd4a68b7db4cf736eb815c04e307e1a426f08cfa35
  5284333fa501270835b5f0cf420cb52155742335f5658d7889ea35d136b52517"
 skip_extraction="objects.zip title-sequences.zip"
 
@@ -55,7 +59,6 @@ pre_configure() {
 
 post_extract() {
 	_srcdir="${XBPS_SRCDISTDIR}/${pkgname}-${version}"
-	mkdir -p data/object data/title
 	unzip -qd data/object "${_srcdir}/objects.zip"
 	unzip -qd data/sequence "${_srcdir}/title-sequences.zip"
 

From f535d8d52870b74990df26fa11e1805d25877726 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 8 Apr 2021 23:35:05 -0500
Subject: [PATCH 0693/2024] mongo-c-driver: update to 1.17.5.

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

diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index 3557648f8164..aaad9e75bce3 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -1,7 +1,7 @@
 # Template file for 'mongo-c-driver'
 pkgname=mongo-c-driver
-version=1.17.4
-revision=2
+version=1.17.5
+revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTS=OFF"
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://mongoc.org"
 distfiles="https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz"
-checksum=9ec8fe7fb54d636886fa823460658ccf660e3d82520d10810fb7c9d302ac974f
+checksum=4b15b7e73a8b0621493e4368dc2de8a74af381823ae8f391da3d75d227ba16be
 
 mongo-c-driver-devel_package() {
 	short_desc+=" - development files"

From bc5ebacb401f169b552c34094247f4b9ea035a9c Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 8 Apr 2021 23:32:30 -0500
Subject: [PATCH 0694/2024] delta: update to 0.7.1.

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

diff --git a/srcpkgs/delta/template b/srcpkgs/delta/template
index be4b95ac2aea..250d68bccdbb 100644
--- a/srcpkgs/delta/template
+++ b/srcpkgs/delta/template
@@ -1,6 +1,6 @@
 # Template file for 'delta'
 pkgname=delta
-version=0.6.0
+version=0.7.1
 revision=1
 build_style=cargo
 short_desc="Syntax-highlighting pager for git"
@@ -8,7 +8,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/dandavison/delta"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=27259c3d305edee5f49a3a992e7d739cab400f478a675b7388fef85a2724217c
+checksum=f432335361088c37f8aa4bb747ba12e1f8eddbbc3ed5c51fdd52d9b96eb22227
 
 post_install() {
 	vlicense LICENSE

From 297d01ddb11d14a5a8b14c5ed65424c3c8324cea Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 8 Apr 2021 23:41:02 -0500
Subject: [PATCH 0695/2024] python3-oletools: update to 0.56.1.

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

diff --git a/srcpkgs/python3-oletools/template b/srcpkgs/python3-oletools/template
index 9da4f8d26cf5..73293a1f82d6 100644
--- a/srcpkgs/python3-oletools/template
+++ b/srcpkgs/python3-oletools/template
@@ -1,18 +1,19 @@
 # Template file for 'python3-oletools'
 pkgname=python3-oletools
-version=0.56
-revision=2
+version=0.56.1
+revision=1
 wrksrc="oletools-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-parsing python3-olefile python3-colorclass python3-easygui
  python3-msoffcrypto-tool python3-pcodedmp"
+checkdepends="python3-pip python3-wheel $depends"
 short_desc="Python3 library to analyze MS OLE2 and Office files"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/decalage2/oletools"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=9d76d449f1edb1d74996ebf8b117371b5cdde436cfa595b3ff3989ec8d026106
+checksum=827cc577e253d946d5616e0a18062ed6aa837368fc19912c06e7d4c7ed502f77
 
 post_install() {
 	vlicense oletools/LICENSE.txt

From 7f38a29a01b25c6f02419bc473b6f968ed0bb08c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 9 Apr 2021 12:46:49 +0200
Subject: [PATCH 0696/2024] scite: update to 5.0.1.

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

diff --git a/srcpkgs/scite/template b/srcpkgs/scite/template
index 11234338dd0e..e56284d0f4f7 100644
--- a/srcpkgs/scite/template
+++ b/srcpkgs/scite/template
@@ -1,7 +1,7 @@
 # Template file for 'scite'
 pkgname=scite
-version=4.4.6
-revision=2
+version=5.0.1
+revision=1
 create_wrksrc=yes
 hostmakedepends="pkg-config"
 makedepends="gtk+3-devel lua53-devel"
@@ -10,13 +10,16 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://www.scintilla.org/SciTEDownload.html"
 distfiles="https://www.scintilla.org/scite${version//./}.tgz"
-checksum=1c2e6eee6c8aa2e52983d9713a4b1c97d06c376324a3ec8932adfcb9e55d16d1
+checksum=6d5d7b9caa895a3b72245e4b7459a678b9325d497c28bc92bc92f21fd65329b7
 
 post_extract() {
 	sed -i 's/gthread-2.0/& lua/' scite/gtk/makefile
 }
 
 do_build() {
+	make ${makejobs} -C lexilla/src \
+		CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" \
+		CC="$CC $LDFLAGS" CXX="$CXX $LDFLAGS" GTK3=1
 	make ${makejobs} -C scintilla/gtk \
 		CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" \
 		CC="$CC $LDFLAGS" CXX="$CXX $LDFLAGS" GTK3=1

From 64130982952b146bce7528d61945170707c5426d 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, 6 Apr 2021 08:14:42 +0700
Subject: [PATCH 0697/2024] build-helper/qmake: respect {C,CXX,LD}FLAGS
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

As of it's now, package built with build-helper/qmake natively won't
pick our CFLAGS CXXFLAGS and LDFLAGS. The result could be seen in no
debug symbol in djview.

Furthermore, cross build won't pick our hardening flags.

Let's force qmake pick our flags by using the same method as
build-style/qmake.
---
 common/build-helper/qmake.sh | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/common/build-helper/qmake.sh b/common/build-helper/qmake.sh
index 9603cf5baae9..d2a38703b300 100644
--- a/common/build-helper/qmake.sh
+++ b/common/build-helper/qmake.sh
@@ -65,14 +65,36 @@ _EOF
 	# create the qmake-wrapper here because it only
 	# makes sense together with the qmake build-helper
 	# and not to interfere with e.g. the qmake build-style
+	#
+	# XXX: Intentionally quote {C,CXX,LD}FLAGS here but not in native.
+	# - Cross Build:
+	#   + base flags will be picked up from QMAKE_{C,CXX,LD}FLAGS
+	#   + hardening flags will be picked up from environment variables
+	# - Native Build:
+	#   + hardening flags will be picked up first (Makefile, qt.conf?)
+	#   + base flags will be picked up from QMAKE_{C,CXX,LD}FLAGS
+	# Maybe there're better workaround, I don't know.
         cat > "${XBPS_WRAPPERDIR}/qmake" <<_EOF
 #!/bin/sh
-exec /usr/lib/qt5/bin/qmake "\$@" -qtconf "${XBPS_WRAPPERDIR}/qt.conf"
+exec /usr/lib/qt5/bin/qmake "\$@" -qtconf "${XBPS_WRAPPERDIR}/qt.conf" \\
+	QMAKE_CFLAGS+="\${CFLAGS}" \\
+	QMAKE_CXXFLAGS+="\${CXXFLAGS}" \\
+	QMAKE_LFLAGS+="\${LDFLAGS}"
 _EOF
 else
         cat > "${XBPS_WRAPPERDIR}/qmake" <<_EOF
 #!/bin/sh
-exec /usr/lib/qt5/bin/qmake "\$@" CONFIG+=no_qt_rpath
+exec /usr/lib/qt5/bin/qmake \
+	"\$@" \
+	PREFIX=/usr \
+	QT_INSTALL_PREFIX=/usr \
+	LIB=/usr/lib \
+	QMAKE_CC=$CC QMAKE_CXX=$CXX \
+	QMAKE_LINK=$CXX QMAKE_LINK_C=$CC \
+	QMAKE_CFLAGS+="${CFLAGS}" \
+	QMAKE_CXXFLAGS+="${CXXFLAGS}" \
+	QMAKE_LFLAGS+="${LDFLAGS}" \
+	CONFIG+=no_qt_rpath
 _EOF
 fi
 chmod 755 ${XBPS_WRAPPERDIR}/qmake

From 2783127355e12e57adff28f417a884d089b18326 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, 6 Apr 2021 08:17:30 +0700
Subject: [PATCH 0698/2024] djview: fix dbg package

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

diff --git a/srcpkgs/djview/template b/srcpkgs/djview/template
index a6af3f0188d1..76a0d1cc4103 100644
--- a/srcpkgs/djview/template
+++ b/srcpkgs/djview/template
@@ -1,11 +1,11 @@
 # Template file for 'djview'
 pkgname=djview
 version=4.12
-revision=2
+revision=3
 wrksrc="djview4-${version}"
 build_style=gnu-configure
 build_helper=qmake
-configure_args="QMAKE=qmake-qt5 ac_cv_path_QMAKE=${XBPS_WRAPPERDIR}/qmake-qt5"
+configure_args="ac_cv_path_QMAKE=${XBPS_WRAPPERDIR}/qmake-qt5"
 hostmakedepends="automake pkg-config qt5-host-tools qt5-qmake libtool"
 makedepends="qt5-devel djvulibre-devel libxkbcommon-devel libSM-devel libXt-devel"
 short_desc="Portable DjVu viewer and browser plugin"

From ac41ae2932633887bb10f58678db36c68ccc0731 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, 6 Apr 2021 22:31:49 +0700
Subject: [PATCH 0699/2024] abGate: clean up template

- qt5-devel isn't required in hostmakedepends
- Don't rename distfiles
---
 srcpkgs/abGate/template | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/srcpkgs/abGate/template b/srcpkgs/abGate/template
index f772f49e796a..d4fff83840b1 100644
--- a/srcpkgs/abGate/template
+++ b/srcpkgs/abGate/template
@@ -11,10 +11,6 @@ short_desc="LV2 Noise Gate plugin"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-3.0-or-later"
 homepage="http://abgate.sourceforge.net/"
-distfiles="https://github.com/antanasbruzas/abGate/archive/v${version}.tar.gz>${pkgname}-${versiont}.tar.gz"
+distfiles="https://github.com/antanasbruzas/abGate/archive/v${version}.tar.gz"
 checksum=ebee1cc545b088bf6e5989c114e7e34fa9f21ac7fdb1eee3fd067bcf98703b86
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-devel"
-fi
 CXXFLAGS="-fPIC"

From 6c1ad84202ae079dc4918d3e2e064f4022f715fa 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, 6 Apr 2021 22:48:56 +0700
Subject: [PATCH 0700/2024] smplayer: fix dbg package

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

diff --git a/srcpkgs/smplayer/template b/srcpkgs/smplayer/template
index a92e285d3c92..564da633cc17 100644
--- a/srcpkgs/smplayer/template
+++ b/srcpkgs/smplayer/template
@@ -1,7 +1,7 @@
 # Template file for 'smplayer'
 pkgname=smplayer
 version=21.1.0
-revision=1
+revision=2
 build_style=gnu-makefile
 build_helper=qmake
 hostmakedepends="qt5-host-tools qt5-tools qt5-script-devel tar"

From 4fc38a485ba1e9a04db0a717d587748e5cb7636a 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, 5 Apr 2021 23:01:55 +0700
Subject: [PATCH 0701/2024] qjackctl: update checksum

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

diff --git a/srcpkgs/qjackctl/template b/srcpkgs/qjackctl/template
index 688de6749167..8bcba9039fd7 100644
--- a/srcpkgs/qjackctl/template
+++ b/srcpkgs/qjackctl/template
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://qjackctl.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=ca443646daae21c13a6bec11160fe15639ea19c919d4a5607b1d1918dddd60bc
+checksum=867c088ed819f61d2eb1e550d4bb8f6330d8f247ab99843a584d81825f1a5d24
 
 build_options="jack_session"
 build_options_default="jack_session"

From 0f04bc7741c77efce511ef979cf959b6b180b3cf Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 8 Apr 2021 22:40:01 +0300
Subject: [PATCH 0702/2024] growlight: update to 1.2.32.

---
 srcpkgs/growlight/patches/doctest-2.4.6.patch | 74 -------------------
 srcpkgs/growlight/template                    |  4 +-
 2 files changed, 2 insertions(+), 76 deletions(-)
 delete mode 100644 srcpkgs/growlight/patches/doctest-2.4.6.patch

diff --git a/srcpkgs/growlight/patches/doctest-2.4.6.patch b/srcpkgs/growlight/patches/doctest-2.4.6.patch
deleted file mode 100644
index c307ea9d5ef4..000000000000
--- a/srcpkgs/growlight/patches/doctest-2.4.6.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-Index: growlight-1.2.31/tests/gpt.cpp
-===================================================================
---- growlight-1.2.31.orig/tests/gpt.cpp
-+++ growlight-1.2.31/tests/gpt.cpp
-@@ -6,6 +6,9 @@
- 
- #define UUID "\x5E\x86\x90\xEF\xD0\x30\x03\x46\x99\x3D\x54\x6E\xB0\xE7\x1B\x0D"
- 
-+template <typename T>
-+T xnormalise(T value) { return value; }
-+
- TEST_CASE("GPT") {
- 
-   // First eight bytes must be "EFI PART"
-@@ -19,14 +22,14 @@ TEST_CASE("GPT") {
-   SUBCASE("Revision") {
-     gpt_header head;
-     CHECK(0 == initialize_gpt(&head, 512, 4194287, 34, nullptr));
--    CHECK(0x00010000 == head.revision);
-+    CHECK(0x00010000 == xnormalise(head.revision));
-   }
- 
-   // Bytes 0xc--0xf must be >= 92, should be the logical block size
-   SUBCASE("HeaderSize") {
-     gpt_header head;
-     CHECK(0 == initialize_gpt(&head, 512, 4194287, 34, nullptr));
--    CHECK(92 == head.headsize);
-+    CHECK(92 == xnormalise(head.headsize));
-   }
- 
-   // Bytes 0x18--0x1f are the sector of the GPT primary, usually 1
-@@ -34,8 +37,8 @@ TEST_CASE("GPT") {
-   SUBCASE("GPTLBAs") {
-     gpt_header head;
-     CHECK(0 == initialize_gpt(&head, 512, 100000, 34, nullptr));
--    CHECK(1 == head.lba);
--    CHECK(100000 == head.backuplba);
-+    CHECK(1 == xnormalise(head.lba));
-+    CHECK(100000 == xnormalise(head.backuplba));
-   }
- 
-   // Verify the 16-byte UUID is as specified
-@@ -61,17 +64,17 @@ TEST_CASE("GPT") {
-     gpt_header head;
-     CHECK(0 == initialize_gpt(&head, 512, 4194287, 34, UUID));
-     // partition entry size must be a positive multiple of 128 (usually 128)
--    CHECK(0 < head.partsize);
-+    CHECK(0 < xnormalise(head.partsize));
-     CHECK(0 == (head.partsize % 128));
-     // number of partition entries, usually 128 (MINIMUM_GPT_ENTRIES)
--    CHECK(128 <= head.partcount);
-+    CHECK(128 <= xnormalise(head.partcount));
-     auto entries = new gpt_entry[head.partcount];
-     memset(entries, 0, sizeof(*entries) * head.partcount);
-     CHECK(0 == update_crc(&head, entries));
-     // FIXME fix on big-endian!
--    WARN(2006165414 == head.crc);
--    CHECK(0 == head.reserved);
--    CHECK(2874462854 == head.partcrc);
-+    WARN(2006165414 == xnormalise(head.crc));
-+    CHECK(0 == xnormalise(head.reserved));
-+    CHECK(2874462854 == xnormalise(head.partcrc));
-     delete[] entries;
-   }
- 
-@@ -85,7 +88,7 @@ TEST_CASE("GPT") {
-     memset(sector, 0xff, sizeof(sector));
-     gpt_header* head = reinterpret_cast<gpt_header*>(sector);
-     CHECK(0 == initialize_gpt(head, sizeof(sector), 4194287, 34, nullptr));
--    CHECK(92 == head->headsize);
-+    CHECK(92 == xnormalise(head->headsize));
-     for(size_t idx = 92 ; idx < sizeof(sector) ; ++idx){
-       CHECK(0 == sector[idx]);
-     }
diff --git a/srcpkgs/growlight/template b/srcpkgs/growlight/template
index f47402c51221..4456db1f8185 100644
--- a/srcpkgs/growlight/template
+++ b/srcpkgs/growlight/template
@@ -1,6 +1,6 @@
 # Template file for 'growlight'
 pkgname=growlight
-version=1.2.31
+version=1.2.32
 revision=1
 build_style=cmake
 configure_args="$(vopt_bool zfs USE_LIBZFS) $(vopt_bool man USE_PANDOC)"
@@ -14,7 +14,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="https://nick-black.com/dankwiki/index.php/Growlight"
 distfiles="https://github.com/dankamongmen/growlight/archive/v${version}.tar.gz"
-checksum=25cf643d99be88d299756ccb2933868641abecbc26793f5d87cfae93a461e2d6
+checksum=f15357602d04e10a34d5d3f0d83a66a328638ce40c7b20ffaeac68459318edf2
 patch_args=-Np1
 
 build_options="man zfs"

From d572bd7434748ae293fd3e1d3e1cb65a307c0a6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 9 Apr 2021 11:58:59 -0300
Subject: [PATCH 0703/2024] python3-oletools: don't use pip/wheel in
 checkdepends.

python3-pip was necessary because the 'python3 setup.py test' command
was trying to install the oletools package itself:

    error: Command '['/usr/bin/python3', '-m', 'pip', '--disable-pip-version-check', 'wheel', '--no-deps', '-w', '/tmp/tmpjxhh802n', '--quiet', 'oletools>=0.54']' returned non-zero exit status 1.

Switching to pytest as the test runner fixes this.
---
 srcpkgs/python3-oletools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-oletools/template b/srcpkgs/python3-oletools/template
index 73293a1f82d6..a8eede0d38cb 100644
--- a/srcpkgs/python3-oletools/template
+++ b/srcpkgs/python3-oletools/template
@@ -7,7 +7,7 @@ build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-parsing python3-olefile python3-colorclass python3-easygui
  python3-msoffcrypto-tool python3-pcodedmp"
-checkdepends="python3-pip python3-wheel $depends"
+checkdepends="$depends python3-pytest"
 short_desc="Python3 library to analyze MS OLE2 and Office files"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"

From b9ac1548c4acc31158d938578c98924af482c9e6 Mon Sep 17 00:00:00 2001
From: Stefano Ragni <stefano.ragni@outlook.com>
Date: Tue, 6 Apr 2021 17:25:47 +0200
Subject: [PATCH 0704/2024] pipewire: update to 0.3.25

* fix README.voidlinux going in pipewire-doc
* disable SDL2 dep, only used in some examples we don't even ship
* rm INSTALL.msg, configs should be stable now (also mark them in xbps)
* ncursesw.patch is now upstream
---
 srcpkgs/pipewire/INSTALL.msg                  |  3 --
 srcpkgs/pipewire/files/README.voidlinux       |  2 +
 ...07864d3a1739b8dc1a5355057f29b9a37f78.patch | 52 +++++++++++++++++++
 srcpkgs/pipewire/patches/ncursesw.patch       | 11 ----
 srcpkgs/pipewire/template                     | 18 ++++---
 5 files changed, 64 insertions(+), 22 deletions(-)
 delete mode 100644 srcpkgs/pipewire/INSTALL.msg
 create mode 100644 srcpkgs/pipewire/patches/59ed07864d3a1739b8dc1a5355057f29b9a37f78.patch
 delete mode 100644 srcpkgs/pipewire/patches/ncursesw.patch

diff --git a/srcpkgs/pipewire/INSTALL.msg b/srcpkgs/pipewire/INSTALL.msg
deleted file mode 100644
index 8475a2465b7b..000000000000
--- a/srcpkgs/pipewire/INSTALL.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-WARNING: pipewire frequently changes the config file format. If
-you edited /etc/pipewire/pipewire.conf you must recreate it from
-/etc/pipewire/pipewire.conf.new-0.3.xx with your changes on top.
diff --git a/srcpkgs/pipewire/files/README.voidlinux b/srcpkgs/pipewire/files/README.voidlinux
index 7bcb761273b0..0c3d167f0aef 100644
--- a/srcpkgs/pipewire/files/README.voidlinux
+++ b/srcpkgs/pipewire/files/README.voidlinux
@@ -5,3 +5,5 @@ Optional dependencies:
 * `libjack-pipewire` for jack replacement
 * `libspa-bluetooth` for bluetooth support
 * `libspa-jack` for running pipewire and jack side-by-side
+* `libspa-v4l2` for video camera support
+* `rtkit` for realtime priority acquisition
diff --git a/srcpkgs/pipewire/patches/59ed07864d3a1739b8dc1a5355057f29b9a37f78.patch b/srcpkgs/pipewire/patches/59ed07864d3a1739b8dc1a5355057f29b9a37f78.patch
new file mode 100644
index 000000000000..a033bb5fee7f
--- /dev/null
+++ b/srcpkgs/pipewire/patches/59ed07864d3a1739b8dc1a5355057f29b9a37f78.patch
@@ -0,0 +1,52 @@
+From 59ed07864d3a1739b8dc1a5355057f29b9a37f78 Mon Sep 17 00:00:00 2001
+From: Wim Taymans <wtaymans@redhat.com>
+Date: Fri, 9 Apr 2021 11:55:55 +0200
+Subject: [PATCH] media-session: log info when loading monitor fails
+
+Log info in all monitor plugins instead of an error.
+---
+ src/examples/media-session/alsa-monitor.c  | 1 +
+ src/examples/media-session/bluez-monitor.c | 2 +-
+ src/examples/media-session/v4l2-monitor.c  | 1 +
+ 3 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/examples/media-session/alsa-monitor.c b/src/examples/media-session/alsa-monitor.c
+index d97a45a66..72696b772 100644
+--- src/examples/media-session/alsa-monitor.c
++++ src/examples/media-session/alsa-monitor.c
+@@ -1061,6 +1061,7 @@ int sm_alsa_monitor_start(struct sm_media_session *session)
+ 	impl->handle = pw_context_load_spa_handle(context, SPA_NAME_API_ALSA_ENUM_UDEV, NULL);
+ 	if (impl->handle == NULL) {
+ 		res = -errno;
++		pw_log_info("can't load %s: %m", SPA_NAME_API_ALSA_ENUM_UDEV);
+ 		goto out_free;
+ 	}
+ 
+diff --git a/src/examples/media-session/bluez-monitor.c b/src/examples/media-session/bluez-monitor.c
+index 9481d4472..5a4f30d48 100644
+--- src/examples/media-session/bluez-monitor.c
++++ src/examples/media-session/bluez-monitor.c
+@@ -586,7 +586,7 @@ int sm_bluez5_monitor_start(struct sm_media_session *session)
+ 	impl->handle = pw_context_load_spa_handle(context, SPA_NAME_API_BLUEZ5_ENUM_DBUS, &impl->props->dict);
+ 	if (impl->handle == NULL) {
+ 		res = -errno;
+-		pw_log_error("can't load %s: %m", SPA_NAME_API_BLUEZ5_ENUM_DBUS);
++		pw_log_info("can't load %s: %m", SPA_NAME_API_BLUEZ5_ENUM_DBUS);
+ 		goto out_free;
+ 	}
+ 	if ((res = spa_handle_get_interface(impl->handle, SPA_TYPE_INTERFACE_Device, &iface)) < 0) {
+diff --git a/src/examples/media-session/v4l2-monitor.c b/src/examples/media-session/v4l2-monitor.c
+index ecb75d085..2b2a92ef3 100644
+--- src/examples/media-session/v4l2-monitor.c
++++ src/examples/media-session/v4l2-monitor.c
+@@ -550,6 +550,7 @@ int sm_v4l2_monitor_start(struct sm_media_session *sess)
+ 	impl->handle = pw_context_load_spa_handle(context, SPA_NAME_API_V4L2_ENUM_UDEV, NULL);
+ 	if (impl->handle == NULL) {
+ 		res = -errno;
++		pw_log_info("can't load %s: %m", SPA_NAME_API_V4L2_ENUM_UDEV);
+ 		goto out_free;
+ 	}
+ 
+-- 
+GitLab
+
diff --git a/srcpkgs/pipewire/patches/ncursesw.patch b/srcpkgs/pipewire/patches/ncursesw.patch
deleted file mode 100644
index 09b8f071c41c..000000000000
--- a/srcpkgs/pipewire/patches/ncursesw.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- meson.build.orig	2021-02-18 14:35:42.028024846 +0100
-+++ meson.build	2021-02-18 14:39:53.808039159 +0100
-@@ -311,7 +311,7 @@
- pthread_lib = dependency('threads')
- dbus_dep = dependency('dbus-1')
- sdl_dep = dependency('sdl2', required : get_option('sdl2'))
--ncurses_dep = dependency('ncurses', required : false)
-+ncurses_dep = dependency('ncursesw', required : false)
- sndfile_dep = dependency('sndfile', version : '>= 1.0.20', required : get_option('sndfile'))
- 
- if get_option('gstreamer')
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 9ab2c72fb8f7..3536c294cb35 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,15 +1,15 @@
 # Template file for 'pipewire'
 pkgname=pipewire
-version=0.3.24
-revision=2
+version=0.3.25
+revision=1
 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"
-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"
+makedepends="ffmpeg-devel gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel
+ libva-devel libbluetooth-devel ncurses-devel libopenaptx-devel fdk-aac-devel
+ libsndfile-devel Vulkan-Headers vulkan-loader $(vopt_if sdl2 SDL2-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>"
@@ -17,8 +17,10 @@ license="MIT"
 homepage="https://pipewire.org/"
 changelog="https://gitlab.freedesktop.org/pipewire/pipewire/-/raw/master/NEWS"
 distfiles="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz"
-checksum=aeca2b44660c4f36eed29cc9c6ccb093ea2778fd0e4ed7665cdfc40b2a49873f
-conf_files="/etc/pipewire/pipewire.conf"
+checksum=fb6d5a0cbde621659ffd67622f19744dd6c8da8745b060cb1951c3d2045e5166
+conf_files="/etc/pipewire/*.conf /etc/pipewire/media-session.d/*.conf"
+
+build_options="sdl2"
 
 replaces="libpulseaudio-pipewire>=0"
 
@@ -154,6 +156,6 @@ libjack-pipewire_package() {
 pipewire-doc_package() {
 	short_desc+=" - documentation"
 	pkg_install() {
-		vmove usr/share/doc
+		vmove usr/share/doc/pipewire/html
 	}
 }

From 9c0b85aac684c418d8e69158d161162ac13bec07 Mon Sep 17 00:00:00 2001
From: "Jiang Meng Liao (Faerryn)" <alexandre.liao@gmail.com>
Date: Thu, 8 Apr 2021 23:29:27 -0400
Subject: [PATCH 0705/2024] MultiMC: added qt5-svg as dependency for proper
 rendering of icons

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

diff --git a/srcpkgs/MultiMC/template b/srcpkgs/MultiMC/template
index 162472b00022..6f19fc623d0a 100644
--- a/srcpkgs/MultiMC/template
+++ b/srcpkgs/MultiMC/template
@@ -1,7 +1,7 @@
 # Template file for 'MultiMC'
 pkgname=MultiMC
 version=0.6.12
-revision=1
+revision=2
 wrksrc="${pkgname}5-${version}"
 _commithashnbt="4b305bbd2ac0e7a26987baf7949a484a87b474d4"
 _nbtversion="multimc-0.6.1"
@@ -10,7 +10,7 @@ build_style=cmake
 configure_args='-DMultiMC_BUILD_PLATFORM=Void -DMultiMC_LAYOUT=lin-system'
 hostmakedepends="openjdk8 xxd git qt5-qmake qt5-host-tools tar"
 makedepends="qt5-devel qt5-x11extras-devel qt5-svg-devel gtk+-devel"
-depends="virtual?java-environment"
+depends="virtual?java-environment qt5-svg"
 short_desc="Instanced Minecraft client"
 maintainer="Henry Naguski <henry@nilsu.org>"
 license="Apache-2.0"

From 4f9b64008156fc4604899282db05b69ddbf364eb Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Fri, 9 Apr 2021 11:40:53 +0300
Subject: [PATCH 0706/2024] speedtest-cli: update to 2.1.3

---
 srcpkgs/speedtest-cli/template | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/speedtest-cli/template b/srcpkgs/speedtest-cli/template
index f797d3666805..a188bbcffc1a 100644
--- a/srcpkgs/speedtest-cli/template
+++ b/srcpkgs/speedtest-cli/template
@@ -1,14 +1,17 @@
 # Template file for 'speedtest-cli'
 pkgname=speedtest-cli
-version=2.1.2
-revision=3
+version=2.1.3
+revision=1
 build_style=python3-module
-pycompile_module="speedtest.py"
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools"
+depends="python3"
 short_desc="Command line bandwidth test using speedtest.net"
 maintainer="Aaron Marcher <info@nulltime.net>"
 license="Apache-2.0"
 homepage="https://github.com/sivel/speedtest-cli"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=a877142eec0ee8dda86519c36fe789480ed6fa603b016b620affd77fbf79b0d9
+checksum=45e3ca21c3ce3c339646100de18db8a26a27d240c29f1c9e07b6c13995a969be
+
+post_install() {
+	vman speedtest-cli.1
+}

From 4acf90f04b0eb73631c5b35a6e9b77463d93c82f Mon Sep 17 00:00:00 2001
From: Urs Schulz <voidpkgs@ursschulz.de>
Date: Fri, 9 Apr 2021 15:10:22 +0200
Subject: [PATCH 0707/2024] miniserve: update to 0.13.0.

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

diff --git a/srcpkgs/miniserve/template b/srcpkgs/miniserve/template
index e9c93967478a..9a04ae8d2b29 100644
--- a/srcpkgs/miniserve/template
+++ b/srcpkgs/miniserve/template
@@ -1,14 +1,15 @@
 # Template file for 'miniserve'
 pkgname=miniserve
-version=0.10.4
+version=0.13.0
 revision=1
 build_style=cargo
+checkdepends="curl"
 short_desc="CLI tool to serve files and dirs over HTTP"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/svenstaro/miniserve"
 distfiles="https://github.com/svenstaro/miniserve/archive/v${version}.tar.gz"
-checksum=03b8549258deb17759d69ad73047429f8420e3eab7588af086caf14e47c96332
+checksum=3578fd2dfe8dbebecd15b1e82cfb6d6656fed5e54ae4fccc4e7a6879b61dd1e1
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|arm*|aarch64*) ;;

From 9fa2e619992b7bde0df03b5f2150b11a9caaa0fa Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 8 Apr 2021 23:27:37 +0300
Subject: [PATCH 0708/2024] dnsmasq: update to 2.85.

Closes: #30097 [via git-merge-pr]
---
 srcpkgs/dnsmasq/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dnsmasq/template b/srcpkgs/dnsmasq/template
index b680b2ad7fae..afa763bd1ab6 100644
--- a/srcpkgs/dnsmasq/template
+++ b/srcpkgs/dnsmasq/template
@@ -1,6 +1,6 @@
 # Template file for 'dnsmasq'
 pkgname=dnsmasq
-version=2.84
+version=2.85
 revision=1
 conf_files="/etc/dnsmasq.conf"
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.thekelleys.org.uk/dnsmasq/doc.html"
 changelog="http://www.thekelleys.org.uk/dnsmasq/CHANGELOG"
 distfiles="http://www.thekelleys.org.uk/dnsmasq/dnsmasq-${version}.tar.gz"
-checksum=4caf385376f34fae5c55244a1f870dcf6f90e037bb7c4487210933dc497f9c36
+checksum=f36b93ecac9397c15f461de9b1689ee5a2ed6b5135db0085916233053ff3f886
 system_accounts="dnsmasq"
 dnsmasq_homedir="/var/chroot"
 

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

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

diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template
index 0196656cc4b8..d10cf878d851 100644
--- a/srcpkgs/gnome-desktop/template
+++ b/srcpkgs/gnome-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-desktop'
 pkgname=gnome-desktop
-version=3.38.4
-revision=2
+version=40.0
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Dgnome_distributor=VoidLinux -Dudev=enabled -Dsystemd=disabled
@@ -16,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-desktop"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3f603ea5bfd47722c92cfc9b885446b46260ea09c8cfb63f6bdd9fefe342e48c
+checksum=20abfd3f831e4e8092b55839311661dc73b2bf13fc9bef71c4a5a4475da9ee04
 
 build_options="gir"
 build_options_default="gir"

From 64985f071b7b9ea32acaadf0565537bd13f2894f Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 2 Apr 2021 14:58:23 -0700
Subject: [PATCH 0710/2024] gsettings-desktop-schemas: update to 40.0

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

diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template
index 76c4b0e08108..9aa049052172 100644
--- a/srcpkgs/gsettings-desktop-schemas/template
+++ b/srcpkgs/gsettings-desktop-schemas/template
@@ -1,6 +1,6 @@
 # Template file for 'gsettings-desktop-schemas'
 pkgname=gsettings-desktop-schemas
-version=3.38.0
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -12,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5704c8266004b296036671f223c705dc046aa694a1b1abb87c67e7d2747a8c67
+checksum=f1b83bf023c0261eacd0ed36066b76f4a520bbcb14bb69c402b7959257125685
 
 # Package build options
 build_options="gir"

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

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

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

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

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

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

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

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

diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template
index ecc62cf27782..824529fa11db 100644
--- a/srcpkgs/gnome-settings-daemon/template
+++ b/srcpkgs/gnome-settings-daemon/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-settings-daemon'
 pkgname=gnome-settings-daemon
-version=3.38.1
+version=40.0
 revision=1
 build_style=meson
 configure_args="-Dsystemd=false"
@@ -19,7 +19,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-settings-daemon"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e28121d91af82a2efa88f166d0c1e306c591f62f01ef7f553d48b6c13f070164
+checksum=e3168081d6a7ea757d77deeaaa33a916081f03fa334c1e70db415fd8f37324db
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" polkit"

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

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

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

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

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

diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index e5b84645b4c9..c76e13c2de12 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -1,7 +1,7 @@
 # Template file for 'gdm'
 pkgname=gdm
-version=3.38.2.1
-revision=3
+version=40.0
+revision=1
 build_helper="gir"
 build_style=meson
 configure_args="
@@ -22,8 +22,8 @@ short_desc="GNOME Display Manager"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GDM"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*.*}/${pkgname}-${version}.tar.xz"
-checksum=ca58a205d5ebfcbdab56a11716b898e16ae5dff21aee79d076046444628ec4da
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=5ed74b739d3a232ffb1e4a132bcf965bdfe955d995b528773588775b02f2950e
 
 conf_files="
 	/etc/gdm/custom.conf

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

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

diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template
index fcdb58795010..6d9b85a07d04 100644
--- a/srcpkgs/libgweather/template
+++ b/srcpkgs/libgweather/template
@@ -1,20 +1,20 @@
 # Template file for 'libgweather'
 pkgname=libgweather
-version=3.36.1
+version=40.0
 revision=1
 build_style=meson
 build_helper="gir"
 configure_args="$(vopt_bool gir enable_vala) $(vopt_bool gir introspection)
  -Dzoneinfo_dir=/usr/share/zoneinfo"
-hostmakedepends="glib-devel intltool pkg-config $(vopt_if gir vala)"
+hostmakedepends="glib-devel intltool pkg-config python3-gobject-devel $(vopt_if gir vala)"
 makedepends="geocode-glib-devel gtk+3-devel libsoup-gnome-devel"
-checkdepends="tzdata"
+depends="tzdata"
 short_desc="GNOME Weather information access library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/LibGWeather"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=de2709f0ee233b20116d5fa9861d406071798c4aa37830ca25f5ef2c0083e450
+checksum=ca4e8f2a4baaa9fc6d75d8856adb57056ef1cd6e55c775ba878ae141b6276ee6
 
 build_options="gir"
 build_options_default="gir"

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

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

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

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

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

diff --git a/common/shlibs b/common/shlibs
index 296b93e5f22b..da280dfcefbd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2924,15 +2924,10 @@ libdecoration.so.0 compiz-core-0.8.14_1
 libcompizconfig.so.0 libcompizconfig-0.8.14_1
 libemeraldengine.so.0 emerald-0.8.14_1
 libhangul.so.1 libhangul-0.1.0_1
-libmutter-7.so.0 mutter-3.37.90_1
-libmutter-clutter-7.so mutter-3.37.90_1
-libmutter-clutter-7.so.0 mutter-3.37.90_1
-libmutter-cogl-path-7.so mutter-3.37.90_1
-libmutter-cogl-path-7.so.0 mutter-3.37.90_1
-libmutter-cogl-7.so mutter-3.37.90_1
-libmutter-cogl-7.so.0 mutter-3.37.90_1
-libmutter-cogl-pango-7.so mutter-3.37.90_1
-libmutter-cogl-pango-7.so.0 mutter-3.37.90_1
+libmutter-8.so.0 mutter-40.0_1
+libmutter-clutter-8.so.0 mutter-40.0_1
+libmutter-cogl-8.so.0 mutter-40.0_1
+libmutter-cogl-pango-8.so.0 mutter-40.0_1
 libgeoclue-2.so.0 geoclue2-2.4.4_1
 libgepub.so.0 libgepub-0.4_1
 libslopy.so.7.5 slop-7.5_1
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 70df3b8cf4be..99bcd13e784f 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,6 +1,6 @@
 # Template file for 'mutter'
 pkgname=mutter
-version=3.38.3
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -19,9 +19,9 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/Mutter/"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b2321e73d1e3fe2e90e6301f42bba07f4d94bc64756a2bf13d75ae9d6faa201f
-shlib_provides="libmutter-clutter-7.so libmutter-cogl-7.so
- libmutter-cogl-pango-7.so libmutter-cogl-path-7.so"
+checksum=7a71b312e5a667c5374895188a506a3f6b671768bcb362b68efdc562773d198e
+shlib_provides="libmutter-clutter-8.so libmutter-cogl-8.so
+ libmutter-cogl-pango-8.so"
 
 # Upstream keeps pulling generated headers even though it can cause race
 # conditions in meson/ninja
@@ -37,9 +37,9 @@ do_check() {
 post_install() {
 	# modify the pkg-config files to respect ${pc_sysrootdir} for variables that are
 	# meant to be called with 'pkg-config --variable'
-	vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-7|g' \
-		 -e 's|^typelibdir.*|typelibdir=${pc_sysrootdir}/${libdir}/mutter-7|g' \
-		 -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-7.pc
+	vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-8|g' \
+		 -e 's|^typelibdir.*|typelibdir=${pc_sysrootdir}/${libdir}/mutter-8|g' \
+		 -i ${DESTDIR}/usr/lib/pkgconfig/libmutter-8.pc
 }
 
 mutter-devel_package() {
@@ -49,7 +49,7 @@ mutter-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove "usr/lib/mutter-7/*.gir"
+		vmove "usr/lib/mutter-8/*.gir"
 		vmove "usr/lib/*.so"
 	}
 }

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

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

diff --git a/srcpkgs/adwaita-icon-theme/template b/srcpkgs/adwaita-icon-theme/template
index 8ddcde9b7873..2ce6e203025c 100644
--- a/srcpkgs/adwaita-icon-theme/template
+++ b/srcpkgs/adwaita-icon-theme/template
@@ -1,6 +1,6 @@
 # Template file for 'adwaita-icon-theme'
 pkgname=adwaita-icon-theme
-version=3.38.0
+version=40.rc
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-3.0-or-later, CC-BY-SA-3.0"
 homepage="https://gitlab.gnome.org/GNOME/adwaita-icon-theme"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6683a1aaf2430ccd9ea638dd4bfe1002bc92b412050c3dba20e480f979faaf97
+checksum=d794a492e8e7db33bdc19898effabc1f1205302e166da522c5351a8eba9da404

From 5af29d06f46f0508db16514ceb7bc6c5ff6aa7fc Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:35:18 +0200
Subject: [PATCH 0720/2024] at-spi2-core: update to 2.40.0.

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

diff --git a/srcpkgs/at-spi2-core/template b/srcpkgs/at-spi2-core/template
index 74e607012012..e1c601f5d816 100644
--- a/srcpkgs/at-spi2-core/template
+++ b/srcpkgs/at-spi2-core/template
@@ -1,6 +1,6 @@
 # Template file for 'at-spi2-core'
 pkgname=at-spi2-core
-version=2.38.0
+version=2.40.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/at-spi2-core"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=84e36c3fe66862133f5fe229772b76aa2526e10de5014a3778f2fa46ce550da5
+checksum=4196a7d30a0051e52a67b8ce4283fe79ae5e4e14a725719934565adf1d333429
 
 # Package build options
 build_options="gir"

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

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

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

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

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

diff --git a/srcpkgs/gcr/template b/srcpkgs/gcr/template
index e91011681956..e42bd6277d1b 100644
--- a/srcpkgs/gcr/template
+++ b/srcpkgs/gcr/template
@@ -1,6 +1,6 @@
 # Template file for 'gcr'
 pkgname=gcr
-version=3.38.0
+version=3.40.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/gcr/${version%.*}/gcr-${version}.tar.xz"
-checksum=a64cc7b65757fc2cd16de1708d132a16d05cd1f62c6eba436d56fe45d4ba27e1
+checksum=b9d3645a5fd953a54285cc64d4fc046736463dbd4dcc25caf5c7b59bed3027f5
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args="-Dgtk_doc=false"

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

also fix cross build.

ref: https://github.com/GNOME/gobject-introspection/commit/db136cbaf88a86081f29afbba3c98eaf006842ac
---
 srcpkgs/gobject-introspection/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template
index c7cc727b6c08..c6e616dd862f 100644
--- a/srcpkgs/gobject-introspection/template
+++ b/srcpkgs/gobject-introspection/template
@@ -1,6 +1,6 @@
 # Template file for 'gobject-introspection'
 pkgname=gobject-introspection
-version=1.64.1
+version=1.68.0
 revision=1
 build_style=meson
 pycompile_dirs="usr/lib/${pkgname}/giscanner"
@@ -13,13 +13,13 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GObjectIntrospection"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=80beae6728c134521926affff9b2e97125749b38d38744dc901f4010ee3e7fa7
+checksum=d229242481a201b84a0c66716de1752bca41db4133672cfcfb37c93eb6e54a27
 python_version=3
 patch_args="-Np1"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" gobject-introspection qemu-user-static prelink-cross"
-	configure_args+=" -Dgi_cross_use_host_gi=true
+	configure_args+=" -Dgi_cross_use_prebuilt_gi=true
 	 -Dgi_cross_binary_wrapper=/usr/bin/g-ir-scanner-qemuwrapper
 	 -Dgi_cross_ldd_wrapper=/usr/bin/g-ir-scanner-lddwrapper
 	 -Dgi_cross_pkgconfig_sysroot_path=${XBPS_CROSS_BASE}"

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

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

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

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

* disable broken tests on musl

* add backport fix.
---
 common/shlibs                                 |  10 +-
 ...lations-on-a-second-load-to-glib-2-68.diff | 130 ++++++++++++++++++
 .../glib/patches/disable-broken-tests.patch   |  28 +++-
 srcpkgs/glib/template                         |   6 +-
 srcpkgs/glib/update                           |   1 +
 5 files changed, 160 insertions(+), 15 deletions(-)
 create mode 100644 srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff
 create mode 100644 srcpkgs/glib/update

diff --git a/common/shlibs b/common/shlibs
index da280dfcefbd..59c4d07f72f1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -78,11 +78,11 @@ libmagic.so.1 libmagic-5.12_1
 libbluetooth.so.3 libbluetooth-4.58_1
 libwmf-0.2.so.7 libwmf-0.2.8.4_1
 libwmflite-0.2.so.7 libwmf-0.2.8.4_1
-libgthread-2.0.so.0 glib-2.18.0_1
-libglib-2.0.so.0 glib-2.18.0_1
-libgmodule-2.0.so.0 glib-2.18.0_1
-libgio-2.0.so.0 glib-2.18.0_1
-libgobject-2.0.so.0 glib-2.18.0_1
+libgthread-2.0.so.0 glib-2.68.0_1
+libglib-2.0.so.0 glib-2.68.0_1
+libgmodule-2.0.so.0 glib-2.68.0_1
+libgio-2.0.so.0 glib-2.68.0_1
+libgobject-2.0.so.0 glib-2.68.0_1
 libatk-1.0.so.0 atk-1.26.0_1
 libpangocairo-1.0.so.0 pango-1.24.0_1
 libpangoft2-1.0.so.0 pango-1.24.0_1
diff --git a/srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff b/srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff
new file mode 100644
index 000000000000..d3da19b4e10d
--- /dev/null
+++ b/srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff
@@ -0,0 +1,130 @@
+From 07ab2e26c937a93ae7389e002014e32aa78e4ec6 Mon Sep 17 00:00:00 2001
+From: Philip Withnall <pwithnall@endlessos.org>
+Date: Tue, 23 Mar 2021 16:27:49 +0000
+Subject: [PATCH 1/2] gkeyfile: Drop a redundant check
+
+It should not be possible for `->locales` to be set without
+`->checked_locales` being set, so drop the redundant check. This helps
+with branch code coverage.
+
+Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
+---
+ glib/gkeyfile.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git glib/gkeyfile.c glib/gkeyfile.c
+index 50859164b..06c4b7c47 100644
+--- glib/gkeyfile.c
++++ glib/gkeyfile.c
+@@ -1232,7 +1232,7 @@ g_key_file_locale_is_interesting (GKeyFile    *key_file,
+   if (key_file->flags & G_KEY_FILE_KEEP_TRANSLATIONS)
+     return TRUE;
+ 
+-  if (!key_file->checked_locales && !key_file->locales)
++  if (!key_file->checked_locales)
+     {
+       key_file->locales = g_strdupv ((gchar **)g_get_language_names ());
+       key_file->checked_locales = TRUE;
+-- 
+GitLab
+
+
+From 77649d3d3d94b7cd57cd165eb44105d7d196c2e4 Mon Sep 17 00:00:00 2001
+From: Philip Withnall <pwithnall@endlessos.org>
+Date: Tue, 23 Mar 2021 16:28:31 +0000
+Subject: [PATCH 2/2] gkeyfile: Fix crash when parsing translations on a second
+ load
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+If the same `GKeyFile` is reused to load multiple different key files,
+any loads after the first which encounter translated keys will crash,
+because clearing the data from the first load cleared the cached
+language names, but didn’t clear `checked_locales`, so they were never
+reloaded.
+
+Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
+
+Fixes: #2361
+---
+ glib/gkeyfile.c      |  1 +
+ glib/tests/keyfile.c | 43 +++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 44 insertions(+)
+
+diff --git glib/gkeyfile.c glib/gkeyfile.c
+index 06c4b7c47..0b58edb3f 100644
+--- glib/gkeyfile.c
++++ glib/gkeyfile.c
+@@ -648,6 +648,7 @@ g_key_file_clear (GKeyFile *key_file)
+       g_strfreev (key_file->locales);
+       key_file->locales = NULL;
+     }
++  key_file->checked_locales = FALSE;
+ 
+   if (key_file->parse_buffer)
+     {
+diff --git glib/tests/keyfile.c glib/tests/keyfile.c
+index 7530bc8c3..975ef8167 100644
+--- glib/tests/keyfile.c
++++ glib/tests/keyfile.c
+@@ -758,6 +758,48 @@ test_locale_string (void)
+   g_free (old_locale);
+ }
+ 
++static void
++test_locale_string_multiple_loads (void)
++{
++  GKeyFile *keyfile = NULL;
++  GError *local_error = NULL;
++  gchar *old_locale = NULL;
++  guint i;
++  const gchar *data =
++    "[valid]\n"
++    "key1=v1\n"
++    "key1[de]=v1-de\n"
++    "key1[de_DE]=v1-de_DE\n"
++    "key1[de_DE.UTF8]=v1-de_DE.UTF8\n"
++    "key1[fr]=v1-fr\n"
++    "key1[en] =v1-en\n"
++    "key1[sr@Latn]=v1-sr\n";
++
++  g_test_summary ("Check that loading with translations multiple times works");
++  g_test_bug ("https://gitlab.gnome.org/GNOME/glib/-/issues/2361");
++
++  old_locale = g_strdup (setlocale (LC_ALL, NULL));
++  g_setenv ("LANGUAGE", "de", TRUE);
++  setlocale (LC_ALL, "");
++
++  keyfile = g_key_file_new ();
++
++  for (i = 0; i < 3; i++)
++    {
++      g_key_file_load_from_data (keyfile, data, -1, G_KEY_FILE_NONE, &local_error);
++      g_assert_no_error (local_error);
++
++      check_locale_string_value (keyfile, "valid", "key1", "it", "v1");
++      check_locale_string_value (keyfile, "valid", "key1", "de", "v1-de");
++      check_locale_string_value (keyfile, "valid", "key1", "de_DE", "v1-de");
++    }
++
++  g_key_file_free (keyfile);
++
++  setlocale (LC_ALL, old_locale);
++  g_free (old_locale);
++}
++
+ static void
+ test_lists (void)
+ {
+@@ -1791,6 +1833,7 @@ main (int argc, char *argv[])
+   g_test_add_func ("/keyfile/boolean", test_boolean);
+   g_test_add_func ("/keyfile/number", test_number);
+   g_test_add_func ("/keyfile/locale-string", test_locale_string);
++  g_test_add_func ("/keyfile/locale-string/multiple-loads", test_locale_string_multiple_loads);
+   g_test_add_func ("/keyfile/lists", test_lists);
+   g_test_add_func ("/keyfile/lists-set-get", test_lists_set_get);
+   g_test_add_func ("/keyfile/group-remove", test_group_remove);
+-- 
+GitLab
+
diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 15e87215d276..2108faeeda45 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -1,8 +1,8 @@
 diff --git gio/tests/meson.build gio/tests/meson.build
-index d8ebd56..be72f5c 100644
+index a926ae01a..c2093cf4e 100644
 --- gio/tests/meson.build
 +++ gio/tests/meson.build
-@@ -35,7 +35,6 @@ gio_tests = {
+@@ -50,7 +50,6 @@ gio_tests = {
    'cancellable' : {},
    'contexts' : {},
    'contenttype' : {},
@@ -10,7 +10,15 @@ index d8ebd56..be72f5c 100644
    'credentials' : {},
    'data-input-stream' : {},
    'data-output-stream' : {},
-@@ -550,7 +549,7 @@ if installed_tests_enabled
+@@ -74,7 +73,6 @@ gio_tests = {
+   'network-monitor' : {},
+   'network-monitor-race' : {},
+   'permission' : {},
+-  'pollable' : {'dependencies' : [libdl_dep]},
+   'proxy-test' : {},
+   'readwrite' : {},
+   'simple-async-result' : {},
+@@ -567,7 +565,7 @@ if installed_tests_enabled
    endforeach
  endif
  
@@ -20,21 +28,24 @@ index d8ebd56..be72f5c 100644
    plugin_resources_c = custom_target('plugin-resources.c',
      input : 'test4.gresource.xml',
 diff --git glib/tests/meson.build glib/tests/meson.build
-index 6eb23e8..d7aacfa 100644
+index c77ccdd14..b0dab692a 100644
 --- glib/tests/meson.build
 +++ glib/tests/meson.build
-@@ -11,18 +11,11 @@ glib_tests = {
+@@ -11,21 +11,13 @@ glib_tests = {
    'cache' : {},
    'charset' : {},
    'checksum' : {},
 -  'collate' : {},
    'cond' : {},
 -  'convert' : {},
+   'cxx' : {
+     'source' : ['cxx.cpp'],
+   },
    'dataset' : {},
 -  'date' : {},
    'dir' : {},
    'environment' : {},
-   'error' : {},
+-  'error' : {},
 -  'fileutils' : {},
 -  'gdatetime' : {
 -    'suite' : ['slow'],
@@ -42,7 +53,7 @@ index 6eb23e8..d7aacfa 100644
    'guuid' : {},
    'gvariant' : {
      'suite' : ['slow'],
-@@ -54,7 +47,6 @@ glib_tests = {
+@@ -57,7 +49,6 @@ glib_tests = {
    'mutex' : {},
    'node' : {},
    'once' : {},
@@ -50,3 +61,6 @@ index 6eb23e8..d7aacfa 100644
    'option-argv0' : {},
    'overflow' : {},
    'overflow-fallback' : {
+-- 
+2.31.0
+
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 6cba65bad221..a412a0fb08a7 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,6 +1,6 @@
 # Template file for 'glib'
 pkgname=glib
-version=2.66.8
+version=2.68.0
 revision=1
 build_style=meson
 # static version is necessary for qemu-user-static;
@@ -9,14 +9,14 @@ configure_args="-Dfam=false -Dman=true -Dselinux=disabled
  $(vopt_bool gtk_doc gtk_doc) --default-library=both -Db_lto=false"
 hostmakedepends="gettext pkg-config libxslt docbook-xsl $(vopt_if gtk_doc gtk-doc)"
 makedepends="zlib-devel pcre-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
-checkdepends="desktop-file-utils shared-mime-info tzdata dbus"
+checkdepends="desktop-file-utils shared-mime-info tzdata dbus python3-pytest"
 short_desc="GNU library of C routines"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GLib"
 changelog="https://gitlab.gnome.org/GNOME/glib/raw/master/NEWS"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=97bc87dd91365589af5cbbfea2574833aea7a1b71840fd365ecd2852c76b9c8b
+checksum=67734f584f3a05a2872f57e9a8db38f3b06c7087fb531c5a839d9171968103ea
 
 build_options="gtk_doc"
 desc_option_gtk_doc="Build GTK API docs"
diff --git a/srcpkgs/glib/update b/srcpkgs/glib/update
new file mode 100644
index 000000000000..89470583c5dc
--- /dev/null
+++ b/srcpkgs/glib/update
@@ -0,0 +1 @@
+site="https://gitlab.gnome.org/GNOME/glib/-/tags"

From 00084c7ec69e2d7743c37c2c0248ae9cfeb31522 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 12:55:03 +0200
Subject: [PATCH 0726/2024] glib-networking: update to 2.68.0.

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

diff --git a/srcpkgs/glib-networking/template b/srcpkgs/glib-networking/template
index 96f312cff4d8..fdb7fbfe8d1a 100644
--- a/srcpkgs/glib-networking/template
+++ b/srcpkgs/glib-networking/template
@@ -1,6 +1,6 @@
 # Template file for 'glib-networking'
 pkgname=glib-networking
-version=2.66.0
+version=2.68.0
 revision=1
 build_style=meson
 configure_args="-Dinstalled_tests=false -Dgnutls=enabled -Dlibproxy=enabled
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/glib-networking/"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c5d7be2437fdd196eebfb70c4517b96d3ba7ec13bd496318b8f02dea383e0099
+checksum=0b235e85ad26b3c0d12255d0963c460e5a639c4722f78e2a03e969e224b29f6e
 lib32disabled=yes
 
 post_install() {

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

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

diff --git a/srcpkgs/gnome-backgrounds/template b/srcpkgs/gnome-backgrounds/template
index 0fac0bb3beee..e8906d11e54e 100644
--- a/srcpkgs/gnome-backgrounds/template
+++ b/srcpkgs/gnome-backgrounds/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-backgrounds'
 pkgname=gnome-backgrounds
-version=3.38.0
+version=40.rc
 revision=1
 build_style=meson
 hostmakedepends=gettext
@@ -9,4 +9,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, CC-BY-2.0, CC-BY-SA-2.0, CC-BY-SA-3.0"
 homepage="https://gitlab.gnome.org/GNOME/gnome-backgrounds"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f7712a873a80c9a9fcf3952611effeb2d9aed23a3e8abfcda8afb15c427d1ee3
+checksum=8d28dacbf17e8fc5cad030ce027398befbfb2c0034ae14a8e6a7af3336fda679

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/srcpkgs/python3-gobject/template b/srcpkgs/python3-gobject/template
index 219749a5acb7..851af74f1da4 100644
--- a/srcpkgs/python3-gobject/template
+++ b/srcpkgs/python3-gobject/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-gobject'
 pkgname=python3-gobject
-version=3.38.0
+version=3.40.1
 revision=1
 wrksrc="pygobject-${version}"
 build_style=meson
@@ -9,12 +9,17 @@ configure_args="-Dpython=python${py3_ver}"
 hostmakedepends="pkg-config python3 python3-MarkupSafe"
 makedepends="libglib-devel python3-cairo-devel python3-devel"
 depends="gir-freedesktop python3-cairo"
+checkdepends="python3-pytest gtk+3 xvfb-run"
 short_desc="Python3 bindings for GObject"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://pygobject.readthedocs.io/"
 distfiles="${GNOME_SITE}/pygobject/${version%.*}/pygobject-${version}.tar.xz"
-checksum=0372d1bb9122fc19f500a249b1f38c2bb67485000f5887497b4b205b3e7084d5
+checksum=00c6d591f4cb40c335ab1fd3e8c17869ba15cfda54416fe363290af766790035
+
+pre_check() {
+	make_cmd="xvfb-run ninja"
+}
 
 python3-gobject-devel_package() {
 	depends="libgirepository-devel python3-cairo-devel

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

From 3f613c34c4c76bf6de09f7f83bc47fdb7bedac6e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:12:25 +0200
Subject: [PATCH 0742/2024] gnome-user-docs: update to 40.0.

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

diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template
index a4ab3218bd75..8edb370dc144 100644
--- a/srcpkgs/gnome-user-docs/template
+++ b/srcpkgs/gnome-user-docs/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-user-docs'
 pkgname=gnome-user-docs
-version=3.38.2
+version=40.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="gettext pkg-config itstool"
@@ -12,4 +12,4 @@ license="CC-BY-3.0"
 homepage="https://github.com/GNOME/gnome-user-docs"
 #changelog="https://raw.githubusercontent.com/GNOME/gnome-user-docs/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f50cbb3a39dd6290c82f9476159606751ec9f25baafafb4c7c95b10f90f534c1
+checksum=3174480d218da25828b377e105117c135d13b7a2f566fd317e32748f37263a91

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

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

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

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

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

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

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

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

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

From d10ea5a073835dfd6f5dfe03f5695fbb8c1a7cc5 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 15:57:50 +0200
Subject: [PATCH 0746/2024] yelp-xsl: update to 40.0.

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

diff --git a/srcpkgs/yelp-xsl/template b/srcpkgs/yelp-xsl/template
index 88899d2ed720..3feefeb7a097 100644
--- a/srcpkgs/yelp-xsl/template
+++ b/srcpkgs/yelp-xsl/template
@@ -1,7 +1,7 @@
 # Template file for 'yelp-xsl'
 # keep up to date with yelp
 pkgname=yelp-xsl
-version=3.38.3
+version=40.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool itstool libxslt"
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Yelp/Xsl"
 changelog="https://gitlab.gnome.org/GNOME/yelp-xsl/-/raw/gnome-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=193b6abd4697b7b421e98c36d4d3135da0b0fdb51aa53e602ed368dd84d1fd03
+checksum=361ecd4d33fccdb3bb08a687f60e5c3e909d2e9e3b022d844e049820d0cf62b0

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

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

diff --git a/srcpkgs/yelp-tools/template b/srcpkgs/yelp-tools/template
index 350610e33976..96b854281302 100644
--- a/srcpkgs/yelp-tools/template
+++ b/srcpkgs/yelp-tools/template
@@ -1,9 +1,9 @@
 # Template file for 'yelp-tools'
 pkgname=yelp-tools
-version=3.38.0
+version=40.0
 revision=1
-build_style=gnu-configure
-hostmakedepends="pkg-config itstool libxslt"
+build_style=meson
+hostmakedepends="pkg-config itstool libxslt python3-lxml"
 makedepends="yelp-xsl"
 depends="itstool libxslt yelp-xsl"
 short_desc="Tools for creating Yelp documentation"
@@ -11,4 +11,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=607ce4b3ee8517c42db924a01a78660a03317595c75825731ea86a920e2b04b0
+checksum=664bacf2f3dd65ef00a43f79487351ab64a6c4c629c56ac0ceb1723c2eb66aae

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

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

diff --git a/srcpkgs/yelp/template b/srcpkgs/yelp/template
index 0fa0bae4f07e..3074cbc03ca2 100644
--- a/srcpkgs/yelp/template
+++ b/srcpkgs/yelp/template
@@ -1,6 +1,6 @@
 # Template file for 'yelp'
 pkgname=yelp
-version=3.38.3
+version=40.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --disable-static"
@@ -15,7 +15,7 @@ homepage="https://wiki.gnome.org/Apps/Yelp"
 # change this when it moves to a new major release
 changelog="https://gitlab.gnome.org/GNOME/yelp/-/raw/gnome-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=afd46a4d0aeb46bb425c520071d818f8b2b32e69e756abfd997968769a61549d
+checksum=07775fa06cd28365ecd829bb16a85a682897ab21d8cce34596bbef5cd455aae0
 
 yelp-devel_package() {
 	depends="yelp-${version}_${revision}"

From dd255ed668d27f665b4335d394f567561edad1c0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:05:07 +0200
Subject: [PATCH 0749/2024] gnome-shell-extensions: update to 40.0.

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

diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template
index 4ea740326654..ba043950982e 100644
--- a/srcpkgs/gnome-shell-extensions/template
+++ b/srcpkgs/gnome-shell-extensions/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell-extensions'
 pkgname=gnome-shell-extensions
-version=3.38.2
+version=40.0
 revision=1
 build_style=meson
 configure_args="-Dextension_set=all"
@@ -11,4 +11,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=57a44279a750215af51ff29162b7b7a7b287f6afa0a28bb51d3b27b2cb49f643
+checksum=172d85b2819ac9825c0ce91ed7324394d2e03b6569c4e8b60edd8a9e2f990a96

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

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

diff --git a/srcpkgs/eog/template b/srcpkgs/eog/template
index 2abc43032b5e..ee03076dacc1 100644
--- a/srcpkgs/eog/template
+++ b/srcpkgs/eog/template
@@ -1,6 +1,6 @@
 # Template file for 'eog'
 pkgname=eog
-version=3.38.2
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/EyeOfGnome"
 distfiles="${GNOME_SITE}/eog/${version%.*}/eog-${version}.tar.xz"
-checksum=8a54fdf93e306a0f64853a18831ac8c0483820477106aae0bdc00aac37386f0e
+checksum=3017c984f115977c22bc4f9d27d09f80ec96adf6901b4ec0f4f542ef023de5f9
 shlib_provides="libeog.so"
 lib32disabled=yes
 

From de6f5135e20b7561e1a29faa0424e8d8facdf74f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 6 Apr 2021 21:00:57 +0200
Subject: [PATCH 0751/2024] eog-plugins: update to 3.26.7.

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

diff --git a/srcpkgs/eog-plugins/template b/srcpkgs/eog-plugins/template
index 8539e8d814d4..694564da7121 100644
--- a/srcpkgs/eog-plugins/template
+++ b/srcpkgs/eog-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'eog-plugins'
 pkgname=eog-plugins
-version=3.26.5
+version=3.26.7
 revision=1
 build_style=gnu-configure
 pycompile_dirs="usr/lib/eog/plugins"
@@ -8,12 +8,12 @@ hostmakedepends="glib-devel pkg-config intltool"
 makedepends="eog-devel libgdata-devel
  libchamplain-devel libpeas-devel libexif-devel exempi-devel
  gsettings-desktop-schemas-devel gnome-desktop-devel librsvg-devel"
-depends="eog gsettings-desktop-schemas"
+depends="eog gsettings-desktop-schemas python3-gobject"
 short_desc="Eye of GNOME plugins"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=44968e09059272be038c00aaf9796b442a6cd68163a5cb08c98824492a9b5498
-python_version=2 #unverified
+checksum=2ce6c19e29eb723e2362a8b0d9c396e686d065e17acfc584cc8c2b0949a17b3d
+python_version=3
 lib32disabled=yes

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

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

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

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

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

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

From 37298578a64e7d240b37cdf6fe1f1ef4fe90c31b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 8 Apr 2021 11:27:57 +0200
Subject: [PATCH 0754/2024] gnome-latex: rebuild with tepl-6

---
 .../patches/00-port-to-tepl-6.patch           | 99 +++++++++++++++++++
 srcpkgs/gnome-latex/template                  | 10 +-
 2 files changed, 108 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/gnome-latex/patches/00-port-to-tepl-6.patch

diff --git a/srcpkgs/gnome-latex/patches/00-port-to-tepl-6.patch b/srcpkgs/gnome-latex/patches/00-port-to-tepl-6.patch
new file mode 100644
index 000000000000..9c00fa75e891
--- /dev/null
+++ b/srcpkgs/gnome-latex/patches/00-port-to-tepl-6.patch
@@ -0,0 +1,99 @@
+From e1b01186f8a4e5d3fee4c9ccfbedd6d098517df9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Wilmet?= <swilmet@gnome.org>
+Date: Fri, 20 Nov 2020 15:46:36 +0100
+Subject: [PATCH] Port to Tepl 6 (currently 5.99.0, from git master)
+
+---
+ README                      | 2 +-
+ configure.ac                | 4 ++--
+ src/Makefile.am             | 2 +-
+ src/document.vala           | 2 +-
+ src/liblatexila/Makefile.am | 4 ++--
+ 5 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git README README
+index ed0faf7..0dc67d9 100644
+--- README
++++ README
+@@ -21,7 +21,7 @@ Dependencies
+ * GLib >= 2.56
+ * GTK >= 3.22
+ * GtkSourceView >= 4.0
+-* Tepl >= 5.0 - https://wiki.gnome.org/Projects/Tepl
++* Tepl >= 5.99 - https://wiki.gnome.org/Projects/Tepl
+ * gspell >= 1.8
+ * gee-0.8 >= 0.10
+ * gsettings-desktop-schemas
+diff --git configure.ac configure.ac
+index 743a7da..66d5719 100644
+--- configure.ac
++++ configure.ac
+@@ -32,7 +32,7 @@ GLIB_REQUIRED_VERSION="2.56"
+ GTK_REQUIRED_VERSION="3.22"
+ GTKSOURCEVIEW_REQUIRED_VERSION="4.0"
+ AMTK_REQUIRED_VERSION="5.2"
+-TEPL_REQUIRED_VERSION="5.0"
++TEPL_REQUIRED_VERSION="5.99"
+ GSPELL_REQUIRED_VERSION="1.8"
+ VALA_REQUIRED_VERSION="0.46"
+ GEE_REQUIRED_VERSION="0.10"
+@@ -96,7 +96,7 @@ PKG_CHECK_MODULES([DEP], [
+ 	gtk+-3.0 >= ${GTK_REQUIRED_VERSION}
+ 	gtksourceview-4 >= ${GTKSOURCEVIEW_REQUIRED_VERSION}
+ 	amtk-5 >= ${AMTK_REQUIRED_VERSION}
+-	tepl-5 >= ${TEPL_REQUIRED_VERSION}
++	tepl-6 >= ${TEPL_REQUIRED_VERSION}
+ 	gspell-1 >= ${GSPELL_REQUIRED_VERSION}
+ 	gee-0.8 >= ${GEE_REQUIRED_VERSION}
+ 	gsettings-desktop-schemas
+diff --git src/Makefile.am src/Makefile.am
+index 636ca25..73f5a9a 100644
+--- src/Makefile.am
++++ src/Makefile.am
+@@ -8,7 +8,7 @@ AM_VALAFLAGS =					\
+ 	--disable-since-check			\
+ 	--pkg gtk+-3.0				\
+ 	--pkg gtksourceview-4			\
+-	--pkg Tepl-5				\
++	--pkg Tepl-6				\
+ 	--pkg gspell-1				\
+ 	--pkg gee-0.8				\
+ 	--pkg posix				\
+diff --git src/document.vala src/document.vala
+index 520945d..f3afa35 100644
+--- src/document.vala
++++ src/document.vala
+@@ -224,7 +224,7 @@ public class Document : Tepl.Buffer
+                     string primary_msg = _("Impossible to save the file.");
+                     Tepl.InfoBar infobar = new Tepl.InfoBar.simple (MessageType.ERROR,
+                         primary_msg, e.message);
+-                    infobar.add_close_button ();
++                    infobar.setup_close_button ();
+                     tab.add_info_bar (infobar);
+                     infobar.show ();
+                 }
+diff --git src/liblatexila/Makefile.am src/liblatexila/Makefile.am
+index b4e53b5..25c20a9 100644
+--- src/liblatexila/Makefile.am
++++ src/liblatexila/Makefile.am
+@@ -135,7 +135,7 @@ INTROSPECTION_GIRS = Latexila.gir
+ 
+ Latexila.gir: liblatexila.la
+ Latexila_gir_NAMESPACE = Latexila
+-Latexila_gir_INCLUDES = Gtk-3.0 GtkSource-4 Tepl-5
++Latexila_gir_INCLUDES = Gtk-3.0 GtkSource-4 Tepl-6
+ Latexila_gir_LIBS = liblatexila.la
+ Latexila_gir_FILES =				\
+ 	$(liblatexila_public_headers)		\
+@@ -156,7 +156,7 @@ latexila.vapi: Latexila.gir
+ 
+ VAPIGEN_VAPIS = latexila.vapi
+ 
+-latexila_vapi_DEPS = gio-2.0 gtk+-3.0 gtksourceview-4 Tepl-5
++latexila_vapi_DEPS = gio-2.0 gtk+-3.0 gtksourceview-4 Tepl-6
+ latexila_vapi_FILES = Latexila.gir
+ 
+ noinst_DATA += latexila.vapi
+-- 
+GitLab
+
diff --git a/srcpkgs/gnome-latex/template b/srcpkgs/gnome-latex/template
index 83a16f9d4a2a..4739891c8ff2 100644
--- a/srcpkgs/gnome-latex/template
+++ b/srcpkgs/gnome-latex/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-latex'
 pkgname=gnome-latex
 version=3.38.0
-revision=1
+revision=2
 build_helper="gir"
 build_style=gnu-configure
 configure_args="--disable-appstream-util --disable-dconf-migration
@@ -17,5 +17,13 @@ homepage="https://wiki.gnome.org/Apps/GNOME-LaTeX"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=a82a9fc6f056929ea18d6dffd121e71b2c21768808c86ef1f34da0f86e220d77
 
+# for 00-port-to-tepl-6.patch
+hostmakedepends+=" automake gettext-devel-tools libtool"
+
 build_options="gir"
 build_options_default="gir"
+
+pre_configure() {
+	# for 00-port-to-tepl-6.patch
+	autoreconf -fi
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/srcpkgs/gnome-calculator/template b/srcpkgs/gnome-calculator/template
index 220324d3e3c8..e1b23fc9ea25 100644
--- a/srcpkgs/gnome-calculator/template
+++ b/srcpkgs/gnome-calculator/template
@@ -1,12 +1,12 @@
 # Template file for 'gnome-calculator'
 pkgname=gnome-calculator
-version=3.38.2
+version=40.0
 revision=1
 build_style=meson
 build_helper="gir"
 hostmakedepends="cmake gettext glib-devel itstool pkg-config vala"
 makedepends="gsettings-desktop-schemas-devel gtksourceview4-devel libgee08-devel
- libmpc-devel libsoup-devel"
+ libmpc-devel libsoup-devel libhandy1-devel"
 depends="desktop-file-utils gsettings-desktop-schemas hicolor-icon-theme"
 short_desc="GNOME calculator"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -14,4 +14,4 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Calculator"
 changelog="https://raw.githubusercontent.com/GNOME/gnome-calculator/gnome-3-32/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8c83cc6433e015d15aa2a0cf3d0b187f7adb92830d39dd2e66076c73192a316b
+checksum=f3a25988be1170eb9072d8bb3dc46192136fcb0be80182e17bb34618326c4de3

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

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

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

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

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

diff --git a/srcpkgs/gnome-clocks/template b/srcpkgs/gnome-clocks/template
index 72f71f9268cb..488fc6f35538 100644
--- a/srcpkgs/gnome-clocks/template
+++ b/srcpkgs/gnome-clocks/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-clocks'
 pkgname=gnome-clocks
-version=3.38.0
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -15,4 +15,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Clocks"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d956cb050f1ca46b443519e4f59ab204290d6270dec91c74b53895aecc794438
+checksum=c2ea33b1ce6431bb2faf97e0fbc45f7397f784f054e946da4b0d596dc893a309

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/srcpkgs/gnome-terminal/template b/srcpkgs/gnome-terminal/template
index 303ad85bdb18..4430ac709829 100644
--- a/srcpkgs/gnome-terminal/template
+++ b/srcpkgs/gnome-terminal/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-terminal'
 pkgname=gnome-terminal
-version=3.38.3
+version=3.40.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --with-nautilus-extension"
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.3-only"
 homepage="https://wiki.gnome.org/Apps/Terminal"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=11a5b0d635f15fdce7508351a510fbf4e92aa533152a50ff0c7845e3102e4764
+checksum=9d2fe397be0b8b50c4ef96634a2e0480ad9ff56d1431582ecc804907e11fa74e
 lib32disabled=yes
 
 if [ "$CROSS_BUILD" ]; then

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

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

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

From e0bfc7e16a443515d877701876a435a821f46c6a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 16:57:42 +0200
Subject: [PATCH 0770/2024] gnome-weather: update to 40.0.

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

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

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

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

diff --git a/srcpkgs/gspell/template b/srcpkgs/gspell/template
index a01a5d04ed35..7c4228fd5757 100644
--- a/srcpkgs/gspell/template
+++ b/srcpkgs/gspell/template
@@ -1,6 +1,6 @@
 # Template file for 'gspell'
 pkgname=gspell
-version=1.8.3
+version=1.8.4
 revision=1
 build_style=gnu-configure
 build_helper="gir"
@@ -9,17 +9,22 @@ configure_args="--disable-static $(vopt_enable gir introspection)
 hostmakedepends="pkg-config glib-devel $(vopt_if vala 'vala')"
 makedepends="glib-devel enchant2-devel gtk+3-devel iso-codes
  $(vopt_if vala vala)"
+checkdepends="xvfb-run hunspell-en_US"
 short_desc="Flexible API to add spell checking to a GTK+ application"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/gspell/${version%.*}/gspell-${version}.tar.xz"
-checksum=5ae514dd0216be069176accf6d0049d6a01cfa6a50df4bc06be85f7080b62de8
+checksum=cf4d16a716e813449bd631405dc1001ea89537b8cdae2b8abfb3999212bd43b4
 
 # Package build options
 build_options="gir vala"
 build_options_default="gir vala"
 
+pre_check() {
+	make_cmd="xvfb-run make"
+}
+
 gspell-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

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

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

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

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

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

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

From 6a67f7393df107ea59c1da659890ed1ce5350528 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 19:36:14 +0200
Subject: [PATCH 0774/2024] gnome-builder: update to 3.40.0.

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

diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index 648d91a44b7c..58b2eb4c3711 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-builder'
 pkgname=gnome-builder
-version=3.38.0
-revision=3
+version=3.40.0
+revision=1
 build_style=meson
 build_helper=qemu
 configure_args="-Dwith_webkit=true -Dwith_sysprof=true -Dhelp=true"
@@ -19,7 +19,7 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Builder"
 changelog="https://gitlab.gnome.org/GNOME/gnome-builder/raw/gnome-builder-3-36/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d689538baf8efb1acf7ea607268b1aaa1418d5517d92d4f6946a3dbf814eae55
+checksum=8814c42e622b73bc688efeb20c9751bf3488fc6751ea3ca9316a53e5289be279
 patch_args="-Np1"
 
 case "$XBPS_TARGET_MACHINE" in

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

* make gtk doc a build_option to fix cross. Default is off.
---
 srcpkgs/libvirt-glib/patches/fix-cross.diff | 20 +++++++++++++++++++
 srcpkgs/libvirt-glib/template               | 22 +++++++++++----------
 2 files changed, 32 insertions(+), 10 deletions(-)
 create mode 100644 srcpkgs/libvirt-glib/patches/fix-cross.diff

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

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

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

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

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

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

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

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

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

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

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

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

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

From 20c5526ea8514c580cc74c8f5612e02b9fa51923 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:35:53 +0200
Subject: [PATCH 0780/2024] gnome-books: update to 40.0.

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

diff --git a/srcpkgs/gnome-books/template b/srcpkgs/gnome-books/template
index 1d4974fe1832..feb752614ace 100644
--- a/srcpkgs/gnome-books/template
+++ b/srcpkgs/gnome-books/template
@@ -1,16 +1,16 @@
 # Template file for 'gnome-books'
 pkgname=gnome-books
-version=3.34.0
-revision=2
+version=40.0
+revision=1
 build_helper="gir"
 build_style=meson
 hostmakedepends="pkg-config vala glib-devel librsvg docbook-xsl libxslt
  gettext appstream-glib desktop-file-utils"
-makedepends="gjs-devel gtk+3-devel libglib-devel webkit2gtk-devel tracker-devel
- gnome-desktop-devel evince-devel libgepub-devel"
+makedepends="gjs-devel gtk+3-devel libglib-devel webkit2gtk-devel
+ gnome-desktop-devel evince-devel libgepub-devel tracker3-devel"
 short_desc="E-book manager application for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Books"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ca5716a09e526ee43aa69dafffe5057b30edc648f56f554070c54a1db19d7b94
+checksum=85e56f4e4a5e91fb615c18f32a29c4e672faf885d68959571a10c5262aa28130

From da9ef96204c979a7d8bb39a62ab8bf7e975873a9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 22:52:23 +0200
Subject: [PATCH 0781/2024] gnome-bluetooth: update to 3.34.5.

* fix tests
---
 srcpkgs/gnome-bluetooth/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-bluetooth/template b/srcpkgs/gnome-bluetooth/template
index 9a9480ad0ab1..83d89c0a8acb 100644
--- a/srcpkgs/gnome-bluetooth/template
+++ b/srcpkgs/gnome-bluetooth/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-bluetooth'
 pkgname=gnome-bluetooth
-version=3.34.3
+version=3.34.5
 revision=1
 build_helper="gir"
 build_style=meson
@@ -10,12 +10,13 @@ hostmakedepends="pkg-config intltool itstool $(vopt_if gir gobject-introspection
 makedepends="libXi-devel gtk+3-devel libnotify-devel dconf-devel
  gvfs-devel bluez eudev-libudev-devel libcanberra-devel"
 depends="bluez>=5 dconf>=0.20 gvfs>=1.20 hicolor-icon-theme desktop-file-utils"
+checkdepends="python3-dbus"
 short_desc="GNOME Bluetooth Subsystem"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeBluetooth"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0a068e3bddbbdab46991521e6624098579abe80da242398bdd579c4ca6926422
+checksum=6c949e52c8becc2054daacd604901f66ce5cf709a5fa91c4bb7cacc939b53ea9
 
 build_options="gir"
 build_options_default="gir"

From 5bc127552488923b0fc351578fe7899a20e6be14 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:08:55 +0200
Subject: [PATCH 0782/2024] gnome-usage: update to 3.38.1.

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

diff --git a/srcpkgs/gnome-usage/template b/srcpkgs/gnome-usage/template
index 5ece1950473b..d57dd57a1c82 100644
--- a/srcpkgs/gnome-usage/template
+++ b/srcpkgs/gnome-usage/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-usage'
 pkgname=gnome-usage
-version=3.38.0
+version=3.38.1
 revision=1
 build_style=meson
 hostmakedepends="glib-devel pkg-config vala gettext"
@@ -11,4 +11,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Usage"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=94d58202fd92094ee2a2647ea3f96d0b16b5f5d7f9bf5ae99f1c33117d1a1a57
+checksum=98c766e17e1565711fc74b9a24fd2ed0d5fad7ccb45519612dd4e214768ed393

From 9b3e375f4f79f59e8825081e8485c3a343eccf71 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:09:42 +0200
Subject: [PATCH 0783/2024] gnote: update to 40.0.

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

diff --git a/srcpkgs/gnote/template b/srcpkgs/gnote/template
index 0ed64fd9239b..e2e25c08375f 100644
--- a/srcpkgs/gnote/template
+++ b/srcpkgs/gnote/template
@@ -1,6 +1,6 @@
 # Template file for 'gnote'
 pkgname=gnote
-version=3.38.1
+version=40.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --disable-static"
@@ -13,5 +13,5 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Gnote"
 distfiles="${GNOME_SITE}/gnote/${version%.*}/gnote-${version}.tar.xz"
-checksum=c427d5e177339106e53976ab4f65f8719a48f7f712ce94d2184d545da174b2a9
+checksum=e224caf8bb433dec9a2258ea2f8739afabde577210e7fb17596614569f7d0b3b
 lib32disabled=yes

From 9bdc87d59a0cc44202b6bd831f54401493414794 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:12:17 +0200
Subject: [PATCH 0784/2024] gtk+3: update to 3.24.28.

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

diff --git a/srcpkgs/gtk+3/template b/srcpkgs/gtk+3/template
index 03f4a90c4992..60c6459b24b5 100644
--- a/srcpkgs/gtk+3/template
+++ b/srcpkgs/gtk+3/template
@@ -1,7 +1,7 @@
 # Template file for 'gtk+3'
 # Revbump gtk-layer-shell when updating, otherwise it presents a warning message
 pkgname=gtk+3
-version=3.24.26
+version=3.24.28
 revision=1
 wrksrc="gtk+-${version}"
 build_style=gnu-configure
@@ -28,7 +28,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gtk.org/"
 distfiles="${GNOME_SITE}/gtk+/${version%.*}/gtk+-${version}.tar.xz"
-checksum=2cc1b2dc5cad15d25b6abd115c55ffd8331e8d4677745dd3ce6db725b4fff1e9
+checksum=b04e09763367f1ce932cd2ee3a359d4de150e1c38e7bef7d29aa72557a6b47c6
 
 # Package build options
 build_options="broadway colord cups gir cloudproviders wayland x11"

From 3dcdcfe1f8373b51f6cd532f9b783a3958e77fe2 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:17:06 +0200
Subject: [PATCH 0785/2024] gtkmm: update to 3.24.4.

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

diff --git a/srcpkgs/gtkmm/template b/srcpkgs/gtkmm/template
index 8efe5d72596d..d3beee8a20aa 100644
--- a/srcpkgs/gtkmm/template
+++ b/srcpkgs/gtkmm/template
@@ -1,6 +1,6 @@
 # Template file for 'gtkmm'
 pkgname=gtkmm
-version=3.24.3
+version=3.24.4
 revision=1
 build_style=meson
 hostmakedepends="pkg-config mm-common gdk-pixbuf"
@@ -12,7 +12,7 @@ license="LGPL-2.1-or-later"
 homepage="https://gtkmm.org"
 changelog="https://gitlab.gnome.org/GNOME/gtkmm/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=60497c4f7f354c3bd2557485f0254f8b7b4cf4bebc9fee0be26a77744eacd435
+checksum=9beb71c3e90cfcfb790396b51e3f5e7169966751efd4f3ef9697114be3be6743
 
 do_check() {
 	xvfb-run ninja -C build test

From 27a4637314681e6cfe3f633950dea146b7850e58 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:20:50 +0200
Subject: [PATCH 0786/2024] gtranslator: update to 40.0.

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

diff --git a/srcpkgs/gtranslator/template b/srcpkgs/gtranslator/template
index f9f9d0e3bc13..9f5b702461df 100644
--- a/srcpkgs/gtranslator/template
+++ b/srcpkgs/gtranslator/template
@@ -1,15 +1,16 @@
 # Template file for 'gtranslator'
 pkgname=gtranslator
-version=3.38.0
-revision=2
+version=40.0
+revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config glib-devel itstool"
 makedepends="gettext-devel libglib-devel libdazzle-devel libsoup-devel
  gsettings-desktop-schemas-devel gtk+3-devel gspell-devel
- libxml2-devel json-glib-devel gtksourceview4-devel libgda-devel"
+ libxml2-devel json-glib-devel gtksourceview4-devel libgda-devel
+ libhandy1-devel"
 short_desc="GNOME translation making program"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Gtranslator"
 distfiles="${GNOME_SITE}/gtranslator/${version%.*}/gtranslator-${version}.tar.xz"
-checksum=dbcda9b81a22d9233be18e99fd5c448f6ab05759d1e94c10580bb831ca2d7635
+checksum=ec3eba36dee1c549377d1475aef71748dbaebd295005e1990ea9821f02b38834

From 469ffed1d436a296a5a3bc60235528c00e005e9c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:22:05 +0200
Subject: [PATCH 0787/2024] jsonrpc-glib: update to 3.38.0.

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

diff --git a/srcpkgs/jsonrpc-glib/template b/srcpkgs/jsonrpc-glib/template
index 25ce4b94f799..b17223455261 100644
--- a/srcpkgs/jsonrpc-glib/template
+++ b/srcpkgs/jsonrpc-glib/template
@@ -1,7 +1,7 @@
 # Template file for 'jsonrpc-glib'
 pkgname=jsonrpc-glib
-version=3.32.0
-revision=2
+version=3.38.0
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Denable_gtk_doc=false -Dwith_vapi=$(vopt_if gir true false)
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/jsonrpc-glib"
 changelog="https://raw.githubusercontent.com/GNOME/jsonrpc-glib/jsonrpc-glib-3-32/NEWS"
 distfiles="${GNOME_SITE}/jsonrpc-glib/${version%.*}/jsonrpc-glib-${version}.tar.xz"
-checksum=bc60aa36c8bdc9c701ad490508445633a9f3973ae0bd5bdd0633d5f6ffeea6eb
+checksum=dc5f1914a91152b70fa8fc9a11ede13148ab4af644db27a36632388c927a8a82
 
 build_options="gir vala"
 build_options_default="gir vala"
@@ -34,4 +34,3 @@ jsonrpc-glib-devel_package() {
 		fi
 	}
 }
-

From 412358c8d0427932e3b8642b09b8f644718b65eb Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:25:42 +0200
Subject: [PATCH 0788/2024] libdazzle: update to 3.40.0.

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

diff --git a/srcpkgs/libdazzle/template b/srcpkgs/libdazzle/template
index 9b807be94745..334e0f6a5433 100644
--- a/srcpkgs/libdazzle/template
+++ b/srcpkgs/libdazzle/template
@@ -1,6 +1,6 @@
 # Template file for 'libdazzle'
 pkgname=libdazzle
-version=3.38.0
+version=3.40.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -15,7 +15,7 @@ license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libdazzle"
 changelog="https://gitlab.gnome.org/GNOME/libdazzle/-/raw/${version}/NEWS"
 distfiles="${GNOME_SITE}/libdazzle/${version%.*}/libdazzle-${version}.tar.xz"
-checksum=e18af28217943bcec106585298a91ec3da48aa3ad62fd0992f23f0c70cd1678f
+checksum=dba99a7e65fa6662c012b306e5d0f99ff3b466a46059ea7aa0104aaf65ce4ba5
 
 build_options="gir"
 build_options_default="gir"

From c7e10d9d72774766c986ba809fc0bcb899ff34f4 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:34:33 +0200
Subject: [PATCH 0789/2024] libmanette: update to 0.2.6.

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

diff --git a/srcpkgs/libmanette/template b/srcpkgs/libmanette/template
index c05dff01bf1c..cdf3888ac140 100644
--- a/srcpkgs/libmanette/template
+++ b/srcpkgs/libmanette/template
@@ -1,6 +1,6 @@
 # Template file for 'libmanette'
 pkgname=libmanette
-version=0.2.5
+version=0.2.6
 revision=1
 build_helper="gir"
 build_style=meson
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/aplazas/libmanette"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8006e08480c0cbd4f749ec155827d100447cf23903fad8240a7c4c321aa09a2b
+checksum=63653259a821ec7d90d681e52e757e2219d462828c9d74b056a5f53267636bac
 
 libmanette-devel_package() {
 	depends="libglib-devel ${sourcepkg}>=${version}_${revision}"

From 74825a1c536456dc4abc3bcd9b375f2d5ea577b9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:36:14 +0200
Subject: [PATCH 0790/2024] libgudev: update to 236.

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

diff --git a/srcpkgs/libgudev/template b/srcpkgs/libgudev/template
index 7f95c3ee2db9..47d1b8fc365d 100644
--- a/srcpkgs/libgudev/template
+++ b/srcpkgs/libgudev/template
@@ -1,20 +1,21 @@
 # Template file for 'libgudev'
 pkgname=libgudev
-version=233
+version=236
 revision=1
-build_style=gnu-configure
+build_style=meson
 build_helper="gir"
-configure_args="$(vopt_enable gir introspection) --disable-umockdev"
-hostmakedepends="pkg-config glib-devel"
+configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
+ -Dvala=$(vopt_if vala enabled disabled)"
+hostmakedepends="pkg-config glib-devel $(vopt_if vala vala)"
 makedepends="libglib-devel eudev-libudev-devel"
 short_desc="Library providing GObject bindings for libudev"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://wiki.gnome.org/Projects/libgudev"
 distfiles="${GNOME_SITE}/${pkgname}/${version}/${pkgname}-${version}.tar.xz"
-checksum=587c4970eb23f4e2deee2cb1fb7838c94a78c578f41ce12cac0a3f4a80dabb03
+checksum=e50369d06d594bae615eb7aeb787de304ebaad07a26d1043cef8e9c7ab7c9524
 
-build_options="gir"
+build_options="gir vala"
 build_options_default="gir"
 
 replaces="eudev-libgudev>=0"
@@ -27,6 +28,9 @@ libgudev-devel_package() {
 		vmove usr/include
 		vmove "usr/lib/*.so"
 		vmove usr/lib/pkgconfig
+		if [ "$build_option_vala" ]; then
+			vmove usr/share/vala
+		fi
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
 		fi

From 5cacf995596038e11b0ee0985df774a24e6b9db3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:39:41 +0200
Subject: [PATCH 0791/2024] metacity: update to 3.40.0.

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

diff --git a/srcpkgs/metacity/template b/srcpkgs/metacity/template
index 643ee4396b95..51904e577fbb 100644
--- a/srcpkgs/metacity/template
+++ b/srcpkgs/metacity/template
@@ -1,6 +1,6 @@
 # Template file for 'metacity'
 pkgname=metacity
-version=3.38.0
+version=3.40.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="gettext gettext-devel glib-devel itstool pkg-config yelp-tools zenity"
@@ -15,4 +15,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/metacity"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=81193121b0d85dc93fef5701c00d0caf5313d10d9b19008403a4286cb04e11ac
+checksum=224c1f65487eac21f0c1d9856152343768ee726c48b1a8a2835a46a8ad9015b5

From 1cf6cc907bd2a68d15e61519a2c3f4b300b70c81 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:40:57 +0200
Subject: [PATCH 0792/2024] retro-gtk: update to 1.0.2.

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

diff --git a/srcpkgs/retro-gtk/template b/srcpkgs/retro-gtk/template
index 04ad9cf051b0..6fbb483b6e51 100644
--- a/srcpkgs/retro-gtk/template
+++ b/srcpkgs/retro-gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'retro-gtk'
 pkgname=retro-gtk
-version=1.0.0
+version=1.0.2
 revision=1
 build_style=meson
 build_helper="gir"
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/retro-gtk"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5c7437a768125a6f627d063ed890e9328d4108db52a6d5aa10e52d2f25bb88db
+checksum=7118b0b5f9c1f2f0bc742faf8689eb48b44833efada0f6dbce990ec9783bcbd2
 
 build_options="gir"
 build_options_default="gir"

From 48084606b6f94e14a37fd0dfaa457016aa89749f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:44 +0200
Subject: [PATCH 0793/2024] libpeas: update to 1.30.0.

* fix tests
---
 srcpkgs/libpeas/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libpeas/template b/srcpkgs/libpeas/template
index be9de4fd4c65..c088c6f11478 100644
--- a/srcpkgs/libpeas/template
+++ b/srcpkgs/libpeas/template
@@ -1,7 +1,7 @@
 # Template file for 'libpeas'
 pkgname=libpeas
-version=1.26.0
-revision=2
+version=1.30.0
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Ddemos=false -Dvapi=true"
@@ -9,12 +9,17 @@ hostmakedepends="pkg-config intltool glib-devel python3 lua51"
 makedepends="vala-devel gtk+3-devel python3-gobject-devel
  glade3-devel lua51-devel"
 depends="python3-gobject hicolor-icon-theme"
+checkdepends="xvfb-run"
 short_desc="Gobject-based plugins engine"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Libpeas"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a976d77e20496479a8e955e6a38fb0e5c5de89cf64d9f44e75c2213ee14f7376
+checksum=0bf5562e9bfc0382a9dcb81f64340787542568762a3a367d9d90f6185898b9a3
+
+pre_check() {
+	make_cmd="xvfb-run ninja"
+}
 
 libpeas-devel_package() {
 	depends="libglib-devel gtk+3-devel>=3.8 libgirepository-devel

From 34d8b577183354edf82b140721a037cb749f0819 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 23:44:57 +0200
Subject: [PATCH 0794/2024] libgexiv2: update to 0.12.2.

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

diff --git a/srcpkgs/libgexiv2/template b/srcpkgs/libgexiv2/template
index d1e5e2f53046..41b9138d7f4e 100644
--- a/srcpkgs/libgexiv2/template
+++ b/srcpkgs/libgexiv2/template
@@ -1,6 +1,6 @@
 # Template file for 'libgexiv2'
 pkgname=libgexiv2
-version=0.12.1
+version=0.12.2
 revision=1
 wrksrc="${pkgname/lib/}-${version}"
 build_style=meson
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/gexiv2"
 distfiles="${GNOME_SITE}/gexiv2/${version%.*}/${pkgname/lib/}-${version}.tar.xz"
-checksum=8aeafd59653ea88f6b78cb03780ee9fd61a2f993070c5f0d0976bed93ac2bd77
+checksum=2322b552aca330eef79724a699c51a302345d5e074738578b398b7f2ff97944c
 
 build_options="gir vala"
 build_options_default="gir vala"

From 94fa967ee17a98c13f6932ec45b6a603b3ba0775 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 21:25:41 +0200
Subject: [PATCH 0795/2024] gnome-getting-started-docs: remove, no longer part
 of gnome

---
 srcpkgs/gnome-getting-started-docs/template | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 srcpkgs/gnome-getting-started-docs/template

diff --git a/srcpkgs/gnome-getting-started-docs/template b/srcpkgs/gnome-getting-started-docs/template
deleted file mode 100644
index 63ba35af86de..000000000000
--- a/srcpkgs/gnome-getting-started-docs/template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'gnome-getting-started-docs'
-pkgname=gnome-getting-started-docs
-version=3.38.1
-revision=1
-build_style=gnu-configure
-hostmakedepends="intltool itstool pkg-config"
-short_desc="Getting Started documentation for GNOME"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="CC-BY-SA-3.0"
-homepage="https://gitlab.gnome.org/GNOME/gnome-getting-started-docs"
-#changelog="https://gitlab.gnome.org/GNOME/gnome-getting-started-docs/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=10fbe23f2c3ce427539a4e307a461694d3870b23200464f705b7d81af993c859

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

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

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

From bdef0db2b33d654b3f4532b5a03b299e3cf1cad6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 4 Apr 2021 00:11:48 +0200
Subject: [PATCH 0797/2024] libgxps: update to 0.3.2.

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

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

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

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

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

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

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

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

From 91edd0be4691036713f6419162078923bfd5f675 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 3 Apr 2021 14:56:46 +0200
Subject: [PATCH 0800/2024] planner: update to 2.6.9.

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

diff --git a/srcpkgs/planner/template b/srcpkgs/planner/template
index bfc3ed4c4dde..5b331ba8c2f3 100644
--- a/srcpkgs/planner/template
+++ b/srcpkgs/planner/template
@@ -1,18 +1,18 @@
 # Template file for 'planner'
 pkgname=planner
-version=2.5.7
+version=2.6.9
 revision=1
 build_style=meson
 build_helper="gir"
 hostmakedepends="gettext pkg-config vala glib-devel"
 makedepends="evolution-data-server-devel libgee08-devel granite-devel
- webkit2gtk-devel libsoup-devel"
+ webkit2gtk-devel libsoup-devel libpeas-devel"
 short_desc="Task manager with Todoist support designed for GNU/Linux"
 maintainer="linarcx <linarcx@riseup.net>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/alainm23/planner"
 distfiles="https://github.com/alainm23/planner/archive/${version}.tar.gz"
-checksum=57076a742f6d08fac8bbfe4bf9ed3686d9138d5e41a41c19de3702202278796a
+checksum=40520c9ade68300089494b085ae4cd1ce076606b58d528df57f911fd4fdcdb74
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" evolution-data-server-devel"

From 9563e110e4f73954e5b5b591ed2e384e4107804b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 8 Apr 2021 12:57:10 +0200
Subject: [PATCH 0801/2024] giggle: doesn't need vte290.

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

diff --git a/srcpkgs/giggle/template b/srcpkgs/giggle/template
index 1984fed3f638..8240dd9afcd1 100644
--- a/srcpkgs/giggle/template
+++ b/srcpkgs/giggle/template
@@ -5,7 +5,7 @@ revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config itstool intltool glib-devel git
  automake gettext-devel libtool tar yelp-tools"
-makedepends="gtksourceview-devel vte290-devel"
+makedepends="gtksourceview-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Git repository viewer"
 maintainer="Orphaned <orphan@voidlinux.org>"

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

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

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

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

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

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

From dc57632a1dad9a89219cae500ae89de38aa623bb Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Fri, 9 Apr 2021 05:02:00 +0200
Subject: [PATCH 0804/2024] New package: Converseen-0.9.9.0.

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

diff --git a/srcpkgs/Converseen/template b/srcpkgs/Converseen/template
new file mode 100644
index 000000000000..7117f14e87a9
--- /dev/null
+++ b/srcpkgs/Converseen/template
@@ -0,0 +1,14 @@
+# Template file for 'Converseen'
+pkgname=Converseen
+version=0.9.9.0
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
+makedepends="qt5-devel qt5-tools-devel libmagick-devel ImageMagick"
+depends="ghostscript openexr hicolor-icon-theme"
+short_desc="Free batch image processor"
+maintainer="Justin Jagieniak <justin@jagieniak.net>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/Faster3ck/Converseen"
+distfiles="https://github.com/Faster3ck/Converseen/archive/refs/tags/v${version}.tar.gz"
+checksum=627f2578dd0ec6629118bb781d7a876b41e9319641f711bd18cb9c2221b3ac38

From 5fbae5a3aa3d086d3c1975434b92c608685b1354 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Fri, 9 Apr 2021 20:54:13 +0200
Subject: [PATCH 0805/2024] budgie-desktop: build against mutter-40.0

---
 srcpkgs/budgie-desktop/patches/mutter-8.patch | 12593 ++++++++++++++++
 srcpkgs/budgie-desktop/template               |     2 +-
 2 files changed, 12594 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/budgie-desktop/patches/mutter-8.patch

diff --git a/srcpkgs/budgie-desktop/patches/mutter-8.patch b/srcpkgs/budgie-desktop/patches/mutter-8.patch
new file mode 100644
index 000000000000..8d1754d9067b
--- /dev/null
+++ b/srcpkgs/budgie-desktop/patches/mutter-8.patch
@@ -0,0 +1,12593 @@
+From 0383b5ef679d6ad4555c69bfa8a087e2f61b8679 Mon Sep 17 00:00:00 2001
+From: David Mohammed <fossfreedom@users.noreply.github.com>
+Date: Wed, 3 Mar 2021 15:55:03 +0000
+Subject: [PATCH] Compile with mutter-8 (GNOME 40 beta) (#2094)
+
+* Compile with mutter-8 (GNOME 40 alpha)
+
+* Fix vapigen warnings for 6,7 & 8 alpha
+
+* Add get_settings to custom vapi
+
+* Bypass shim compilation failure
+Note the FixMe - this needs resolving otherwise keyboard shortcuts
+and changing keyboard shortcuts will not work
+
+* Resolve shim FIXME
+
+* Regenerate vapi with mutter.40-beta
+---
+ src/wm/meson.build                |   24 +-
+ src/wm/shim.vala                  |    4 +
+ vapi/Clutter-7.metadata           |   62 +-
+ vapi/Clutter-8.metadata           |  187 +
+ vapi/Meta-7.metadata              |    8 +
+ vapi/Meta-8.metadata              |   85 +
+ vapi/generate-mutter-vapi.sh      |    2 +-
+ vapi/libmutter-7-custom.vala      |    7 +
+ vapi/libmutter-7.vapi             |   30 +-
+ vapi/libmutter-8-custom.vala      |   14 +
+ vapi/libmutter-8.deps             |    6 +
+ vapi/libmutter-8.vapi             | 1535 ++++++
+ vapi/mutter-clutter-7-custom.vala |   42 +
+ vapi/mutter-clutter-7.deps        |    1 +
+ vapi/mutter-clutter-7.vapi        |  322 +-
+ vapi/mutter-clutter-8-custom.vala |   42 +
+ vapi/mutter-clutter-8.deps        |    5 +
+ vapi/mutter-clutter-8.vapi        | 8279 +++++++++++++++++++++++++++++
+ vapi/mutter-cogl-7.vapi           |    6 +
+ vapi/mutter-cogl-8-custom.vala    |  119 +
+ vapi/mutter-cogl-8.deps           |    1 +
+ vapi/mutter-cogl-8.vapi           | 1091 ++++
+ 22 files changed, 11691 insertions(+), 181 deletions(-)
+ create mode 100644 vapi/Clutter-8.metadata
+ create mode 100644 vapi/Meta-8.metadata
+ create mode 100644 vapi/libmutter-8-custom.vala
+ create mode 100644 vapi/libmutter-8.deps
+ create mode 100644 vapi/libmutter-8.vapi
+ create mode 100644 vapi/mutter-clutter-7-custom.vala
+ create mode 100644 vapi/mutter-clutter-8-custom.vala
+ create mode 100644 vapi/mutter-clutter-8.deps
+ create mode 100644 vapi/mutter-clutter-8.vapi
+ create mode 100644 vapi/mutter-cogl-8-custom.vala
+ create mode 100644 vapi/mutter-cogl-8.deps
+ create mode 100644 vapi/mutter-cogl-8.vapi
+
+diff --git src/wm/meson.build src/wm/meson.build
+index 583ce790..17e6bc07 100644
+--- src/wm/meson.build
++++ src/wm/meson.build
+@@ -18,17 +18,25 @@ budgie_wm_sources = [
+ budgie_wm_status_vala_args = []
+ 
+ dep_graphene = dependency('graphene-gobject-1.0', version: '>= 1.10')
+-dep_mutter = dependency('libmutter-7', version: gnome_minimum_version, required: false)
++dep_mutter = dependency('libmutter-8', version: gnome_minimum_version, required: false)
+ if dep_mutter.found()
+-    budgie_wm_status_vala_args += ['-D', 'HAVE_MUTTER_7']
+-    message('Using new libmutter-7 ABI from GNOME 3.38')
+-    vapi_mutter = 'libmutter-7'
++    # Assume mutter-7 compilation argument since no additional code changes required
++    budgie_wm_status_vala_args += ['-D', 'HAVE_MUTTER_8']
++    message('Using new libmutter-8 ABI from GNOME 40')
++    vapi_mutter = 'libmutter-8'
+ else
+-    dep_mutter = dependency('libmutter-6', version: gnome_minimum_version)
+-    budgie_wm_status_vala_args += ['-D', 'HAVE_MUTTER_6']
++    dep_mutter = dependency('libmutter-7', version: gnome_minimum_version, required: false)
+     if dep_mutter.found()
+-        message('Using new libmutter-6 ABI from GNOME 3.36')
+-        vapi_mutter = 'libmutter-6'
++        budgie_wm_status_vala_args += ['-D', 'HAVE_MUTTER_7']
++        message('Using new libmutter-7 ABI from GNOME 3.38')
++        vapi_mutter = 'libmutter-7'
++    else
++        dep_mutter = dependency('libmutter-6', version: gnome_minimum_version)
++        budgie_wm_status_vala_args += ['-D', 'HAVE_MUTTER_6']
++        if dep_mutter.found()
++            message('Using new libmutter-6 ABI from GNOME 3.36')
++            vapi_mutter = 'libmutter-6'
++        endif
+     endif
+ endif
+ 
+diff --git src/wm/shim.vala src/wm/shim.vala
+index 4ba17a8e..5a985aa1 100644
+--- src/wm/shim.vala
++++ src/wm/shim.vala
+@@ -177,7 +177,11 @@ namespace Budgie {
+ 			foreach (string accelerator in grabs.get_keys()) {
+ 				if (grabs[accelerator] == action) {
+ 					var params = new HashTable<string,Variant>(null, null);
++#if HAVE_MUTTER_8
++					params.set("device-name", new Variant.string(dev.get_device_name()));
++#else
+ 					params.set("device-id", new Variant.uint32(dev.id));
++#endif
+ 					params.set("action-mode", new Variant.uint32(action));
+ 					params.set("device-mode", new Variant.string(dev.get_device_node()));
+ 					params.set("timestamp", new Variant.uint32(timestamp));
+diff --git vapi/Clutter-7.metadata vapi/Clutter-7.metadata
+index 1855274d..f7b1d68b 100644
+--- vapi/Clutter-7.metadata
++++ vapi/Clutter-7.metadata
+@@ -2,6 +2,8 @@
+ ActorBox struct
+ Color struct
+ Knot struct
++Margin struct
++PaintVolume struct
+ PathNode struct
+ Perspective struct
+ Units struct
+@@ -35,11 +37,13 @@ value_get_color nullable
+ // method/virtual-method/signal don't match
+ Actor
+ 	.event#method name="emit_event"
+-	.get_paint_volume#method skip
++	.get_paint_volume#virtual_method name="get_paint_volume_vfunc"
++	.get_paint_volume#virtual_method.volume out
+ 	.queue_redraw#signal skip
+ 	.queue_redraw#virtual_method skip
+ Container
+ 	.add_actor skip=false
++	.class_* skip
+ Text
+ 	.activate#method name="try_activate"
+ 	.insert_text#signal skip
+@@ -58,6 +62,12 @@ Container
+ Stage.read_pixels
+ 	.width default=-1
+ 	.height default=-1
++Stage.get_capture_final_size
++	.width out
++	.height out
++	.scale out
++Stage.paint_to_buffer
++    .data type="uint8[]"
+ Text
+ 	.position_to_coords.line_height default=null
+ 
+@@ -70,11 +80,8 @@ LayoutManager
+ 	.create_child_meta skip=false
+ 
+ // Variadic arguments
+-Box
+-	.pack skip=false
+-	.pack_after skip=false
+-	.pack_at skip=false
+-	.pack_before skip=false
++Backend
++	.get_cogl_context skip=false
+ Container
+ 	.child_get skip=false
+ 	.child_set skip=false
+@@ -91,10 +98,6 @@ LayoutManager
+ Script
+ 	.get_objects skip=false
+ 
+-// Changing error domains
+-Texture
+-	.new_from_file throws="Clutter.TextureError"
+-
+ // Skipped upstream for unknown reasons
+ Interval.register_progress_func skip=false
+ get_option_group skip=false
+@@ -111,45 +114,46 @@ ActorBox
+ Units.from_* skip
+ Color
+ 	.new skip
++Margin
++	.new skip
+ 
+ // Class methods
+ container_class_find_child_property skip
+ container_class_list_child_properties skip
+ 
+ // Move symbols
++color_from_* skip
+ units_from_* skip
+ 
+-// Classes marked as out but not double ptr
+-Actor
+-	.get_margin.margin out=false
+-DragAction
+-	.get_drag_area.drag_area out=false
+-InputDevice
+-	.get_coords.point out=false
+-Rect
+-	.get_center.center out=false
+-	.intersection.res out=false
+-	.union.res out=false
+-Timeline
+-	.get_cubic_bezier_progress.c_* out=false
+-ZoomAction
+-	.get_focal_point.point out=false
+-	.get_transformed_focal_point.point out=false
+-
+ // Struct return values
+ color_get_static nullable
+ 
++// Upstream
++Event
++	.get_position.position out
++
++FrameListenerIface skip
++FrameClock.new skip
++
+ // Remove for clutter-2.0
+ /////////////////////////
+ 
++StageView.layout skip
++
+ Stage
+  	.event name="emit_event"
++	.paint_view.redraw_clip type="Cairo.Region"
++
++Capture
++  .image type="Cairo.ImageSurface"
+ 
+ // *Event should be compact classes derived from Clutter.Event
+ Event.type skip=false
+ AnyEvent struct=false base_type="Clutter.Event"
+ ButtonEvent struct=false base_type="Clutter.Event"
+ CrossingEvent struct=false base_type="Clutter.Event"
++DeviceEvent struct=false base_type="Clutter.Event"
++IMEvent struct=false base_type="Clutter.Event"
+ KeyEvent struct=false base_type="Clutter.Event"
+ MotionEvent struct=false base_type="Clutter.Event"
+ ScrollEvent struct=false base_type="Clutter.Event"
+@@ -157,6 +161,10 @@ StageStateEvent struct=false base_type="Clutter.Event"
+ TouchEvent struct=false base_type="Clutter.Event"
+ TouchpadPinchEvent struct=false base_type="Clutter.Event"
+ TouchpadSwipeEvent struct=false base_type="Clutter.Event"
++ProximityEvent struct=false base_type="Clutter.Event"
++PadButtonEvent struct=false base_type="Clutter.Event"
++PadRingEvent struct=false base_type="Clutter.Event"
++PadStripEvent struct=false base_type="Clutter.Event"
+ 
+ // Keysyms used to be CLUTTER_X instead of CLUTTER_KEY_X
+ *#constant skip
+diff --git vapi/Clutter-8.metadata vapi/Clutter-8.metadata
+new file mode 100644
+index 00000000..fa1210f1
+--- /dev/null
++++ vapi/Clutter-8.metadata
+@@ -0,0 +1,187 @@
++// Non mini-object
++ActorBox struct
++Color struct
++Knot struct
++Margin struct
++PaintVolume struct
++PathNode struct
++Perspective struct
++Units struct
++
++*.ref unowned
++
++init.argv unowned
++init_with_args
++	.argv unowned
++Actor
++	.apply_transform.matrix ref
++	.get_abs_allocation_vertices.verts out=false
++Canvas
++	.new symbol_type="constructor"
++Event.type#method name="get_type"
++Image
++	.new symbol_type="constructor"
++
++// ???
++Actor.has_pointer#method name="get_has_pointer"
++InitError errordomain=false
++
++// Not all backing symbols are deprecated
++Actor.pick deprecated=false
++
++// Nullable return values
++Actor
++	.get_parent nullable
++value_get_color nullable
++
++// method/virtual-method/signal don't match
++Actor
++	.event#method name="emit_event"
++	.get_paint_volume#virtual_method name="get_paint_volume_vfunc"
++	.get_paint_volume#virtual_method.volume out
++Container
++	.add_actor skip=false
++	.class_* skip
++Text
++	.activate#method name="try_activate"
++	.insert_text#signal skip
++TextBuffer.get_text#virtual_method name="get_text_with_length"
++
++// virtual/abstract distinction
++Container
++	.lower virtual
++	.raise virtual
++	.*_child_meta#virtual_method virtual
++
++// Default values
++Container
++	.lower.sibling nullable default=null
++	.raise.sibling nullable default=null
++Stage.read_pixels
++	.width default=-1
++	.height default=-1
++Stage.paint_to_buffer
++    .data type="uint8[]"
++Text
++	.position_to_coords.line_height default=null
++
++// Reparented funcs methods can't be instance methods
++feature_available skip
++feature_get_all skip
++
++// Skipped by g-i for unknown reasons
++LayoutManager
++	.create_child_meta skip=false
++
++// Variadic arguments
++Backend
++	.get_cogl_context skip=false
++Container
++	.child_get skip=false
++	.child_set skip=false
++	.remove skip=false
++Interval
++	.new skip=false
++	.get_interval skip=false
++	.set_final skip=false
++	.set_initial skip=false
++	.set_interval skip=false
++LayoutManager
++	.child_get skip=false
++	.child_set skip=false
++Script
++	.get_objects skip=false
++
++// Skipped upstream for unknown reasons
++Interval.register_progress_func skip=false
++get_option_group skip=false
++get_option_group_without_init skip=false
++threads_add_idle skip=false
++threads_add_idle_full skip=false
++threads_add_timeout skip=false
++threads_add_timeout_full skip=false
++
++// struct/class confusion
++ActorBox
++	.new skip
++	.from_vertices skip
++Units.from_* skip
++Color
++	.new skip
++Margin
++	.new skip
++
++// Class methods
++container_class_find_child_property skip
++container_class_list_child_properties skip
++
++// Move symbols
++color_from_* skip
++units_from_* skip
++
++// Struct return values
++color_get_static nullable
++
++// Upstream
++Event
++	.get_position.position out
++
++FrameListenerIface skip
++FrameClock.new skip
++
++// Remove for clutter-2.0
++/////////////////////////
++
++StageView.layout skip
++
++Stage
++ 	.event name="emit_event"
++	.paint_view.redraw_clip type="Cairo.Region"
++
++Capture
++  .image type="Cairo.ImageSurface"
++
++// *Event should be compact classes derived from Clutter.Event
++Event.type skip=false
++AnyEvent struct=false base_type="Clutter.Event"
++ButtonEvent struct=false base_type="Clutter.Event"
++CrossingEvent struct=false base_type="Clutter.Event"
++DeviceEvent struct=false base_type="Clutter.Event"
++IMEvent struct=false base_type="Clutter.Event"
++KeyEvent struct=false base_type="Clutter.Event"
++MotionEvent struct=false base_type="Clutter.Event"
++ScrollEvent struct=false base_type="Clutter.Event"
++TouchEvent struct=false base_type="Clutter.Event"
++TouchpadPinchEvent struct=false base_type="Clutter.Event"
++TouchpadSwipeEvent struct=false base_type="Clutter.Event"
++ProximityEvent struct=false base_type="Clutter.Event"
++PadButtonEvent struct=false base_type="Clutter.Event"
++PadRingEvent struct=false base_type="Clutter.Event"
++PadStripEvent struct=false base_type="Clutter.Event"
++
++// Keysyms used to be CLUTTER_X instead of CLUTTER_KEY_X
++*#constant skip
++COGL skip=false
++CURRENT_TIME skip=false
++FLAVOUR skip=false
++PATH_RELATIVE skip=false
++PRIORITY_REDRAW skip=false
++
++// Clutter devs don't like us creating nested namespaces
++value_* name="value_(.+)" parent="Clutter.Value"
++threads_* name="threads_(.+)" parent="Clutter.Threads"
++threads_add_idle name="add" parent="Clutter.Threads.Idle"
++threads_add_idle_full name="add_full" parent="Clutter.Threads.Idle"
++threads_add_timeout name="add" parent="Clutter.Threads.Timeout"
++threads_add_timeout_full name="add_full" parent="Clutter.Threads.Timeout"
++
++// Backwards compatibility
++Color.alloc symbol_type="function"
++
++BinAlignment deprecated=false deprecated_since=null
++BinAlignment.* deprecated
++BinAlignment.start deprecated=false
++BinLayout.new.*_align default=Clutter.BinAlignment.START
++
++// Possibly keep
++KEY_* skip=false name="KEY_(.+)" type="uint" parent="Clutter.Key"
+diff --git vapi/Meta-7.metadata vapi/Meta-7.metadata
+index 72629fba..ababf5d9 100644
+--- vapi/Meta-7.metadata
++++ vapi/Meta-7.metadata
+@@ -9,6 +9,10 @@ Barrier cheader_filename="meta/barrier.h"
+ BarrierEvent cheader_filename="meta/barrier.h"
+ CloseDialog cheader_filename="meta/meta-close-dialog.h"
+ CursorTracker cheader_filename="meta/meta-cursor-tracker.h"
++CursorTracker.get_for_display parent="Meta.Display" symbol_type="method" instance_idx=0 name="get_cursor_tracker"
++CursorTracker.get_pointer.x out
++CursorTracker.get_pointer.y out
++CursorTracker.get_pointer.mods out
+ Display cheader_filename="meta/display.h"
+ Dnd cheader_filename="meta/meta-dnd.h"
+ IdleMonitor cheader_filename="meta/meta-idle-monitor.h"
+@@ -20,6 +24,10 @@ Preference cheader_filename="meta/prefs.h"
+ RemoteAccessController cheader_filename="meta/meta-remote-access-controller.h"
+ RemoteAccessHandle cheader_filename="meta/meta-remote-access-controller.h"
+ Settings cheader_filename="meta/meta-settings.h"
++Selection cheader_filename="meta/meta-selection.h"
++SelectionSource cheader_filename="meta/meta-selection.h"
++SelectionSourceMemory cheader_filename="meta/meta-selection-source-memory.h"
++SelectionType cheader_filename="meta/meta-selection-source.h"
+ ShadowFactory cheader_filename="meta/meta-shadow-factory.h"
+ ShapedTexture cheader_filename="meta/meta-shaped-texture.h"
+ SoundPlayer cheader_filename="meta/meta-sound-player.h"
+diff --git vapi/Meta-8.metadata vapi/Meta-8.metadata
+new file mode 100644
+index 00000000..0e00117f
+--- /dev/null
++++ vapi/Meta-8.metadata
+@@ -0,0 +1,85 @@
++Backend cheader_filename="meta/meta-backend.h"
++Background cheader_filename="meta/meta-background.h"
++BackgroundActor cheader_filename="meta/meta-background-actor.h"
++BackgroundContent cheader_filename="meta/meta-background-content.h"
++BackgroundGroup cheader_filename="meta/meta-background-group.h"
++BackgroundImage cheader_filename="meta/meta-background-image.h"
++BackgroundImageCache cheader_filename="meta/meta-background-image.h"
++Barrier cheader_filename="meta/barrier.h"
++BarrierEvent cheader_filename="meta/barrier.h"
++CloseDialog cheader_filename="meta/meta-close-dialog.h"
++CursorTracker cheader_filename="meta/meta-cursor-tracker.h"
++CursorTracker.get_for_display parent="Meta.Display" symbol_type="method" instance_idx=0 name="get_cursor_tracker"
++CursorTracker.get_pointer.mods out
++Display cheader_filename="meta/display.h"
++Dnd cheader_filename="meta/meta-dnd.h"
++IdleMonitor cheader_filename="meta/meta-idle-monitor.h"
++InhibitShortcutsDialog cheader_filename="meta/meta-inhibit-shortcuts-dialog.h"
++LaunchContext cheader_filename="meta/meta-launch-context.h"
++Meta cheader_filename="meta/main.h"
++MonitorManager cheader_filename="meta/meta-monitor-manager.h"
++Preference cheader_filename="meta/prefs.h"
++RemoteAccessController cheader_filename="meta/meta-remote-access-controller.h"
++RemoteAccessHandle cheader_filename="meta/meta-remote-access-controller.h"
++Settings cheader_filename="meta/meta-settings.h"
++Selection cheader_filename="meta/meta-selection.h"
++SelectionSource cheader_filename="meta/meta-selection.h"
++SelectionSourceMemory cheader_filename="meta/meta-selection-source-memory.h"
++SelectionType cheader_filename="meta/meta-selection-source.h"
++ShadowFactory cheader_filename="meta/meta-shadow-factory.h"
++ShapedTexture cheader_filename="meta/meta-shaped-texture.h"
++SoundPlayer cheader_filename="meta/meta-sound-player.h"
++Stage cheader_filename="meta/meta-stage.h"
++StartupNotification cheader_filename="meta/meta-startup-notification.h"
++Theme cheader_filename="meta/theme.h"
++WaylandClient cheader_filename="meta/meta-wayland-client.h"
++Window cheader_filename="meta/window.h"
++WindowActor cheader_filename="meta/meta-window-actor.h"
++WindowGroup cheader_filename="meta/meta-window-group.h"
++WindowShape cheader_filename="meta/meta-window-shape.h"
++Workspace cheader_filename="meta/workspace.h"
++WorkspaceManager cheader_filename="meta/meta-workspace-manager.h"
++X11Display cheader_filename="meta/meta-x11-display.h"
++Rectangle struct
++Plugin cheader_filename="meta/meta-plugin.h"
++PluginInfo cheader_filename="meta/meta-plugin.h"
++prefs_* cheader_filename="meta/prefs.h" parent="Meta.Prefs"
++add_verbose_topic parent="Meta.Util" cheader_filename="meta/util.h"
++x11_error_trap_pop parent="Meta.Util" cheader_filename="meta/util.h"
++x11_error_trap_push parent="Meta.Util" cheader_filename="meta/util.h"
++x11_error_trap_pop_with_return parent="Meta.Util" cheader_filename="meta/util.h"
++external_binding_name_for_action parent="Meta.Util" cheader_filename="meta/util.h"
++get_locale_direction parent="Meta.Util" cheader_filename="meta/util.h"
++gravity_to_string parent="Meta.Util" cheader_filename="meta/util.h"
++is_syncing parent="Meta.Util" cheader_filename="meta/util.h"
++is_verbose parent="Meta.Util" cheader_filename="meta/util.h"
++is_wayland_compositor parent="Meta.Util" cheader_filename="meta/util.h"
++later_add parent="Meta.Util" cheader_filename="meta/util.h"
++later_remove parent="Meta.Util" cheader_filename="meta/util.h"
++pop_no_msg_prefix parent="Meta.Util" cheader_filename="meta/util.h"
++push_no_msg_prefix parent="Meta.Util" cheader_filename="meta/util.h"
++rect parent="Meta.Util" cheader_filename="meta/util.h"
++remove_verbose_topic parent="Meta.Util" cheader_filename="meta/util.h"
++unsigned_long_equal parent="Meta.Util" cheader_filename="meta/util.h"
++unsigned_long_hash parent="Meta.Util" cheader_filename="meta/util.h"
++show_dialog parent="Meta.Util" cheader_filename="meta/util.h"
++get_stage_for_display parent="Meta.Compositor" cheader_filename="meta/compositor-mutter.h"
++get_window_actors parent="Meta.Compositor" cheader_filename="meta/compositor-mutter.h"
++get_window_group_for_display parent="Meta.Compositor" cheader_filename="meta/compositor-mutter.h"
++get_top_window_group_for_display parent="Meta.Compositor" cheader_filename="meta/compositor-mutter.h"
++get_feedback_group_for_display parent="Meta.Compositor" cheader_filename="meta/compositor-mutter.h"
++disable_unredirect_for_display parent="Meta.Compositor" cheader_filename="meta/compositor-mutter.h"
++enable_unredirect_for_display parent="Meta.Compositor" cheader_filename="meta/compositor-mutter.h"
++focus_stage_window parent="Meta.Compositor" cheader_filename="meta/compositor-mutter.h"
++keybindings_set_custom_handler parent="Meta.KeyBinding" name="set_custom_handler"
++KeyHandlerFunc.event type="Clutter.KeyEvent?"
++get_backend parent="Meta.Backend"
++Window.focus#signal skip=true
++Window.get_xwindow skip=false
++get_option_context skip=false
++set_gnome_wm_keybindings skip=false
++set_wm_name skip=false
++init skip=false
++run skip=false
++show_dialog skip=false
++get_backend cheader_filename="meta/meta-backend.h"
+diff --git vapi/generate-mutter-vapi.sh vapi/generate-mutter-vapi.sh
+index b233e586..11740435 100755
+--- vapi/generate-mutter-vapi.sh
++++ vapi/generate-mutter-vapi.sh
+@@ -1,7 +1,7 @@
+ #!/bin/bash
+ set -xe
+ 
+-version=${6-7}
++version=${6-8}
+ girdir=$(pkg-config libmutter-$version --variable=girdir)
+ 
+ cd $(dirname $0)
+diff --git vapi/libmutter-7-custom.vala vapi/libmutter-7-custom.vala
+index 1e0b917c..73bc5f1b 100644
+--- vapi/libmutter-7-custom.vala
++++ vapi/libmutter-7-custom.vala
+@@ -5,3 +5,10 @@ public struct before_frame {
+ [CCode (has_type_id = false)]
+ public struct frame {
+ }
++
++namespace Meta {
++	[CCode (cheader_filename = "meta/meta-backend.h", type_id = "meta_backend_get_type ()")]
++	public abstract class Backend : GLib.Object, GLib.Initable {
++        public unowned Meta.Settings get_settings ();
++    }
++}
+\ No newline at end of file
+diff --git vapi/libmutter-7.vapi vapi/libmutter-7.vapi
+index 6bfdc4b7..30f8892c 100644
+--- vapi/libmutter-7.vapi
++++ vapi/libmutter-7.vapi
+@@ -149,7 +149,7 @@ namespace Meta {
+ 		public static void x11_error_trap_push (Meta.X11Display x11_display);
+ 	}
+ 	[CCode (cheader_filename = "meta/meta-backend.h", type_id = "meta_backend_get_type ()")]
+-	public abstract class Backend : GLib.Object, GLib.Initable {
++	public abstract class Backend : GLib.Object, GLib.Initable, GLib.Initable {
+ 		[CCode (has_construct_function = false)]
+ 		protected Backend ();
+ 		[CCode (cheader_filename = "meta/meta-backend.h", cname = "meta_get_backend")]
+@@ -277,9 +277,8 @@ namespace Meta {
+ 	public class CursorTracker : GLib.Object {
+ 		[CCode (has_construct_function = false)]
+ 		protected CursorTracker ();
+-		public static unowned Meta.CursorTracker get_for_display (Meta.Display display);
+ 		public void get_hot (out int x, out int y);
+-		public void get_pointer (int x, int y, Clutter.ModifierType mods);
++		public void get_pointer (out int x, out int y, out Clutter.ModifierType mods);
+ 		public bool get_pointer_visible ();
+ 		public unowned Cogl.Texture get_sprite ();
+ 		public void set_pointer_visible (bool visible);
+@@ -304,6 +303,8 @@ namespace Meta {
+ 		public int get_current_monitor ();
+ 		public uint32 get_current_time ();
+ 		public uint32 get_current_time_roundtrip ();
++		[CCode (cname = "meta_cursor_tracker_get_for_display")]
++		public unowned Meta.CursorTracker get_cursor_tracker ();
+ 		public unowned Meta.Window get_focus_window ();
+ 		public Meta.GrabOp get_grab_op ();
+ 		public uint get_keybinding_action (uint keycode, ulong mask);
+@@ -422,10 +423,12 @@ namespace Meta {
+ 		public static int get_display_configuration_timeout ();
+ 		public bool get_is_builtin_display_on ();
+ 		public int get_monitor_for_connector (string connector);
++		public bool get_panel_orientation_managed ();
+ 		public Meta.MonitorSwitchConfigType get_switch_config ();
+ 		public void switch_config (Meta.MonitorSwitchConfigType config_type);
+ 		[NoAccessorMethod]
+ 		public Meta.Backend backend { owned get; construct; }
++		public bool panel_orientation_managed { get; }
+ 		public signal void confirm_display_change ();
+ 		public signal void monitors_changed ();
+ 		public signal void monitors_changed_internal ();
+@@ -504,7 +507,7 @@ namespace Meta {
+ 		public bool is_recording { get; construct; }
+ 		public signal void stopped ();
+ 	}
+-	[CCode (cheader_filename = "meta/main.h", type_id = "meta_selection_get_type ()")]
++	[CCode (cheader_filename = "meta/meta-selection.h", type_id = "meta_selection_get_type ()")]
+ 	public class Selection : GLib.Object {
+ 		[CCode (has_construct_function = false)]
+ 		public Selection (Meta.Display display);
+@@ -514,7 +517,7 @@ namespace Meta {
+ 		public void unset_owner (Meta.SelectionType selection_type, Meta.SelectionSource owner);
+ 		public signal void owner_changed (uint object, Meta.SelectionSource p0);
+ 	}
+-	[CCode (cheader_filename = "meta/main.h", type_id = "meta_selection_source_get_type ()")]
++	[CCode (cheader_filename = "meta/meta-selection.h", type_id = "meta_selection_source_get_type ()")]
+ 	public class SelectionSource : GLib.Object {
+ 		[CCode (has_construct_function = false)]
+ 		protected SelectionSource ();
+@@ -524,7 +527,7 @@ namespace Meta {
+ 		public virtual signal void activated ();
+ 		public virtual signal void deactivated ();
+ 	}
+-	[CCode (cheader_filename = "meta/main.h", type_id = "meta_selection_source_memory_get_type ()")]
++	[CCode (cheader_filename = "meta/meta-selection-source-memory.h", type_id = "meta_selection_source_memory_get_type ()")]
+ 	public class SelectionSourceMemory : Meta.SelectionSource {
+ 		[CCode (has_construct_function = false, type = "MetaSelectionSource*")]
+ 		public SelectionSourceMemory (string mimetype, GLib.Bytes content);
+@@ -768,6 +771,7 @@ namespace Meta {
+ 		public uint user_time { get; }
+ 		public Meta.WindowType window_type { get; }
+ 		public string wm_class { get; }
++		public signal void monitor_changed (int old_monitor);
+ 		public signal void position_changed ();
+ 		public signal void raised ();
+ 		public signal void shown ();
+@@ -1012,6 +1016,12 @@ namespace Meta {
+ 		BLANK,
+ 		LAST
+ 	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_DEBUG_PAINT_", type_id = "meta_debug_paint_flag_get_type ()")]
++	[Flags]
++	public enum DebugPaintFlag {
++		NONE,
++		OPAQUE_REGION
++	}
+ 	[CCode (cheader_filename = "meta/main.h", cprefix = "META_DEBUG_", type_id = "meta_debug_topic_get_type ()")]
+ 	[Flags]
+ 	public enum DebugTopic {
+@@ -1354,7 +1364,7 @@ namespace Meta {
+ 		CHECK_ALIVE_TIMEOUT;
+ 		public unowned string to_string ();
+ 	}
+-	[CCode (cheader_filename = "meta/main.h", cprefix = "META_", type_id = "meta_selection_type_get_type ()")]
++	[CCode (cheader_filename = "meta/meta-selection-source.h", cprefix = "META_", type_id = "meta_selection_type_get_type ()")]
+ 	public enum SelectionType {
+ 		SELECTION_PRIMARY,
+ 		SELECTION_CLIPBOARD,
+@@ -1491,12 +1501,16 @@ namespace Meta {
+ 	[CCode (cheader_filename = "meta/main.h")]
+ 	public static void add_clutter_debug_flags (Clutter.DebugFlag debug_flags, Clutter.DrawDebugFlag draw_flags, Clutter.PickDebugFlag pick_flags);
+ 	[CCode (cheader_filename = "meta/main.h")]
++	public static void add_debug_paint_flag (Meta.DebugPaintFlag flag);
++	[CCode (cheader_filename = "meta/main.h")]
+ 	public static void clutter_init ();
+ 	[CCode (cheader_filename = "meta/main.h")]
+ 	public static void exit (Meta.ExitCode code);
+ 	[CCode (cheader_filename = "meta/main.h")]
+ 	public static string g_utf8_strndup (string src, size_t n);
+ 	[CCode (cheader_filename = "meta/main.h")]
++	public static Meta.DebugPaintFlag get_debug_paint_flags ();
++	[CCode (cheader_filename = "meta/main.h")]
+ 	public static unowned GLib.OptionContext get_option_context ();
+ 	[CCode (cheader_filename = "meta/main.h")]
+ 	public static bool get_replace_current_wm ();
+@@ -1511,6 +1525,8 @@ namespace Meta {
+ 	[CCode (cheader_filename = "meta/main.h")]
+ 	public static void remove_clutter_debug_flags (Clutter.DebugFlag debug_flags, Clutter.DrawDebugFlag draw_flags, Clutter.PickDebugFlag pick_flags);
+ 	[CCode (cheader_filename = "meta/main.h")]
++	public static void remove_debug_paint_flag (Meta.DebugPaintFlag flag);
++	[CCode (cheader_filename = "meta/main.h")]
+ 	public static void restart (string? message);
+ 	[CCode (cheader_filename = "meta/main.h")]
+ 	public static int run ();
+diff --git vapi/libmutter-8-custom.vala vapi/libmutter-8-custom.vala
+new file mode 100644
+index 00000000..73bc5f1b
+--- /dev/null
++++ vapi/libmutter-8-custom.vala
+@@ -0,0 +1,14 @@
++[CCode (has_type_id = false)]
++public struct before_frame {
++}
++
++[CCode (has_type_id = false)]
++public struct frame {
++}
++
++namespace Meta {
++	[CCode (cheader_filename = "meta/meta-backend.h", type_id = "meta_backend_get_type ()")]
++	public abstract class Backend : GLib.Object, GLib.Initable {
++        public unowned Meta.Settings get_settings ();
++    }
++}
+\ No newline at end of file
+diff --git vapi/libmutter-8.deps vapi/libmutter-8.deps
+new file mode 100644
+index 00000000..d94a615d
+--- /dev/null
++++ vapi/libmutter-8.deps
+@@ -0,0 +1,6 @@
++gtk+-3.0
++json-glib-1.0
++mutter-clutter-8
++x11
++xfixes-4.0
++graphene-gobject-1.0
+diff --git vapi/libmutter-8.vapi vapi/libmutter-8.vapi
+new file mode 100644
+index 00000000..5cdc794f
+--- /dev/null
++++ vapi/libmutter-8.vapi
+@@ -0,0 +1,1535 @@
++/* libmutter-8.vapi generated by vapigen, do not modify. */
++
++[CCode (cprefix = "Meta", gir_namespace = "Meta", gir_version = "8", lower_case_cprefix = "meta_")]
++namespace Meta {
++	namespace Compositor {
++		[CCode (cheader_filename = "meta/compositor-mutter.h", cname = "meta_disable_unredirect_for_display")]
++		public static void disable_unredirect_for_display (Meta.Display display);
++		[CCode (cheader_filename = "meta/compositor-mutter.h", cname = "meta_enable_unredirect_for_display")]
++		public static void enable_unredirect_for_display (Meta.Display display);
++		[CCode (cheader_filename = "meta/compositor-mutter.h", cname = "meta_focus_stage_window")]
++		public static void focus_stage_window (Meta.Display display, uint32 timestamp);
++		[CCode (cheader_filename = "meta/compositor-mutter.h", cname = "meta_get_feedback_group_for_display")]
++		public static unowned Clutter.Actor get_feedback_group_for_display (Meta.Display display);
++		[CCode (cheader_filename = "meta/compositor-mutter.h", cname = "meta_get_stage_for_display")]
++		public static unowned Clutter.Actor get_stage_for_display (Meta.Display display);
++		[CCode (cheader_filename = "meta/compositor-mutter.h", cname = "meta_get_top_window_group_for_display")]
++		public static unowned Clutter.Actor get_top_window_group_for_display (Meta.Display display);
++		[CCode (cheader_filename = "meta/compositor-mutter.h", cname = "meta_get_window_actors")]
++		public static unowned GLib.List<Clutter.Actor> get_window_actors (Meta.Display display);
++		[CCode (cheader_filename = "meta/compositor-mutter.h", cname = "meta_get_window_group_for_display")]
++		public static unowned Clutter.Actor get_window_group_for_display (Meta.Display display);
++	}
++	namespace Prefs {
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_bell_is_audible")]
++		public static bool prefs_bell_is_audible ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_change_workspace_name")]
++		public static void prefs_change_workspace_name (int i, string name);
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_action_double_click_titlebar")]
++		public static GDesktop.TitlebarAction prefs_get_action_double_click_titlebar ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_action_middle_click_titlebar")]
++		public static GDesktop.TitlebarAction prefs_get_action_middle_click_titlebar ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_action_right_click_titlebar")]
++		public static GDesktop.TitlebarAction prefs_get_action_right_click_titlebar ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_attach_modal_dialogs")]
++		public static bool prefs_get_attach_modal_dialogs ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_auto_maximize")]
++		public static bool prefs_get_auto_maximize ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_auto_raise")]
++		public static bool prefs_get_auto_raise ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_auto_raise_delay")]
++		public static int prefs_get_auto_raise_delay ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_button_layout")]
++		public static Meta.ButtonLayout prefs_get_button_layout ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_center_new_windows")]
++		public static bool prefs_get_center_new_windows ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_check_alive_timeout")]
++		public static uint prefs_get_check_alive_timeout ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_compositing_manager")]
++		public static bool prefs_get_compositing_manager ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_cursor_size")]
++		public static int prefs_get_cursor_size ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_cursor_theme")]
++		public static unowned string prefs_get_cursor_theme ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_disable_workarounds")]
++		public static bool prefs_get_disable_workarounds ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_drag_threshold")]
++		public static int prefs_get_drag_threshold ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_draggable_border_width")]
++		public static int prefs_get_draggable_border_width ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_dynamic_workspaces")]
++		public static bool prefs_get_dynamic_workspaces ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_edge_tiling")]
++		public static bool prefs_get_edge_tiling ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_focus_change_on_pointer_rest")]
++		public static bool prefs_get_focus_change_on_pointer_rest ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_focus_mode")]
++		public static GDesktop.FocusMode prefs_get_focus_mode ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_focus_new_windows")]
++		public static GDesktop.FocusNewWindows prefs_get_focus_new_windows ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_force_fullscreen")]
++		public static bool prefs_get_force_fullscreen ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_gnome_accessibility")]
++		public static bool prefs_get_gnome_accessibility ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_gnome_animations")]
++		public static bool prefs_get_gnome_animations ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_keybinding_action")]
++		public static Meta.KeyBindingAction prefs_get_keybinding_action (string name);
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_mouse_button_menu")]
++		public static int prefs_get_mouse_button_menu ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_mouse_button_mods")]
++		public static Meta.VirtualModifier prefs_get_mouse_button_mods ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_mouse_button_resize")]
++		public static int prefs_get_mouse_button_resize ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_num_workspaces")]
++		public static int prefs_get_num_workspaces ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_raise_on_click")]
++		public static bool prefs_get_raise_on_click ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_show_fallback_app_menu")]
++		public static bool prefs_get_show_fallback_app_menu ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_titlebar_font")]
++		public static unowned Pango.FontDescription prefs_get_titlebar_font ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_visual_bell")]
++		public static bool prefs_get_visual_bell ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_visual_bell_type")]
++		public static GDesktop.VisualBellType prefs_get_visual_bell_type ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_workspace_name")]
++		public static unowned string prefs_get_workspace_name (int i);
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_workspaces_only_on_primary")]
++		public static bool prefs_get_workspaces_only_on_primary ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_init")]
++		public static void prefs_init ();
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_set_force_fullscreen")]
++		public static void prefs_set_force_fullscreen (bool whether);
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_set_num_workspaces")]
++		public static void prefs_set_num_workspaces (int n_workspaces);
++		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_set_show_fallback_app_menu")]
++		public static void prefs_set_show_fallback_app_menu (bool whether);
++	}
++	namespace Util {
++		[CCode (cheader_filename = "meta/util.h", cname = "meta_add_verbose_topic")]
++		public static void add_verbose_topic (Meta.DebugTopic topic);
++		[CCode (cheader_filename = "meta/util.h", cname = "meta_external_binding_name_for_action")]
++		public static string external_binding_name_for_action (uint keybinding_action);
++		[CCode (cheader_filename = "meta/util.h", cname = "meta_get_locale_direction")]
++		public static Meta.LocaleDirection get_locale_direction ();
++		[CCode (cheader_filename = "meta/util.h", cname = "meta_gravity_to_string")]
++		public static unowned string gravity_to_string (Meta.Gravity gravity);
++		[CCode (cheader_filename = "meta/util.h", cname = "meta_is_syncing")]
++		public static bool is_syncing ();
++		[CCode (cheader_filename = "meta/util.h", cname = "meta_is_verbose")]
++		public static bool is_verbose ();
++		[CCode (cheader_filename = "meta/util.h", cname = "meta_is_wayland_compositor")]
++		public static bool is_wayland_compositor ();
++		[CCode (cheader_filename = "meta/util.h", cname = "meta_later_add")]
++		public static uint later_add (Meta.LaterType when, owned GLib.SourceFunc func);
++		[CCode (cheader_filename = "meta/util.h", cname = "meta_later_remove")]
++		public static void later_remove (uint later_id);
++		[CCode (cheader_filename = "meta/util.h", cname = "meta_pop_no_msg_prefix")]
++		public static void pop_no_msg_prefix ();
++		[CCode (cheader_filename = "meta/util.h", cname = "meta_push_no_msg_prefix")]
++		public static void push_no_msg_prefix ();
++		[CCode (cheader_filename = "meta/util.h", cname = "meta_rect")]
++		public static Meta.Rectangle? rect (int x, int y, int width, int height);
++		[CCode (cheader_filename = "meta/util.h", cname = "meta_remove_verbose_topic")]
++		public static void remove_verbose_topic (Meta.DebugTopic topic);
++		[CCode (cheader_filename = "meta/util.h", cname = "meta_show_dialog")]
++		public static GLib.Pid show_dialog (string type, string message, string timeout, string display, string ok_text, string cancel_text, string icon_name, int transient_for, GLib.SList<void*> columns, GLib.SList<void*> entries);
++		[CCode (cheader_filename = "meta/util.h", cname = "meta_unsigned_long_equal")]
++		public static int unsigned_long_equal (void* v1, void* v2);
++		[CCode (cheader_filename = "meta/util.h", cname = "meta_unsigned_long_hash")]
++		public static uint unsigned_long_hash (void* v);
++		[CCode (cheader_filename = "meta/util.h", cname = "meta_x11_error_trap_pop")]
++		public static void x11_error_trap_pop (Meta.X11Display x11_display);
++		[CCode (cheader_filename = "meta/util.h", cname = "meta_x11_error_trap_pop_with_return")]
++		public static int x11_error_trap_pop_with_return (Meta.X11Display x11_display);
++		[CCode (cheader_filename = "meta/util.h", cname = "meta_x11_error_trap_push")]
++		public static void x11_error_trap_push (Meta.X11Display x11_display);
++	}
++	[CCode (cheader_filename = "meta/meta-backend.h", type_id = "meta_backend_get_type ()")]
++	public abstract class Backend : GLib.Object, GLib.Initable, GLib.Initable {
++		[CCode (has_construct_function = false)]
++		protected Backend ();
++		[CCode (cheader_filename = "meta/meta-backend.h", cname = "meta_get_backend")]
++		public static unowned Meta.Backend get_backend ();
++		public unowned Meta.Dnd get_dnd ();
++		public unowned Meta.RemoteAccessController get_remote_access_controller ();
++		public unowned Meta.Settings get_settings ();
++		public unowned Clutter.Actor get_stage ();
++		public bool is_rendering_hardware_accelerated ();
++		public void lock_layout_group (uint idx);
++		public void set_keymap (string layouts, string variants, string options);
++		public void set_numlock (bool numlock_state);
++		public signal void keymap_changed ();
++		public signal void keymap_layout_group_changed (uint object);
++		public signal void last_device_changed (Clutter.InputDevice object);
++		public signal void lid_is_closed_changed (bool object);
++	}
++	[CCode (cheader_filename = "meta/meta-background.h", type_id = "meta_background_get_type ()")]
++	public class Background : GLib.Object {
++		[CCode (has_construct_function = false)]
++		public Background (Meta.Display display);
++		public static void refresh_all ();
++		public void set_blend (GLib.File file1, GLib.File file2, double blend_factor, GDesktop.BackgroundStyle style);
++		public void set_color (Clutter.Color color);
++		public void set_file (GLib.File? file, GDesktop.BackgroundStyle style);
++		public void set_gradient (GDesktop.BackgroundShading shading_direction, Clutter.Color color, Clutter.Color second_color);
++		[NoAccessorMethod]
++		public Meta.Display meta_display { owned get; construct; }
++		public signal void changed ();
++	}
++	[CCode (cheader_filename = "meta/meta-background-actor.h", type_id = "meta_background_actor_get_type ()")]
++	public class BackgroundActor : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
++		[CCode (has_construct_function = false, type = "ClutterActor*")]
++		public BackgroundActor (Meta.Display display, int monitor);
++		[NoAccessorMethod]
++		public Meta.Display meta_display { owned get; construct; }
++		[NoAccessorMethod]
++		public int monitor { get; construct; }
++	}
++	[CCode (cheader_filename = "meta/meta-background-content.h", type_id = "meta_background_content_get_type ()")]
++	public class BackgroundContent : GLib.Object, Clutter.Content {
++		[CCode (has_construct_function = false)]
++		protected BackgroundContent ();
++		public static Clutter.Content @new (Meta.Display display, int monitor);
++		public void set_background (Meta.Background background);
++		public void set_gradient (bool enabled, int height, double tone_start);
++		public void set_rounded_clip_bounds (Graphene.Rect? bounds);
++		public void set_rounded_clip_radius (float radius);
++		public void set_vignette (bool enabled, double brightness, double sharpness);
++		[NoAccessorMethod]
++		public Meta.Background background { owned get; set; }
++		[NoAccessorMethod]
++		public double brightness { get; set; }
++		[NoAccessorMethod]
++		public bool gradient { get; set; }
++		[NoAccessorMethod]
++		public int gradient_height { get; set; }
++		[NoAccessorMethod]
++		public double gradient_max_darkness { get; set; }
++		[NoAccessorMethod]
++		public Meta.Display meta_display { owned get; construct; }
++		[NoAccessorMethod]
++		public int monitor { get; construct; }
++		[NoAccessorMethod]
++		public float rounded_clip_radius { get; set; }
++		[NoAccessorMethod]
++		public bool vignette { get; set; }
++		[NoAccessorMethod]
++		public double vignette_sharpness { get; set; }
++	}
++	[CCode (cheader_filename = "meta/meta-background-group.h", type_id = "meta_background_group_get_type ()")]
++	public class BackgroundGroup : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
++		[CCode (has_construct_function = false, type = "ClutterActor*")]
++		public BackgroundGroup ();
++	}
++	[CCode (cheader_filename = "meta/meta-background-image.h", type_id = "meta_background_image_get_type ()")]
++	public class BackgroundImage : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected BackgroundImage ();
++		public bool get_success ();
++		public unowned Cogl.Texture get_texture ();
++		public bool is_loaded ();
++		public signal void loaded ();
++	}
++	[CCode (cheader_filename = "meta/meta-background-image.h", type_id = "meta_background_image_cache_get_type ()")]
++	public class BackgroundImageCache : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected BackgroundImageCache ();
++		public static unowned Meta.BackgroundImageCache get_default ();
++		public Meta.BackgroundImage load (GLib.File file);
++		public void purge (GLib.File file);
++	}
++	[CCode (cheader_filename = "meta/barrier.h", type_id = "meta_barrier_get_type ()")]
++	public class Barrier : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected Barrier ();
++		public void destroy ();
++		public bool is_active ();
++		public void release (Meta.BarrierEvent event);
++		[NoAccessorMethod]
++		public Meta.BarrierDirection directions { get; construct; }
++		[NoAccessorMethod]
++		public Meta.Display display { owned get; construct; }
++		[NoAccessorMethod]
++		public int x1 { get; construct; }
++		[NoAccessorMethod]
++		public int x2 { get; construct; }
++		[NoAccessorMethod]
++		public int y1 { get; construct; }
++		[NoAccessorMethod]
++		public int y2 { get; construct; }
++		public signal void hit (Meta.BarrierEvent event);
++		public signal void left (Meta.BarrierEvent event);
++	}
++	[CCode (cheader_filename = "meta/barrier.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "meta_barrier_event_get_type ()")]
++	[Compact]
++	public class BarrierEvent {
++		public int dt;
++		public double dx;
++		public double dy;
++		public int event_id;
++		public bool grabbed;
++		public bool released;
++		public uint32 time;
++		public double x;
++		public double y;
++	}
++	[CCode (cheader_filename = "meta/meta-cursor-tracker.h", type_id = "meta_cursor_tracker_get_type ()")]
++	public class CursorTracker : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected CursorTracker ();
++		public void get_hot (out int x, out int y);
++		public void get_pointer (Graphene.Point coords, out Clutter.ModifierType mods);
++		public bool get_pointer_visible ();
++		public unowned Cogl.Texture get_sprite ();
++		public void set_pointer_visible (bool visible);
++		[NoAccessorMethod]
++		public Meta.Backend backend { owned get; construct; }
++		public signal void cursor_changed ();
++		public signal void position_invalidated ();
++		public signal void visibility_changed ();
++	}
++	[CCode (cheader_filename = "meta/display.h", type_id = "meta_display_get_type ()")]
++	public class Display : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected Display ();
++		public void add_ignored_crossing_serial (ulong serial);
++		public uint add_keybinding (string name, GLib.Settings settings, Meta.KeyBindingFlags flags, owned Meta.KeyHandlerFunc handler);
++		public bool begin_grab_op (Meta.Window window, Meta.GrabOp op, bool pointer_already_grabbed, bool frame_action, int button, ulong modmask, uint32 timestamp, int root_x, int root_y);
++		public void clear_mouse_mode ();
++		public void close (uint32 timestamp);
++		public void end_grab_op (uint32 timestamp);
++		public void focus_default_window (uint32 timestamp);
++		public void freeze_keyboard (uint32 timestamp);
++		public Clutter.ModifierType get_compositor_modifiers ();
++		public int get_current_monitor ();
++		public uint32 get_current_time ();
++		public uint32 get_current_time_roundtrip ();
++		[CCode (cname = "meta_cursor_tracker_get_for_display")]
++		public unowned Meta.CursorTracker get_cursor_tracker ();
++		public unowned Meta.Window get_focus_window ();
++		public Meta.GrabOp get_grab_op ();
++		public uint get_keybinding_action (uint keycode, ulong mask);
++		public uint32 get_last_user_time ();
++		public Meta.Rectangle get_monitor_geometry (int monitor);
++		public bool get_monitor_in_fullscreen (int monitor);
++		public int get_monitor_index_for_rect (Meta.Rectangle rect);
++		public int get_monitor_neighbor_index (int which_monitor, Meta.DisplayDirection dir);
++		public float get_monitor_scale (int monitor);
++		public int get_n_monitors ();
++		public string get_pad_action_label (Clutter.InputDevice pad, Meta.PadActionType action_type, uint action_number);
++		public int get_primary_monitor ();
++		public unowned Meta.Selection get_selection ();
++		public void get_size (out int width, out int height);
++		public unowned Meta.SoundPlayer get_sound_player ();
++		public unowned Meta.Window get_tab_current (Meta.TabList type, Meta.Workspace workspace);
++		public GLib.List<weak Meta.Window> get_tab_list (Meta.TabList type, Meta.Workspace? workspace);
++		public unowned Meta.Window get_tab_next (Meta.TabList type, Meta.Workspace workspace, Meta.Window? window, bool backward);
++		public unowned Meta.WorkspaceManager get_workspace_manager ();
++		public uint grab_accelerator (string accelerator, Meta.KeyBindingFlags flags);
++		public bool is_pointer_emulating_sequence (Clutter.EventSequence? sequence);
++		public bool remove_keybinding (string name);
++		public void request_pad_osd (Clutter.InputDevice pad, bool edition_mode);
++		public void set_cursor (Meta.Cursor cursor);
++		public void set_input_focus (Meta.Window window, bool focus_frame, uint32 timestamp);
++		public GLib.SList<weak Meta.Window> sort_windows_by_stacking (GLib.SList<Meta.Window> windows);
++		public bool supports_extended_barriers ();
++		public void unfreeze_keyboard (uint32 timestamp);
++		public bool ungrab_accelerator (uint action_id);
++		public void ungrab_keyboard (uint32 timestamp);
++		public void unset_input_focus (uint32 timestamp);
++		public bool xserver_time_is_before (uint32 time1, uint32 time2);
++		public Clutter.ModifierType compositor_modifiers { get; }
++		public Meta.Window focus_window { get; }
++		public signal void accelerator_activated (uint object, Clutter.InputDevice p0, uint p1);
++		public signal void closing ();
++		public signal void cursor_updated ();
++		public signal void gl_video_memory_purged ();
++		public signal void grab_op_begin (Meta.Window object, Meta.GrabOp p0);
++		public signal void grab_op_end (Meta.Window object, Meta.GrabOp p0);
++		public signal void in_fullscreen_changed ();
++		public signal bool init_xserver (GLib.Task object);
++		public signal bool modifiers_accelerator_activated ();
++		public signal void overlay_key ();
++		public signal void pad_mode_switch (Clutter.InputDevice object, uint p0, uint p1);
++		public signal void restacked ();
++		public signal bool restart ();
++		public signal void show_osd (int object, string p0, string p1);
++		public signal unowned Clutter.Actor? show_pad_osd (Clutter.InputDevice pad, GLib.Settings settings, string layout_path, bool edition_mode, int monitor_idx);
++		public signal bool show_resize_popup (bool object, Meta.Rectangle p0, int p1, int p2);
++		public signal bool show_restart_message (string? message);
++		public signal void showing_desktop_changed ();
++		public signal void window_created (Meta.Window object);
++		public signal void window_demands_attention (Meta.Window object);
++		public signal void window_entered_monitor (int object, Meta.Window p0);
++		public signal void window_left_monitor (int object, Meta.Window p0);
++		public signal void window_marked_urgent (Meta.Window object);
++		public signal void workareas_changed ();
++		public signal void x11_display_closing ();
++		public signal void x11_display_opened ();
++		public signal void x11_display_setup ();
++	}
++	[CCode (cheader_filename = "meta/meta-dnd.h", type_id = "meta_dnd_get_type ()")]
++	public class Dnd : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected Dnd ();
++		public signal void dnd_enter ();
++		public signal void dnd_leave ();
++		public signal void dnd_position_change (int object, int p0);
++	}
++	[CCode (cheader_filename = "meta/main.h", has_type_id = false)]
++	[Compact]
++	public class Frame {
++	}
++	[CCode (cheader_filename = "meta/meta-idle-monitor.h", type_id = "meta_idle_monitor_get_type ()")]
++	public class IdleMonitor : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected IdleMonitor ();
++		public uint add_idle_watch (uint64 interval_msec, owned Meta.IdleMonitorWatchFunc? callback);
++		public uint add_user_active_watch (owned Meta.IdleMonitorWatchFunc? callback);
++		public static unowned Meta.IdleMonitor get_core ();
++		public int64 get_idletime ();
++		public void remove_watch (uint id);
++		[NoAccessorMethod]
++		public Clutter.InputDevice device { owned get; construct; }
++	}
++	[CCode (cheader_filename = "meta/main.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "meta_key_binding_get_type ()")]
++	[Compact]
++	public class KeyBinding {
++		public uint get_mask ();
++		public Meta.VirtualModifier get_modifiers ();
++		public unowned string get_name ();
++		public bool is_builtin ();
++		public bool is_reversed ();
++		[CCode (cname = "meta_keybindings_set_custom_handler")]
++		public static bool set_custom_handler (string name, owned Meta.KeyHandlerFunc? handler);
++	}
++	[CCode (cheader_filename = "meta/meta-launch-context.h", type_id = "meta_launch_context_get_type ()")]
++	public class LaunchContext : GLib.AppLaunchContext {
++		[CCode (has_construct_function = false)]
++		protected LaunchContext ();
++		public void set_timestamp (uint32 timestamp);
++		public void set_workspace (Meta.Workspace workspace);
++		[NoAccessorMethod]
++		public Meta.Display display { owned get; construct; }
++		[NoAccessorMethod]
++		public uint timestamp { get; set; }
++		[NoAccessorMethod]
++		public Meta.Workspace workspace { owned get; set; }
++	}
++	[CCode (cheader_filename = "meta/meta-monitor-manager.h", type_id = "meta_monitor_manager_get_type ()")]
++	public class MonitorManager : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected MonitorManager ();
++		public bool can_switch_config ();
++		public static unowned Meta.MonitorManager @get ();
++		public static int get_display_configuration_timeout ();
++		public bool get_is_builtin_display_on ();
++		public int get_monitor_for_connector (string connector);
++		public bool get_panel_orientation_managed ();
++		public Meta.MonitorSwitchConfigType get_switch_config ();
++		public void switch_config (Meta.MonitorSwitchConfigType config_type);
++		[NoAccessorMethod]
++		public Meta.Backend backend { owned get; construct; }
++		public bool panel_orientation_managed { get; }
++		public signal void confirm_display_change ();
++		public signal void monitors_changed ();
++		public signal void monitors_changed_internal ();
++		public signal void power_save_mode_changed ();
++	}
++	[CCode (cheader_filename = "meta/meta-plugin.h", type_id = "meta_plugin_get_type ()")]
++	public abstract class Plugin : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected Plugin ();
++		public bool begin_modal (Meta.ModalOptions options, uint32 timestamp);
++		public void complete_display_change (bool ok);
++		[NoWrapper]
++		public virtual void confirm_display_change ();
++		[NoWrapper]
++		public virtual void destroy (Meta.WindowActor actor);
++		public void destroy_completed (Meta.WindowActor actor);
++		public void end_modal (uint32 timestamp);
++		public unowned Meta.Display get_display ();
++		public unowned Meta.PluginInfo? get_info ();
++		[NoWrapper]
++		public virtual void hide_tile_preview ();
++		[NoWrapper]
++		public virtual bool keybinding_filter (Meta.KeyBinding binding);
++		[NoWrapper]
++		public virtual void kill_switch_workspace ();
++		[NoWrapper]
++		public virtual void kill_window_effects (Meta.WindowActor actor);
++		[NoWrapper]
++		public virtual void locate_pointer ();
++		public static void manager_set_plugin_type (GLib.Type gtype);
++		[NoWrapper]
++		public virtual void map (Meta.WindowActor actor);
++		public void map_completed (Meta.WindowActor actor);
++		[NoWrapper]
++		public virtual void minimize (Meta.WindowActor actor);
++		public void minimize_completed (Meta.WindowActor actor);
++		[NoWrapper]
++		public virtual unowned Meta.PluginInfo? plugin_info ();
++		[NoWrapper]
++		public virtual void show_tile_preview (Meta.Window window, Meta.Rectangle tile_rect, int tile_monitor_number);
++		[NoWrapper]
++		public virtual void show_window_menu (Meta.Window window, Meta.WindowMenuType menu, int x, int y);
++		[NoWrapper]
++		public virtual void show_window_menu_for_rect (Meta.Window window, Meta.WindowMenuType menu, Meta.Rectangle rect);
++		[NoWrapper]
++		public virtual void size_change (Meta.WindowActor actor, Meta.SizeChange which_change, Meta.Rectangle old_frame_rect, Meta.Rectangle old_buffer_rect);
++		public void size_change_completed (Meta.WindowActor actor);
++		[NoWrapper]
++		public virtual void size_changed (Meta.WindowActor actor);
++		[NoWrapper]
++		public virtual void start ();
++		[NoWrapper]
++		public virtual void switch_workspace (int from, int to, Meta.MotionDirection direction);
++		public void switch_workspace_completed ();
++		[NoWrapper]
++		public virtual void unminimize (Meta.WindowActor actor);
++		public void unminimize_completed (Meta.WindowActor actor);
++		[NoWrapper]
++		public virtual bool xevent_filter (X.Event event);
++	}
++	[CCode (cheader_filename = "meta/meta-remote-access-controller.h", type_id = "meta_remote_access_controller_get_type ()")]
++	public class RemoteAccessController : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected RemoteAccessController ();
++		public void inhibit_remote_access ();
++		public void uninhibit_remote_access ();
++		public signal void new_handle (Meta.RemoteAccessHandle object);
++	}
++	[CCode (cheader_filename = "meta/meta-remote-access-controller.h", type_id = "meta_remote_access_handle_get_type ()")]
++	public class RemoteAccessHandle : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected RemoteAccessHandle ();
++		public bool get_disable_animations ();
++		public virtual void stop ();
++		[NoAccessorMethod]
++		public bool is_recording { get; construct; }
++		public signal void stopped ();
++	}
++	[CCode (cheader_filename = "meta/meta-selection.h", type_id = "meta_selection_get_type ()")]
++	public class Selection : GLib.Object {
++		[CCode (has_construct_function = false)]
++		public Selection (Meta.Display display);
++		public GLib.List<string> get_mimetypes (Meta.SelectionType selection_type);
++		public void set_owner (Meta.SelectionType selection_type, Meta.SelectionSource owner);
++		public async bool transfer_async (Meta.SelectionType selection_type, string mimetype, ssize_t size, GLib.OutputStream output, GLib.Cancellable? cancellable) throws GLib.Error;
++		public void unset_owner (Meta.SelectionType selection_type, Meta.SelectionSource owner);
++		public signal void owner_changed (uint object, Meta.SelectionSource p0);
++	}
++	[CCode (cheader_filename = "meta/meta-selection.h", type_id = "meta_selection_source_get_type ()")]
++	public class SelectionSource : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected SelectionSource ();
++		public virtual GLib.List<string> get_mimetypes ();
++		public bool is_active ();
++		public virtual async GLib.InputStream read_async (string mimetype, GLib.Cancellable? cancellable) throws GLib.Error;
++		public virtual signal void activated ();
++		public virtual signal void deactivated ();
++	}
++	[CCode (cheader_filename = "meta/meta-selection-source-memory.h", type_id = "meta_selection_source_memory_get_type ()")]
++	public class SelectionSourceMemory : Meta.SelectionSource {
++		[CCode (has_construct_function = false, type = "MetaSelectionSource*")]
++		public SelectionSourceMemory (string mimetype, GLib.Bytes content);
++	}
++	[CCode (cheader_filename = "meta/meta-settings.h", has_type_id = false)]
++	[Compact]
++	public class Settings {
++		public int get_font_dpi ();
++		public int get_ui_scaling_factor ();
++	}
++	[CCode (cheader_filename = "meta/main.h", ref_function = "meta_shadow_ref", type_id = "meta_shadow_get_type ()", unref_function = "meta_shadow_unref")]
++	[Compact]
++	public class Shadow {
++		public void get_bounds (int window_x, int window_y, int window_width, int window_height, Cairo.RectangleInt bounds);
++		public void paint (Cogl.Framebuffer framebuffer, int window_x, int window_y, int window_width, int window_height, uint8 opacity, Cairo.Region? clip, bool clip_strictly);
++		public Meta.Shadow @ref ();
++		public void unref ();
++	}
++	[CCode (cheader_filename = "meta/meta-shadow-factory.h", type_id = "meta_shadow_factory_get_type ()")]
++	public class ShadowFactory : GLib.Object {
++		[CCode (has_construct_function = false)]
++		public ShadowFactory ();
++		public static unowned Meta.ShadowFactory get_default ();
++		public Meta.ShadowParams get_params (string class_name, bool focused);
++		public Meta.Shadow get_shadow (Meta.WindowShape shape, int width, int height, string class_name, bool focused);
++		public void set_params (string class_name, bool focused, Meta.ShadowParams @params);
++		public signal void changed ();
++	}
++	[CCode (cheader_filename = "meta/meta-shaped-texture.h", type_id = "meta_shaped_texture_get_type ()")]
++	public class ShapedTexture : GLib.Object, Clutter.Content {
++		[CCode (has_construct_function = false)]
++		protected ShapedTexture ();
++		public Cairo.Surface? get_image (Cairo.RectangleInt? clip);
++		public unowned Cogl.Texture get_texture ();
++		public void set_create_mipmaps (bool create_mipmaps);
++		public void set_mask_texture (Cogl.Texture mask_texture);
++		public signal void size_changed ();
++	}
++	[CCode (cheader_filename = "meta/meta-sound-player.h", type_id = "meta_sound_player_get_type ()")]
++	public class SoundPlayer : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected SoundPlayer ();
++		public void play_from_file (GLib.File file, string description, GLib.Cancellable? cancellable = null);
++		public void play_from_theme (string name, string description, GLib.Cancellable? cancellable = null);
++	}
++	[CCode (cheader_filename = "meta/meta-stage.h", type_id = "meta_stage_get_type ()")]
++	public class Stage : Clutter.Stage, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
++		[CCode (has_construct_function = false)]
++		protected Stage ();
++		public static bool is_focused (Meta.Display display);
++		public signal void actors_painted ();
++	}
++	[CCode (cheader_filename = "meta/meta-startup-notification.h", type_id = "meta_startup_notification_get_type ()")]
++	public class StartupNotification : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected StartupNotification ();
++		public Meta.LaunchContext create_launcher ();
++		[NoAccessorMethod]
++		public Meta.Display display { owned get; construct; }
++		public signal void changed (void* object);
++	}
++	[CCode (cheader_filename = "meta/main.h", type_id = "meta_startup_sequence_get_type ()")]
++	public class StartupSequence : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected StartupSequence ();
++		public unowned string get_application_id ();
++		public bool get_completed ();
++		public unowned string get_icon_name ();
++		public unowned string get_id ();
++		public unowned string get_name ();
++		public uint64 get_timestamp ();
++		public unowned string get_wmclass ();
++		public int get_workspace ();
++		public string application_id { get; construct; }
++		public string icon_name { get; construct; }
++		public string id { get; construct; }
++		public string name { get; construct; }
++		public uint64 timestamp { get; construct; }
++		public string wmclass { get; construct; }
++		public int workspace { get; construct; }
++		[HasEmitter]
++		public signal void complete ();
++	}
++	[CCode (cheader_filename = "meta/theme.h", has_type_id = false)]
++	[Compact]
++	public class Theme {
++		public void free ();
++	}
++	[CCode (cheader_filename = "meta/meta-wayland-client.h", type_id = "meta_wayland_client_get_type ()")]
++	public class WaylandClient : GLib.Object {
++		[CCode (has_construct_function = false)]
++		public WaylandClient (GLib.SubprocessLauncher launcher) throws GLib.Error;
++		public void hide_from_window_list (Meta.Window window);
++		public bool owns_window (Meta.Window window);
++		public void show_in_window_list (Meta.Window window);
++		public GLib.Subprocess spawnv (Meta.Display display, [CCode (array_length = false, array_null_terminated = true)] string[] argv) throws GLib.Error;
++	}
++	[CCode (cheader_filename = "meta/window.h", type_id = "meta_window_get_type ()")]
++	public abstract class Window : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected Window ();
++		public void activate (uint32 current_time);
++		public void activate_with_workspace (uint32 current_time, Meta.Workspace workspace);
++		public bool allows_move ();
++		public bool allows_resize ();
++		public void begin_grab_op (Meta.GrabOp op, bool frame_action, uint32 timestamp);
++		public bool can_close ();
++		public bool can_maximize ();
++		public bool can_minimize ();
++		public bool can_shade ();
++		public void change_workspace (Meta.Workspace workspace);
++		public void change_workspace_by_index (int space_index, bool append);
++		public void check_alive (uint32 timestamp);
++		public Meta.Rectangle client_rect_to_frame_rect (Meta.Rectangle client_rect);
++		public void compute_group ();
++		public void @delete (uint32 timestamp);
++		public unowned Meta.Window find_root_ancestor ();
++		public void focus (uint32 timestamp);
++		public void foreach_ancestor (Meta.WindowForeachFunc func);
++		public void foreach_transient (Meta.WindowForeachFunc func);
++		public Meta.Rectangle frame_rect_to_client_rect (Meta.Rectangle frame_rect);
++		public Meta.Rectangle get_buffer_rect ();
++		public unowned string get_client_machine ();
++		public Meta.WindowClientType get_client_type ();
++		public unowned GLib.Object get_compositor_private ();
++		public unowned string get_description ();
++		public unowned Meta.Display get_display ();
++		public unowned Cairo.Region? get_frame_bounds ();
++		public Meta.Rectangle get_frame_rect ();
++		public Meta.FrameType get_frame_type ();
++		public unowned string get_gtk_app_menu_object_path ();
++		public unowned string get_gtk_application_id ();
++		public unowned string get_gtk_application_object_path ();
++		public unowned string get_gtk_menubar_object_path ();
++		public unowned string get_gtk_theme_variant ();
++		public unowned string get_gtk_unique_bus_name ();
++		public unowned string get_gtk_window_object_path ();
++		public bool get_icon_geometry (out Meta.Rectangle rect);
++		public uint64 get_id ();
++		public Meta.StackLayer get_layer ();
++		public Meta.MaximizeFlags get_maximized ();
++		public int get_monitor ();
++		public unowned string get_mutter_hints ();
++		public int get_pid ();
++		public unowned string get_role ();
++		public unowned string get_sandboxed_app_id ();
++		public uint get_stable_sequence ();
++		public unowned string get_startup_id ();
++		public unowned Meta.Window? get_tile_match ();
++		public unowned string get_title ();
++		public unowned Meta.Window get_transient_for ();
++		public uint32 get_user_time ();
++		public Meta.WindowType get_window_type ();
++		public unowned string get_wm_class ();
++		public unowned string get_wm_class_instance ();
++		public Meta.Rectangle get_work_area_all_monitors ();
++		public Meta.Rectangle get_work_area_current_monitor ();
++		public Meta.Rectangle get_work_area_for_monitor (int which_monitor);
++		public unowned Meta.Workspace get_workspace ();
++		public X.Window get_xwindow ();
++		public void group_leader_changed ();
++		public bool has_focus ();
++		public bool is_above ();
++		public bool is_always_on_all_workspaces ();
++		public bool is_ancestor_of_transient (Meta.Window transient);
++		public bool is_attached_dialog ();
++		public bool is_client_decorated ();
++		public bool is_fullscreen ();
++		public bool is_hidden ();
++		public bool is_monitor_sized ();
++		public bool is_on_all_workspaces ();
++		public bool is_on_primary_monitor ();
++		public bool is_override_redirect ();
++		public bool is_remote ();
++		public bool is_screen_sized ();
++		public bool is_shaded ();
++		public bool is_skip_taskbar ();
++		public void kill ();
++		public bool located_on_workspace (Meta.Workspace workspace);
++		public void lower ();
++		public void make_above ();
++		public void make_fullscreen ();
++		public void maximize (Meta.MaximizeFlags directions);
++		public void minimize ();
++		public void move_frame (bool user_op, int root_x_nw, int root_y_nw);
++		public void move_resize_frame (bool user_op, int root_x_nw, int root_y_nw, int w, int h);
++		public void move_to_monitor (int monitor);
++		public void raise ();
++		public void set_compositor_private (GLib.Object priv);
++		public void set_demands_attention ();
++		public void set_icon_geometry (Meta.Rectangle? rect);
++		public void shade (uint32 timestamp);
++		public void shove_titlebar_onscreen ();
++		public bool showing_on_its_workspace ();
++		public void shutdown_group ();
++		public void stick ();
++		public bool titlebar_is_onscreen ();
++		public void unmake_above ();
++		public void unmake_fullscreen ();
++		public void unmaximize (Meta.MaximizeFlags directions);
++		public void unminimize ();
++		public void unset_demands_attention ();
++		public void unshade (uint32 timestamp);
++		public void unstick ();
++		[NoAccessorMethod]
++		public bool above { get; }
++		[NoAccessorMethod]
++		public bool appears_focused { get; }
++		[NoAccessorMethod]
++		public bool decorated { get; }
++		[NoAccessorMethod]
++		public bool demands_attention { get; }
++		[NoAccessorMethod]
++		public bool fullscreen { get; }
++		public string gtk_app_menu_object_path { get; }
++		public string gtk_application_id { get; }
++		public string gtk_application_object_path { get; }
++		public string gtk_menubar_object_path { get; }
++		public string gtk_unique_bus_name { get; }
++		public string gtk_window_object_path { get; }
++		[NoAccessorMethod]
++		public void* icon { get; }
++		[NoAccessorMethod]
++		public bool maximized_horizontally { get; }
++		[NoAccessorMethod]
++		public bool maximized_vertically { get; }
++		[NoAccessorMethod]
++		public void* mini_icon { get; }
++		[NoAccessorMethod]
++		public bool minimized { get; }
++		public string mutter_hints { get; }
++		[NoAccessorMethod]
++		public bool on_all_workspaces { get; }
++		[NoAccessorMethod]
++		public bool resizeable { get; }
++		[NoAccessorMethod]
++		public bool skip_taskbar { get; }
++		public string title { get; }
++		[NoAccessorMethod]
++		public bool urgent { get; }
++		public uint user_time { get; }
++		public Meta.WindowType window_type { get; }
++		public string wm_class { get; }
++		public signal void position_changed ();
++		public signal void raised ();
++		public signal void shown ();
++		public signal void size_changed ();
++		public signal void unmanaged ();
++		public signal void unmanaging ();
++		public signal void workspace_changed ();
++	}
++	[CCode (cheader_filename = "meta/meta-window-actor.h", type_id = "meta_window_actor_get_type ()")]
++	public abstract class WindowActor : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
++		[CCode (has_construct_function = false)]
++		protected WindowActor ();
++		public void freeze ();
++		public Cairo.Surface? get_image (Cairo.RectangleInt? clip);
++		public unowned Meta.Window get_meta_window ();
++		public unowned Meta.ShapedTexture get_texture ();
++		public bool is_destroyed ();
++		public void sync_visibility ();
++		public void thaw ();
++		public Meta.Window meta_window { get; construct; }
++		public signal void damaged ();
++		public signal void effects_completed ();
++		public signal void first_frame ();
++		public signal void thawed ();
++	}
++	[CCode (cheader_filename = "meta/meta-window-group.h", type_id = "meta_window_group_get_type ()")]
++	public class WindowGroup : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
++		[CCode (has_construct_function = false)]
++		protected WindowGroup ();
++	}
++	[CCode (cheader_filename = "meta/meta-window-shape.h", ref_function = "meta_window_shape_ref", type_id = "meta_window_shape_get_type ()", unref_function = "meta_window_shape_unref")]
++	[Compact]
++	public class WindowShape {
++		[CCode (has_construct_function = false)]
++		public WindowShape (Cairo.Region region);
++		public bool equal (Meta.WindowShape shape_b);
++		public void get_borders (int border_top, int border_right, int border_bottom, int border_left);
++		public uint hash ();
++		public Meta.WindowShape @ref ();
++		public Cairo.Region to_region (int center_width, int center_height);
++		public void unref ();
++	}
++	[CCode (cheader_filename = "meta/workspace.h", type_id = "meta_workspace_get_type ()")]
++	public class Workspace : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected Workspace ();
++		public void activate (uint32 timestamp);
++		public void activate_with_focus (Meta.Window focus_this, uint32 timestamp);
++		public unowned Meta.Display get_display ();
++		public unowned Meta.Workspace get_neighbor (Meta.MotionDirection direction);
++		public Meta.Rectangle get_work_area_all_monitors ();
++		public Meta.Rectangle get_work_area_for_monitor (int which_monitor);
++		public int index ();
++		public GLib.List<weak Meta.Window> list_windows ();
++		public void set_builtin_struts (GLib.SList<Meta.Strut?> struts);
++		[NoAccessorMethod]
++		public bool active { get; }
++		[NoAccessorMethod]
++		public uint n_windows { get; }
++		[NoAccessorMethod]
++		public uint workspace_index { get; }
++		public signal void window_added (Meta.Window object);
++		public signal void window_removed (Meta.Window object);
++	}
++	[CCode (cheader_filename = "meta/meta-workspace-manager.h", type_id = "meta_workspace_manager_get_type ()")]
++	public class WorkspaceManager : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected WorkspaceManager ();
++		public unowned Meta.Workspace append_new_workspace (bool activate, uint32 timestamp);
++		public unowned Meta.Workspace get_active_workspace ();
++		public int get_active_workspace_index ();
++		public int get_n_workspaces ();
++		public unowned Meta.Workspace? get_workspace_by_index (int index);
++		public void override_workspace_layout (Meta.DisplayCorner starting_corner, bool vertical_layout, int n_rows, int n_columns);
++		public void remove_workspace (Meta.Workspace workspace, uint32 timestamp);
++		public void reorder_workspace (Meta.Workspace workspace, int new_index);
++		[NoAccessorMethod]
++		public int layout_columns { get; }
++		[NoAccessorMethod]
++		public int layout_rows { get; }
++		public int n_workspaces { get; }
++		public signal void active_workspace_changed ();
++		public signal void showing_desktop_changed ();
++		public signal void workspace_added (int object);
++		public signal void workspace_removed (int object);
++		public signal void workspace_switched (int object, int p0, Meta.MotionDirection p1);
++		public signal void workspaces_reordered ();
++	}
++	[CCode (cheader_filename = "meta/meta-x11-display.h", type_id = "meta_x11_display_get_type ()")]
++	public class X11Display : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected X11Display ();
++		public void clear_stage_input_region ();
++		public int get_damage_event_base ();
++		public int get_screen_number ();
++		public int get_shape_event_base ();
++		public bool has_shape ();
++		public void set_cm_selection ();
++		public void set_stage_input_region (X.XserverRegion region);
++		public bool xwindow_is_a_no_focus_window (X.Window xwindow);
++	}
++	[CCode (cheader_filename = "meta/meta-close-dialog.h", type_cname = "MetaCloseDialogInterface", type_id = "meta_close_dialog_get_type ()")]
++	public interface CloseDialog : GLib.Object {
++		public abstract void focus ();
++		public abstract void hide ();
++		public bool is_visible ();
++		public abstract void show ();
++		[NoAccessorMethod]
++		public abstract Meta.Window window { owned get; construct; }
++		[HasEmitter]
++		public signal void response (Meta.CloseDialogResponse response);
++	}
++	[CCode (cheader_filename = "meta/meta-inhibit-shortcuts-dialog.h", type_cname = "MetaInhibitShortcutsDialogInterface", type_id = "meta_inhibit_shortcuts_dialog_get_type ()")]
++	public interface InhibitShortcutsDialog : GLib.Object {
++		public abstract void hide ();
++		public abstract void show ();
++		[NoAccessorMethod]
++		public abstract Meta.Window window { owned get; construct; }
++		[HasEmitter]
++		public signal void response (Meta.InhibitShortcutsDialogResponse response);
++	}
++	[CCode (cheader_filename = "meta/main.h", has_type_id = false)]
++	public struct ButtonLayout {
++		[CCode (array_length = false)]
++		public weak Meta.ButtonFunction left_buttons[4];
++		[CCode (array_length = false)]
++		public weak bool left_buttons_has_spacer[4];
++		[CCode (array_length = false)]
++		public weak Meta.ButtonFunction right_buttons[4];
++		[CCode (array_length = false)]
++		public weak bool right_buttons_has_spacer[4];
++	}
++	[CCode (cheader_filename = "meta/main.h", has_type_id = false)]
++	public struct Edge {
++		public Meta.Rectangle rect;
++		public Meta.Side side_type;
++		public Meta.EdgeType edge_type;
++	}
++	[CCode (cheader_filename = "meta/main.h", has_type_id = false)]
++	public struct FrameBorders {
++		public Gtk.Border visible;
++		public Gtk.Border invisible;
++		public Gtk.Border total;
++		public void clear ();
++	}
++	[CCode (cheader_filename = "meta/meta-plugin.h", has_type_id = false)]
++	public struct PluginInfo {
++		public weak string name;
++		public weak string version;
++		public weak string author;
++		public weak string license;
++		public weak string description;
++	}
++	[CCode (cheader_filename = "meta/main.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "meta_rectangle_get_type ()")]
++	public struct Rectangle {
++		public int x;
++		public int y;
++		public int width;
++		public int height;
++		public int area ();
++		public bool contains_rect (Meta.Rectangle inner_rect);
++		public Meta.Rectangle? copy ();
++		public bool could_fit_rect (Meta.Rectangle inner_rect);
++		public bool equal (Meta.Rectangle src2);
++		public void free ();
++		public bool horiz_overlap (Meta.Rectangle rect2);
++		public bool intersect (Meta.Rectangle src2, out Meta.Rectangle dest);
++		public bool overlap (Meta.Rectangle rect2);
++		public Meta.Rectangle union (Meta.Rectangle rect2);
++		public bool vert_overlap (Meta.Rectangle rect2);
++	}
++	[CCode (cheader_filename = "meta/main.h", has_type_id = false)]
++	public struct ShadowParams {
++		public int radius;
++		public int top_fade;
++		public int x_offset;
++		public int y_offset;
++		public uint8 opacity;
++	}
++	[CCode (cheader_filename = "meta/main.h", has_type_id = false)]
++	public struct Strut {
++		public Meta.Rectangle rect;
++		public Meta.Side side;
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_BARRIER_DIRECTION_", type_id = "meta_barrier_direction_get_type ()")]
++	[Flags]
++	public enum BarrierDirection {
++		POSITIVE_X,
++		POSITIVE_Y,
++		NEGATIVE_X,
++		NEGATIVE_Y
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_BUTTON_FUNCTION_", type_id = "meta_button_function_get_type ()")]
++	public enum ButtonFunction {
++		MENU,
++		MINIMIZE,
++		MAXIMIZE,
++		CLOSE,
++		LAST
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_CLOSE_DIALOG_RESPONSE_", type_id = "meta_close_dialog_response_get_type ()")]
++	public enum CloseDialogResponse {
++		WAIT,
++		FORCE_CLOSE
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_COMP_EFFECT_", type_id = "meta_comp_effect_get_type ()")]
++	public enum CompEffect {
++		CREATE,
++		UNMINIMIZE,
++		DESTROY,
++		MINIMIZE,
++		NONE
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_CURSOR_", type_id = "meta_cursor_get_type ()")]
++	public enum Cursor {
++		NONE,
++		DEFAULT,
++		NORTH_RESIZE,
++		SOUTH_RESIZE,
++		WEST_RESIZE,
++		EAST_RESIZE,
++		SE_RESIZE,
++		SW_RESIZE,
++		NE_RESIZE,
++		NW_RESIZE,
++		MOVE_OR_RESIZE_WINDOW,
++		BUSY,
++		DND_IN_DRAG,
++		DND_MOVE,
++		DND_COPY,
++		DND_UNSUPPORTED_TARGET,
++		POINTING_HAND,
++		CROSSHAIR,
++		IBEAM,
++		BLANK,
++		LAST
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_DEBUG_PAINT_", type_id = "meta_debug_paint_flag_get_type ()")]
++	[Flags]
++	public enum DebugPaintFlag {
++		NONE,
++		OPAQUE_REGION
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_DEBUG_", type_id = "meta_debug_topic_get_type ()")]
++	[Flags]
++	public enum DebugTopic {
++		VERBOSE,
++		FOCUS,
++		WORKAREA,
++		STACK,
++		SM,
++		EVENTS,
++		WINDOW_STATE,
++		WINDOW_OPS,
++		GEOMETRY,
++		PLACEMENT,
++		PING,
++		KEYBINDINGS,
++		SYNC,
++		STARTUP,
++		PREFS,
++		GROUPS,
++		RESIZING,
++		SHAPES,
++		EDGE_RESISTANCE,
++		DBUS,
++		INPUT,
++		WAYLAND,
++		KMS,
++		SCREEN_CAST,
++		REMOTE_DESKTOP
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_DIRECTION_", type_id = "meta_direction_get_type ()")]
++	[Flags]
++	public enum Direction {
++		LEFT,
++		RIGHT,
++		TOP,
++		BOTTOM,
++		UP,
++		DOWN,
++		HORIZONTAL,
++		VERTICAL
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_DISPLAY_", type_id = "meta_display_corner_get_type ()")]
++	public enum DisplayCorner {
++		TOPLEFT,
++		TOPRIGHT,
++		BOTTOMLEFT,
++		BOTTOMRIGHT
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_DISPLAY_", type_id = "meta_display_direction_get_type ()")]
++	public enum DisplayDirection {
++		UP,
++		DOWN,
++		LEFT,
++		RIGHT
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_EDGE_", type_id = "meta_edge_type_get_type ()")]
++	public enum EdgeType {
++		WINDOW,
++		MONITOR,
++		SCREEN
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_EXIT_", type_id = "meta_exit_code_get_type ()")]
++	public enum ExitCode {
++		SUCCESS,
++		ERROR
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_FRAME_", type_id = "meta_frame_flags_get_type ()")]
++	[Flags]
++	public enum FrameFlags {
++		ALLOWS_DELETE,
++		ALLOWS_MENU,
++		ALLOWS_MINIMIZE,
++		ALLOWS_MAXIMIZE,
++		ALLOWS_VERTICAL_RESIZE,
++		ALLOWS_HORIZONTAL_RESIZE,
++		HAS_FOCUS,
++		SHADED,
++		STUCK,
++		MAXIMIZED,
++		ALLOWS_SHADE,
++		ALLOWS_MOVE,
++		FULLSCREEN,
++		ABOVE,
++		TILED_LEFT,
++		TILED_RIGHT
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_FRAME_TYPE_", type_id = "meta_frame_type_get_type ()")]
++	public enum FrameType {
++		NORMAL,
++		DIALOG,
++		MODAL_DIALOG,
++		UTILITY,
++		MENU,
++		BORDER,
++		ATTACHED,
++		LAST;
++		public unowned string to_string ();
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_GRAB_OP_", type_id = "meta_grab_op_get_type ()")]
++	public enum GrabOp {
++		NONE,
++		WINDOW_BASE,
++		COMPOSITOR,
++		WAYLAND_POPUP,
++		FRAME_BUTTON,
++		MOVING,
++		RESIZING_NW,
++		RESIZING_N,
++		RESIZING_NE,
++		RESIZING_E,
++		RESIZING_SW,
++		RESIZING_S,
++		RESIZING_SE,
++		RESIZING_W,
++		KEYBOARD_MOVING,
++		KEYBOARD_RESIZING_UNKNOWN,
++		KEYBOARD_RESIZING_NW,
++		KEYBOARD_RESIZING_N,
++		KEYBOARD_RESIZING_NE,
++		KEYBOARD_RESIZING_E,
++		KEYBOARD_RESIZING_SW,
++		KEYBOARD_RESIZING_S,
++		KEYBOARD_RESIZING_SE,
++		KEYBOARD_RESIZING_W
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_GRAVITY_", type_id = "meta_gravity_get_type ()")]
++	public enum Gravity {
++		NONE,
++		NORTH_WEST,
++		NORTH,
++		NORTH_EAST,
++		WEST,
++		CENTER,
++		EAST,
++		SOUTH_WEST,
++		SOUTH,
++		SOUTH_EAST,
++		STATIC
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_INHIBIT_SHORTCUTS_DIALOG_RESPONSE_", type_id = "meta_inhibit_shortcuts_dialog_response_get_type ()")]
++	public enum InhibitShortcutsDialogResponse {
++		ALLOW,
++		DENY
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_KEYBINDING_ACTION_", type_id = "meta_key_binding_action_get_type ()")]
++	public enum KeyBindingAction {
++		NONE,
++		WORKSPACE_1,
++		WORKSPACE_2,
++		WORKSPACE_3,
++		WORKSPACE_4,
++		WORKSPACE_5,
++		WORKSPACE_6,
++		WORKSPACE_7,
++		WORKSPACE_8,
++		WORKSPACE_9,
++		WORKSPACE_10,
++		WORKSPACE_11,
++		WORKSPACE_12,
++		WORKSPACE_LEFT,
++		WORKSPACE_RIGHT,
++		WORKSPACE_UP,
++		WORKSPACE_DOWN,
++		WORKSPACE_LAST,
++		SWITCH_APPLICATIONS,
++		SWITCH_APPLICATIONS_BACKWARD,
++		SWITCH_GROUP,
++		SWITCH_GROUP_BACKWARD,
++		SWITCH_WINDOWS,
++		SWITCH_WINDOWS_BACKWARD,
++		SWITCH_PANELS,
++		SWITCH_PANELS_BACKWARD,
++		CYCLE_GROUP,
++		CYCLE_GROUP_BACKWARD,
++		CYCLE_WINDOWS,
++		CYCLE_WINDOWS_BACKWARD,
++		CYCLE_PANELS,
++		CYCLE_PANELS_BACKWARD,
++		SHOW_DESKTOP,
++		PANEL_MAIN_MENU,
++		PANEL_RUN_DIALOG,
++		TOGGLE_RECORDING,
++		SET_SPEW_MARK,
++		ACTIVATE_WINDOW_MENU,
++		TOGGLE_FULLSCREEN,
++		TOGGLE_MAXIMIZED,
++		TOGGLE_TILED_LEFT,
++		TOGGLE_TILED_RIGHT,
++		TOGGLE_ABOVE,
++		MAXIMIZE,
++		UNMAXIMIZE,
++		TOGGLE_SHADED,
++		MINIMIZE,
++		CLOSE,
++		BEGIN_MOVE,
++		BEGIN_RESIZE,
++		TOGGLE_ON_ALL_WORKSPACES,
++		MOVE_TO_WORKSPACE_1,
++		MOVE_TO_WORKSPACE_2,
++		MOVE_TO_WORKSPACE_3,
++		MOVE_TO_WORKSPACE_4,
++		MOVE_TO_WORKSPACE_5,
++		MOVE_TO_WORKSPACE_6,
++		MOVE_TO_WORKSPACE_7,
++		MOVE_TO_WORKSPACE_8,
++		MOVE_TO_WORKSPACE_9,
++		MOVE_TO_WORKSPACE_10,
++		MOVE_TO_WORKSPACE_11,
++		MOVE_TO_WORKSPACE_12,
++		MOVE_TO_WORKSPACE_LEFT,
++		MOVE_TO_WORKSPACE_RIGHT,
++		MOVE_TO_WORKSPACE_UP,
++		MOVE_TO_WORKSPACE_DOWN,
++		MOVE_TO_WORKSPACE_LAST,
++		MOVE_TO_MONITOR_LEFT,
++		MOVE_TO_MONITOR_RIGHT,
++		MOVE_TO_MONITOR_UP,
++		MOVE_TO_MONITOR_DOWN,
++		RAISE_OR_LOWER,
++		RAISE,
++		LOWER,
++		MAXIMIZE_VERTICALLY,
++		MAXIMIZE_HORIZONTALLY,
++		MOVE_TO_CORNER_NW,
++		MOVE_TO_CORNER_NE,
++		MOVE_TO_CORNER_SW,
++		MOVE_TO_CORNER_SE,
++		MOVE_TO_SIDE_N,
++		MOVE_TO_SIDE_S,
++		MOVE_TO_SIDE_E,
++		MOVE_TO_SIDE_W,
++		MOVE_TO_CENTER,
++		OVERLAY_KEY,
++		LOCATE_POINTER_KEY,
++		ISO_NEXT_GROUP,
++		ALWAYS_ON_TOP,
++		SWITCH_MONITOR,
++		ROTATE_MONITOR,
++		LAST
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_KEY_BINDING_", type_id = "meta_key_binding_flags_get_type ()")]
++	[Flags]
++	public enum KeyBindingFlags {
++		NONE,
++		PER_WINDOW,
++		BUILTIN,
++		IS_REVERSED,
++		NON_MASKABLE,
++		IGNORE_AUTOREPEAT,
++		NO_AUTO_GRAB
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_LATER_", type_id = "meta_later_type_get_type ()")]
++	public enum LaterType {
++		RESIZE,
++		CALC_SHOWING,
++		CHECK_FULLSCREEN,
++		SYNC_STACK,
++		BEFORE_REDRAW,
++		IDLE
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_LOCALE_DIRECTION_", type_id = "meta_locale_direction_get_type ()")]
++	public enum LocaleDirection {
++		LTR,
++		RTL
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_MAXIMIZE_", type_id = "meta_maximize_flags_get_type ()")]
++	[Flags]
++	public enum MaximizeFlags {
++		HORIZONTAL,
++		VERTICAL,
++		BOTH
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_MODAL_", type_id = "meta_modal_options_get_type ()")]
++	[Flags]
++	public enum ModalOptions {
++		POINTER_ALREADY_GRABBED,
++		KEYBOARD_ALREADY_GRABBED
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_MONITOR_SWITCH_CONFIG_", type_id = "meta_monitor_switch_config_type_get_type ()")]
++	public enum MonitorSwitchConfigType {
++		ALL_MIRROR,
++		ALL_LINEAR,
++		EXTERNAL,
++		BUILTIN,
++		UNKNOWN
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_MOTION_", type_id = "meta_motion_direction_get_type ()")]
++	public enum MotionDirection {
++		UP,
++		DOWN,
++		LEFT,
++		RIGHT,
++		UP_LEFT,
++		UP_RIGHT,
++		DOWN_LEFT,
++		DOWN_RIGHT
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_PAD_ACTION_", type_id = "meta_pad_action_type_get_type ()")]
++	public enum PadActionType {
++		BUTTON,
++		RING,
++		STRIP
++	}
++	[CCode (cheader_filename = "meta/prefs.h", cprefix = "META_PREF_", type_id = "meta_preference_get_type ()")]
++	public enum Preference {
++		MOUSE_BUTTON_MODS,
++		FOCUS_MODE,
++		FOCUS_NEW_WINDOWS,
++		ATTACH_MODAL_DIALOGS,
++		RAISE_ON_CLICK,
++		ACTION_DOUBLE_CLICK_TITLEBAR,
++		ACTION_MIDDLE_CLICK_TITLEBAR,
++		ACTION_RIGHT_CLICK_TITLEBAR,
++		AUTO_RAISE,
++		AUTO_RAISE_DELAY,
++		FOCUS_CHANGE_ON_POINTER_REST,
++		TITLEBAR_FONT,
++		NUM_WORKSPACES,
++		DYNAMIC_WORKSPACES,
++		KEYBINDINGS,
++		DISABLE_WORKAROUNDS,
++		BUTTON_LAYOUT,
++		WORKSPACE_NAMES,
++		VISUAL_BELL,
++		AUDIBLE_BELL,
++		VISUAL_BELL_TYPE,
++		GNOME_ACCESSIBILITY,
++		GNOME_ANIMATIONS,
++		CURSOR_THEME,
++		CURSOR_SIZE,
++		RESIZE_WITH_RIGHT_BUTTON,
++		EDGE_TILING,
++		FORCE_FULLSCREEN,
++		WORKSPACES_ONLY_ON_PRIMARY,
++		DRAGGABLE_BORDER_WIDTH,
++		AUTO_MAXIMIZE,
++		CENTER_NEW_WINDOWS,
++		DRAG_THRESHOLD,
++		LOCATE_POINTER,
++		CHECK_ALIVE_TIMEOUT;
++		public unowned string to_string ();
++	}
++	[CCode (cheader_filename = "meta/meta-selection-source.h", cprefix = "META_", type_id = "meta_selection_type_get_type ()")]
++	public enum SelectionType {
++		SELECTION_PRIMARY,
++		SELECTION_CLIPBOARD,
++		SELECTION_DND,
++		N_SELECTION_TYPES
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_SHADOW_MODE_", type_id = "meta_shadow_mode_get_type ()")]
++	public enum ShadowMode {
++		AUTO,
++		FORCED_OFF,
++		FORCED_ON
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_SIDE_", type_id = "meta_side_get_type ()")]
++	public enum Side {
++		LEFT,
++		RIGHT,
++		TOP,
++		BOTTOM
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_SIZE_CHANGE_", type_id = "meta_size_change_get_type ()")]
++	public enum SizeChange {
++		MAXIMIZE,
++		UNMAXIMIZE,
++		FULLSCREEN,
++		UNFULLSCREEN
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_LAYER_", type_id = "meta_stack_layer_get_type ()")]
++	public enum StackLayer {
++		DESKTOP,
++		BOTTOM,
++		NORMAL,
++		TOP,
++		DOCK,
++		OVERRIDE_REDIRECT,
++		LAST
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_TAB_LIST_", type_id = "meta_tab_list_get_type ()")]
++	public enum TabList {
++		NORMAL,
++		DOCKS,
++		GROUP,
++		NORMAL_ALL
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_TAB_SHOW_", type_id = "meta_tab_show_type_get_type ()")]
++	public enum TabShowType {
++		ICON,
++		INSTANTLY
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_VIRTUAL_", type_id = "meta_virtual_modifier_get_type ()")]
++	[Flags]
++	public enum VirtualModifier {
++		SHIFT_MASK,
++		CONTROL_MASK,
++		ALT_MASK,
++		META_MASK,
++		SUPER_MASK,
++		HYPER_MASK,
++		MOD2_MASK,
++		MOD3_MASK,
++		MOD4_MASK,
++		MOD5_MASK
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_WINDOW_CLIENT_TYPE_", type_id = "meta_window_client_type_get_type ()")]
++	public enum WindowClientType {
++		WAYLAND,
++		X11
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_WINDOW_MENU_", type_id = "meta_window_menu_type_get_type ()")]
++	public enum WindowMenuType {
++		WM,
++		APP
++	}
++	[CCode (cheader_filename = "meta/main.h", cprefix = "META_WINDOW_", type_id = "meta_window_type_get_type ()")]
++	public enum WindowType {
++		NORMAL,
++		DESKTOP,
++		DOCK,
++		DIALOG,
++		MODAL_DIALOG,
++		TOOLBAR,
++		MENU,
++		UTILITY,
++		SPLASHSCREEN,
++		DROPDOWN_MENU,
++		POPUP_MENU,
++		TOOLTIP,
++		NOTIFICATION,
++		COMBO,
++		DND,
++		OVERRIDE_OTHER
++	}
++	[CCode (cheader_filename = "meta/main.h", instance_pos = 2.9)]
++	public delegate void IdleMonitorWatchFunc (Meta.IdleMonitor monitor, uint watch_id);
++	[CCode (cheader_filename = "meta/main.h", instance_pos = 4.9)]
++	public delegate void KeyHandlerFunc (Meta.Display display, Meta.Window window, [CCode (type = "ClutterKeyEvent*")] Clutter.KeyEvent? event, Meta.KeyBinding binding);
++	[CCode (cheader_filename = "meta/main.h", instance_pos = 1.9)]
++	public delegate void PrefsChangedFunc (Meta.Preference pref);
++	[CCode (cheader_filename = "meta/main.h", instance_pos = 1.9)]
++	public delegate bool WindowForeachFunc (Meta.Window window);
++	[CCode (cheader_filename = "meta/main.h", cname = "META_CURRENT_TIME")]
++	public const int CURRENT_TIME;
++	[CCode (cheader_filename = "meta/main.h", cname = "META_DEFAULT_ICON_NAME")]
++	public const string DEFAULT_ICON_NAME;
++	[CCode (cheader_filename = "meta/main.h", cname = "META_ICON_HEIGHT")]
++	public const int ICON_HEIGHT;
++	[CCode (cheader_filename = "meta/main.h", cname = "META_ICON_WIDTH")]
++	public const int ICON_WIDTH;
++	[CCode (cheader_filename = "meta/main.h", cname = "META_MINI_ICON_HEIGHT")]
++	public const int MINI_ICON_HEIGHT;
++	[CCode (cheader_filename = "meta/main.h", cname = "META_MINI_ICON_WIDTH")]
++	public const int MINI_ICON_WIDTH;
++	[CCode (cheader_filename = "meta/main.h", cname = "META_PRIORITY_BEFORE_REDRAW")]
++	public const int PRIORITY_BEFORE_REDRAW;
++	[CCode (cheader_filename = "meta/main.h", cname = "META_PRIORITY_PREFS_NOTIFY")]
++	public const int PRIORITY_PREFS_NOTIFY;
++	[CCode (cheader_filename = "meta/main.h", cname = "META_PRIORITY_REDRAW")]
++	public const int PRIORITY_REDRAW;
++	[CCode (cheader_filename = "meta/main.h", cname = "META_PRIORITY_RESIZE")]
++	public const int PRIORITY_RESIZE;
++	[CCode (cheader_filename = "meta/main.h", cname = "META_VIRTUAL_CORE_KEYBOARD_ID")]
++	public const int VIRTUAL_CORE_KEYBOARD_ID;
++	[CCode (cheader_filename = "meta/main.h", cname = "META_VIRTUAL_CORE_POINTER_ID")]
++	public const int VIRTUAL_CORE_POINTER_ID;
++	[CCode (cheader_filename = "meta/main.h")]
++	public static void add_clutter_debug_flags (Clutter.DebugFlag debug_flags, Clutter.DrawDebugFlag draw_flags, Clutter.PickDebugFlag pick_flags);
++	[CCode (cheader_filename = "meta/main.h")]
++	public static void add_debug_paint_flag (Meta.DebugPaintFlag flag);
++	[CCode (cheader_filename = "meta/main.h")]
++	public static void clutter_init ();
++	[CCode (cheader_filename = "meta/main.h")]
++	public static void exit (Meta.ExitCode code);
++	[CCode (cheader_filename = "meta/main.h")]
++	public static string g_utf8_strndup (string src, size_t n);
++	[CCode (cheader_filename = "meta/main.h")]
++	public static Meta.DebugPaintFlag get_debug_paint_flags ();
++	[CCode (cheader_filename = "meta/main.h")]
++	public static unowned GLib.OptionContext get_option_context ();
++	[CCode (cheader_filename = "meta/main.h")]
++	public static bool get_replace_current_wm ();
++	[CCode (cheader_filename = "meta/main.h")]
++	public static void init ();
++	[CCode (cheader_filename = "meta/main.h")]
++	public static bool is_restart ();
++	[CCode (cheader_filename = "meta/main.h")]
++	public static bool is_topic_enabled (Meta.DebugTopic topic);
++	[CCode (cheader_filename = "meta/main.h")]
++	public static void quit (Meta.ExitCode code);
++	[CCode (cheader_filename = "meta/main.h")]
++	public static void register_with_session ();
++	[CCode (cheader_filename = "meta/main.h")]
++	public static void remove_clutter_debug_flags (Clutter.DebugFlag debug_flags, Clutter.DrawDebugFlag draw_flags, Clutter.PickDebugFlag pick_flags);
++	[CCode (cheader_filename = "meta/main.h")]
++	public static void remove_debug_paint_flag (Meta.DebugPaintFlag flag);
++	[CCode (cheader_filename = "meta/main.h")]
++	public static void restart (string? message);
++	[CCode (cheader_filename = "meta/main.h")]
++	public static int run ();
++	[CCode (cheader_filename = "meta/main.h")]
++	public static void set_gnome_wm_keybindings (string wm_keybindings);
++	[CCode (cheader_filename = "meta/main.h")]
++	public static void set_wm_name (string wm_name);
++	[CCode (cheader_filename = "meta/main.h")]
++	public static void test_init ();
++	[CCode (cheader_filename = "meta/main.h")]
++	public static bool x11_init_gdk_display () throws GLib.Error;
++}
++[CCode (cheader_filename = "libmutter-8-custom.h", has_type_id = false)]
++public struct before_frame {
++}
++[CCode (cheader_filename = "libmutter-8-custom.h", has_type_id = false)]
++public struct frame {
++}
+diff --git vapi/mutter-clutter-7-custom.vala vapi/mutter-clutter-7-custom.vala
+new file mode 100644
+index 00000000..60c9f611
+--- /dev/null
++++ vapi/mutter-clutter-7-custom.vala
+@@ -0,0 +1,42 @@
++namespace Clutter {
++
++	public struct Color {
++		[CCode (cname = "clutter_color_from_hls")]
++		public Color.from_hls (float hue, float luminance, float saturation);
++		[CCode (cname = "clutter_color_from_pixel")]
++		public Color.from_pixel (uint32 pixel);
++		[CCode (cname = "clutter_color_from_string")]
++		public static bool from_string (out Clutter.Color color, string str);
++		public bool parse_string (string str);
++		public static unowned Clutter.Color? get_static (Clutter.StaticColor color);
++	}
++
++	public interface Container : GLib.Object {
++		public void add (params Clutter.Actor[] actors);
++		[CCode (cname = "clutter_container_class_find_child_property")]
++		public class unowned GLib.ParamSpec find_child_property (string property_name);
++		[CCode (cname = "clutter_container_class_list_child_properties")]
++		public class unowned GLib.ParamSpec[] list_child_properties ();
++	}
++
++	public struct Units {
++		[CCode (cname = "clutter_units_from_cm")]
++		public Units.from_cm (float cm);
++		[CCode (cname = "clutter_units_from_em")]
++		public Units.from_em (float em);
++		[CCode (cname = "clutter_units_from_em_for_font")]
++		public Units.from_em_for_font (string font_name, float em);
++		[CCode (cname = "clutter_units_from_mm")]
++		public Units.from_mm (float mm);
++		[CCode (cname = "clutter_units_from_pixels")]
++		public Units.from_pixels (int px);
++		[CCode (cname = "clutter_units_from_pt")]
++		public Units.from_pt (float pt);
++		[CCode (cname = "clutter_units_from_string")]
++		public Units.from_string (string str);
++	}
++
++	[CCode (cheader_filename = "clutter/clutter.h", has_copy_function = false, has_destroy_function = false, has_type_id = false)]
++	public struct Capture {
++	}
++}
+diff --git vapi/mutter-clutter-7.deps vapi/mutter-clutter-7.deps
+index 6bd1ccf7..2f4cf3e8 100644
+--- vapi/mutter-clutter-7.deps
++++ vapi/mutter-clutter-7.deps
+@@ -2,3 +2,4 @@ atk
+ cairo
+ json-glib-1.0
+ mutter-cogl-7
++graphene-gobject-1.0
+diff --git vapi/mutter-clutter-7.vapi vapi/mutter-clutter-7.vapi
+index d7e133df..b1cdd185 100644
+--- vapi/mutter-clutter-7.vapi
++++ vapi/mutter-clutter-7.vapi
+@@ -4659,11 +4659,11 @@ namespace Clutter {
+ 		[Version (since = "0.8")]
+ 		public void allocate_preferred_size (float x, float y);
+ 		[Version (since = "0.6")]
+-		public void apply_relative_transform_to_point (Clutter.Actor? ancestor, Graphene.Point3D point, out unowned Graphene.Point3D vertex);
++		public Graphene.Point3D apply_relative_transform_to_point (Clutter.Actor? ancestor, Graphene.Point3D point);
+ 		[NoWrapper]
+ 		public virtual void apply_transform (ref Clutter.Matrix matrix);
+ 		[Version (since = "0.4")]
+-		public void apply_transform_to_point (Graphene.Point3D point, out unowned Graphene.Point3D vertex);
++		public Graphene.Point3D apply_transform_to_point (Graphene.Point3D point);
+ 		[Version (since = "1.24")]
+ 		public void bind_model (GLib.ListModel? model, owned Clutter.ActorCreateChildFunc create_child_func);
+ 		[NoWrapper]
+@@ -4724,7 +4724,7 @@ namespace Clutter {
+ 		[Version (since = "1.10")]
+ 		public void get_content_scaling_filters (out Clutter.ScalingFilter min_filter, out Clutter.ScalingFilter mag_filter);
+ 		[Version (since = "1.10")]
+-		public unowned Clutter.PaintVolume get_default_paint_volume ();
++		public unowned Clutter.PaintVolume? get_default_paint_volume ();
+ 		[Version (since = "1.10")]
+ 		public uint get_easing_delay ();
+ 		[Version (since = "1.10")]
+@@ -4751,7 +4751,7 @@ namespace Clutter {
+ 		[Version (since = "1.10")]
+ 		public unowned Clutter.LayoutManager get_layout_manager ();
+ 		[Version (since = "1.10")]
+-		public void get_margin (Clutter.Margin margin);
++		public Clutter.Margin get_margin ();
+ 		[Version (since = "1.10")]
+ 		public float get_margin_bottom ();
+ 		[Version (since = "1.10")]
+@@ -4776,8 +4776,11 @@ namespace Clutter {
+ 		public uint8 get_paint_opacity ();
+ 		[Version (since = "0.8")]
+ 		public bool get_paint_visibility ();
++		[Version (since = "1.6")]
++		public unowned Clutter.PaintVolume? get_paint_volume ();
++		[CCode (vfunc_name = "get_paint_volume")]
+ 		[NoWrapper]
+-		public virtual bool get_paint_volume (Clutter.PaintVolume volume);
++		public virtual bool get_paint_volume_vfunc (out Clutter.PaintVolume volume);
+ 		[Version (since = "1.0")]
+ 		public unowned Pango.Context get_pango_context ();
+ 		public unowned Clutter.Actor? get_parent ();
+@@ -4814,9 +4817,9 @@ namespace Clutter {
+ 		public Clutter.TextDirection get_text_direction ();
+ 		[Version (since = "1.12")]
+ 		public Clutter.Matrix get_transform ();
+-		public void get_transformed_extents (out unowned Graphene.Rect rect);
++		public Graphene.Rect get_transformed_extents ();
+ 		[Version (since = "1.6")]
+-		public unowned Clutter.PaintVolume get_transformed_paint_volume (Clutter.Actor relative_to_ancestor);
++		public unowned Clutter.PaintVolume? get_transformed_paint_volume (Clutter.Actor relative_to_ancestor);
+ 		[Version (since = "0.8")]
+ 		public void get_transformed_position (out float x, out float y);
+ 		[Version (since = "0.8")]
+@@ -5275,7 +5278,7 @@ namespace Clutter {
+ 		public AlignConstraint (Clutter.Actor? source, Clutter.AlignAxis axis, float factor);
+ 		public Clutter.AlignAxis get_align_axis ();
+ 		public float get_factor ();
+-		public void get_pivot_point (out unowned Graphene.Point pivot_point);
++		public Graphene.Point get_pivot_point ();
+ 		public unowned Clutter.Actor get_source ();
+ 		public void set_align_axis (Clutter.AlignAxis axis);
+ 		public void set_factor (float factor);
+@@ -5283,8 +5286,7 @@ namespace Clutter {
+ 		public void set_source (Clutter.Actor? source);
+ 		public Clutter.AlignAxis align_axis { get; set construct; }
+ 		public float factor { get; set construct; }
+-		[NoAccessorMethod]
+-		public Graphene.Point pivot_point { owned get; set; }
++		public Graphene.Point pivot_point { get; set; }
+ 		public Clutter.Actor source { get; set construct; }
+ 	}
+ 	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
+@@ -5302,6 +5304,8 @@ namespace Clutter {
+ 	public abstract class Backend : GLib.Object {
+ 		[CCode (has_construct_function = false)]
+ 		protected Backend ();
++		[Version (since = "1.8")]
++		public unowned Cogl.Context get_cogl_context ();
+ 		public unowned Clutter.Seat get_default_seat ();
+ 		[Version (since = "0.8")]
+ 		public unowned Cairo.FontOptions get_font_options ();
+@@ -5561,6 +5565,16 @@ namespace Clutter {
+ 		public void set_factor (double factor);
+ 		public double factor { get; set; }
+ 	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	public class DeviceEvent : Clutter.Event {
++		public weak Clutter.InputDevice device;
++		public Clutter.EventFlags flags;
++		public weak Clutter.Actor source;
++		public weak Clutter.Stage stage;
++		public uint32 time;
++		public Clutter.EventType type;
++	}
+ 	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_effect_get_type ()")]
+ 	[Version (since = "1.4")]
+ 	public abstract class Effect : Clutter.ActorMeta {
+@@ -5630,7 +5644,7 @@ namespace Clutter {
+ 		public uint get_mode_group ();
+ 		public bool get_pad_event_details (out uint number, out uint mode, out double value);
+ 		[Version (since = "1.12")]
+-		public void get_position (Graphene.Point position);
++		public Graphene.Point get_position ();
+ 		[Version (since = "1.0")]
+ 		public unowned Clutter.Actor get_related ();
+ 		[Version (since = "1.10")]
+@@ -5752,7 +5766,7 @@ namespace Clutter {
+ 	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_frame_clock_get_type ()")]
+ 	public class FrameClock : GLib.Object {
+ 		[CCode (has_construct_function = false)]
+-		public FrameClock (float refresh_rate, Clutter.FrameListenerIface iface, void* user_data);
++		protected FrameClock ();
+ 		public void add_timeline (Clutter.Timeline timeline);
+ 		public float get_refresh_rate ();
+ 		public void inhibit ();
+@@ -5850,6 +5864,18 @@ namespace Clutter {
+ 		public bool row_homogeneous { get; set; }
+ 		public uint row_spacing { get; set; }
+ 	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	public class IMEvent : Clutter.Event {
++		public Clutter.EventFlags flags;
++		public uint32 len;
++		public int32 offset;
++		public weak Clutter.Actor source;
++		public weak Clutter.Stage stage;
++		public weak string text;
++		public uint32 time;
++		public Clutter.EventType type;
++	}
+ 	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_image_get_type ()")]
+ 	[Version (since = "1.10")]
+ 	public class Image : GLib.Object, Clutter.Content {
+@@ -5874,7 +5900,7 @@ namespace Clutter {
+ 		[Version (since = "1.6")]
+ 		public bool get_axis_value ([CCode (array_length = false)] double[] axes, Clutter.InputAxis axis, out double value);
+ 		[Version (since = "1.12")]
+-		public bool get_coords (Clutter.EventSequence? sequence, Graphene.Point point);
++		public bool get_coords (Clutter.EventSequence? sequence, out Graphene.Point point);
+ 		[Version (since = "1.0")]
+ 		public int get_device_id ();
+ 		[Version (since = "1.6")]
+@@ -5904,13 +5930,13 @@ namespace Clutter {
+ 		public int get_n_mode_groups ();
+ 		public int get_n_rings ();
+ 		public int get_n_strips ();
++		[Version (since = "1.6")]
++		public GLib.List<weak Clutter.InputDevice> get_physical_devices ();
+ 		[Version (since = "1.2")]
+ 		public unowned Clutter.Stage get_pointer_stage ();
+ 		[Version (since = "1.22")]
+ 		public unowned string get_product_id ();
+ 		public unowned Clutter.Seat get_seat ();
+-		[Version (since = "1.6")]
+-		public GLib.List<weak Clutter.InputDevice> get_slave_devices ();
+ 		[Version (since = "1.22")]
+ 		public unowned string get_vendor_id ();
+ 		[Version (since = "1.10")]
+@@ -5987,7 +6013,7 @@ namespace Clutter {
+ 		public virtual void commit_text (string text);
+ 		[NoWrapper]
+ 		public virtual void delete_surrounding (int offset, uint len);
+-		public bool filter_key_event (Clutter.KeyEvent key);
++		public bool filter_event (Clutter.Event event);
+ 		[NoWrapper]
+ 		public virtual void focus_in (Clutter.InputMethod input_method);
+ 		[NoWrapper]
+@@ -6153,19 +6179,6 @@ namespace Clutter {
+ 		public unowned Clutter.LayoutManager get_manager ();
+ 		public Clutter.LayoutManager manager { get; construct; }
+ 	}
+-	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_margin_get_type ()")]
+-	[Compact]
+-	[Version (since = "1.10")]
+-	public class Margin {
+-		public float bottom;
+-		public float left;
+-		public float right;
+-		public float top;
+-		[CCode (has_construct_function = false)]
+-		public Margin ();
+-		public Clutter.Margin copy ();
+-		public void free ();
+-	}
+ 	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
+ 	[Compact]
+ 	[Version (since = "0.2")]
+@@ -6188,13 +6201,56 @@ namespace Clutter {
+ 		protected OffscreenEffect ();
+ 		public virtual Cogl.Handle create_texture (float width, float height);
+ 		[Version (since = "1.14")]
+-		public bool get_target_rect (out unowned Graphene.Rect rect);
++		public bool get_target_rect (out Graphene.Rect rect);
+ 		[Version (deprecated = true, deprecated_since = "1.14", since = "1.8")]
+ 		public bool get_target_size (out float width, out float height);
+ 		[Version (since = "1.10")]
+ 		public unowned Cogl.Handle get_texture ();
+ 		public virtual void paint_target (Clutter.PaintContext paint_context);
+ 	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	public class PadButtonEvent : Clutter.Event {
++		public uint32 button;
++		public weak Clutter.InputDevice device;
++		public Clutter.EventFlags flags;
++		public uint32 group;
++		public uint32 mode;
++		public weak Clutter.Actor source;
++		public weak Clutter.Stage stage;
++		public uint32 time;
++		public Clutter.EventType type;
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	public class PadRingEvent : Clutter.Event {
++		public double angle;
++		public weak Clutter.InputDevice device;
++		public Clutter.EventFlags flags;
++		public uint32 group;
++		public uint32 mode;
++		public uint32 ring_number;
++		public Clutter.InputDevicePadSource ring_source;
++		public weak Clutter.Actor source;
++		public weak Clutter.Stage stage;
++		public uint32 time;
++		public Clutter.EventType type;
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	public class PadStripEvent : Clutter.Event {
++		public weak Clutter.InputDevice device;
++		public Clutter.EventFlags flags;
++		public uint32 group;
++		public uint32 mode;
++		public weak Clutter.Actor source;
++		public weak Clutter.Stage stage;
++		public uint32 strip_number;
++		public Clutter.InputDevicePadSource strip_source;
++		public uint32 time;
++		public Clutter.EventType type;
++		public double value;
++	}
+ 	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_page_turn_effect_get_type ()")]
+ 	[Version (since = "1.4")]
+ 	public class PageTurnEffect : Clutter.DeformEffect {
+@@ -6236,37 +6292,6 @@ namespace Clutter {
+ 		public void set_name (string name);
+ 		public void unref ();
+ 	}
+-	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_paint_volume_get_type ()")]
+-	[Compact]
+-	[Version (since = "1.4")]
+-	public class PaintVolume {
+-		[Version (since = "1.6")]
+-		public Clutter.PaintVolume copy ();
+-		[Version (since = "1.6")]
+-		public void free ();
+-		[Version (since = "1.6")]
+-		public float get_depth ();
+-		[Version (since = "1.6")]
+-		public float get_height ();
+-		[Version (since = "1.6")]
+-		public void get_origin (out unowned Graphene.Point3D vertex);
+-		[Version (since = "1.6")]
+-		public float get_width ();
+-		[Version (since = "1.6")]
+-		public void set_depth (float depth);
+-		[Version (since = "1.6")]
+-		public bool set_from_allocation (Clutter.Actor actor);
+-		[Version (since = "1.6")]
+-		public void set_height (float height);
+-		[Version (since = "1.6")]
+-		public void set_origin (Graphene.Point3D origin);
+-		[Version (since = "1.6")]
+-		public void set_width (float width);
+-		[Version (since = "1.6")]
+-		public void union (Clutter.PaintVolume another_pv);
+-		[Version (since = "1.10")]
+-		public void union_box (Clutter.ActorBox box);
+-	}
+ 	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_pan_action_get_type ()")]
+ 	[Version (since = "1.12")]
+ 	public class PanAction : Clutter.GestureAction {
+@@ -6370,6 +6395,17 @@ namespace Clutter {
+ 		public void set_property_name (string? property_name);
+ 		public string property_name { get; set; }
+ 	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	[Version (since = "1.28")]
++	public class ProximityEvent : Clutter.Event {
++		public weak Clutter.InputDevice device;
++		public Clutter.EventFlags flags;
++		public weak Clutter.Actor source;
++		public weak Clutter.Stage stage;
++		public uint32 time;
++		public Clutter.EventType type;
++	}
+ 	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_root_node_get_type ()")]
+ 	public class RootNode : Clutter.PaintNode {
+ 		[CCode (has_construct_function = false, type = "ClutterPaintNode*")]
+@@ -6464,6 +6500,7 @@ namespace Clutter {
+ 		public virtual unowned Clutter.InputDevice get_pointer ();
+ 		public void get_pointer_a11y_settings (Clutter.PointerA11ySettings settings);
+ 		public bool get_touch_mode ();
++		public virtual bool handle_device_event (Clutter.Event event);
+ 		public void inhibit_unfocus ();
+ 		public bool is_unfocus_inhibited ();
+ 		public GLib.List<weak Clutter.InputDevice> list_devices ();
+@@ -6588,7 +6625,7 @@ namespace Clutter {
+ 		[Version (since = "1.0")]
+ 		public void ensure_viewport ();
+ 		public unowned Clutter.Actor get_actor_at_pos (Clutter.PickMode pick_mode, float x, float y);
+-		public bool get_capture_final_size (Cairo.RectangleInt rect, int width, int height, float scale);
++		public bool get_capture_final_size (Cairo.RectangleInt rect, out int width, out int height, out float scale);
+ 		public int64 get_frame_counter ();
+ 		[Version (since = "0.6")]
+ 		public unowned Clutter.Actor get_key_focus ();
+@@ -6602,7 +6639,7 @@ namespace Clutter {
+ 		[Version (since = "0.4")]
+ 		public unowned string get_title ();
+ 		public bool get_use_alpha ();
+-		public bool paint_to_buffer (Cairo.RectangleInt rect, float scale, uint8 data, int stride, Cogl.PixelFormat format, Clutter.PaintFlag paint_flags) throws GLib.Error;
++		public bool paint_to_buffer (Cairo.RectangleInt rect, float scale, [CCode (array_length = false, type = "uint8_t*")] uint8[] data, int stride, Cogl.PixelFormat format, Clutter.PaintFlag paint_flags) throws GLib.Error;
+ 		public void paint_to_framebuffer (Cogl.Framebuffer framebuffer, Cairo.RectangleInt rect, float scale, Clutter.PaintFlag paint_flags);
+ 		[CCode (array_length = false)]
+ 		public uint8[] read_pixels (int x, int y, int width = -1, int height = -1);
+@@ -6629,7 +6666,7 @@ namespace Clutter {
+ 		[Version (since = "1.20")]
+ 		public signal void after_paint (Clutter.StageView view);
+ 		public signal void after_update (Clutter.StageView view);
+-		public signal void before_paint (Clutter.StageView view);
++		public virtual signal void before_paint (Clutter.StageView view);
+ 		public signal void before_update (Clutter.StageView view);
+ 		[Version (since = "0.6")]
+ 		public virtual signal void deactivate ();
+@@ -6676,6 +6713,7 @@ namespace Clutter {
+ 		public void get_layout (Cairo.RectangleInt rect);
+ 		public virtual void get_offscreen_transformation_matrix (Cogl.Matrix matrix);
+ 		public unowned Cogl.Framebuffer get_onscreen ();
++		public float get_refresh_rate ();
+ 		public float get_scale ();
+ 		public void invalidate_offscreen_blit_pipeline ();
+ 		[NoWrapper]
+@@ -6683,8 +6721,6 @@ namespace Clutter {
+ 		[NoWrapper]
+ 		public virtual void transform_rect_to_onscreen (Cairo.RectangleInt src_rect, int dst_width, int dst_height, Cairo.RectangleInt dst_rect);
+ 		[NoAccessorMethod]
+-		public Cairo.RectangleInt layout { owned get; set construct; }
+-		[NoAccessorMethod]
+ 		public string name { owned get; construct; }
+ 		[NoAccessorMethod]
+ 		public float refresh_rate { get; set construct; }
+@@ -6732,7 +6768,7 @@ namespace Clutter {
+ 		public Clutter.Color get_cursor_color ();
+ 		public int get_cursor_position ();
+ 		[Version (since = "1.16")]
+-		public void get_cursor_rect (out unowned Graphene.Rect rect);
++		public Graphene.Rect get_cursor_rect ();
+ 		public uint get_cursor_size ();
+ 		public bool get_cursor_visible ();
+ 		public bool get_editable ();
+@@ -6916,7 +6952,7 @@ namespace Clutter {
+ 		[Version (since = "1.6")]
+ 		public bool get_auto_reverse ();
+ 		[Version (since = "1.12")]
+-		public bool get_cubic_bezier_progress (Graphene.Point c_1, Graphene.Point c_2);
++		public bool get_cubic_bezier_progress (out Graphene.Point c_1, out Graphene.Point c_2);
+ 		[Version (since = "1.10")]
+ 		public int get_current_repeat ();
+ 		[Version (since = "0.4")]
+@@ -7108,8 +7144,8 @@ namespace Clutter {
+ 	public class ZoomAction : Clutter.GestureAction {
+ 		[CCode (has_construct_function = false, type = "ClutterAction*")]
+ 		public ZoomAction ();
+-		public void get_focal_point (Graphene.Point point);
+-		public void get_transformed_focal_point (Graphene.Point point);
++		public Graphene.Point get_focal_point ();
++		public Graphene.Point get_transformed_focal_point ();
+ 		public Clutter.ZoomAxis get_zoom_axis ();
+ 		public void set_zoom_axis (Clutter.ZoomAxis axis);
+ 		public Clutter.ZoomAxis zoom_axis { get; set; }
+@@ -7130,6 +7166,7 @@ namespace Clutter {
+ 	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_container_get_type ()")]
+ 	[Version (since = "0.4")]
+ 	public interface Container : GLib.Object {
++		public void add (params Clutter.Actor[] actors);
+ 		[CCode (vfunc_name = "add")]
+ 		[Version (deprecated = true, deprecated_since = "1.10", since = "0.4")]
+ 		public abstract void add_actor (Clutter.Actor actor);
+@@ -7141,21 +7178,20 @@ namespace Clutter {
+ 		public void child_set (Clutter.Actor actor, ...);
+ 		[Version (since = "0.8")]
+ 		public void child_set_property (Clutter.Actor child, string property, GLib.Value value);
+-		[Version (since = "0.8")]
+-		public static unowned GLib.ParamSpec class_find_child_property (GLib.ObjectClass klass, string property_name);
+-		[CCode (array_length_pos = 1.1, array_length_type = "guint")]
+-		[Version (since = "0.8")]
+-		public static GLib.ParamSpec[] class_list_child_properties (GLib.ObjectClass klass);
+ 		[Version (since = "1.2")]
+ 		public virtual void create_child_meta (Clutter.Actor actor);
+ 		[Version (since = "1.2")]
+ 		public virtual void destroy_child_meta (Clutter.Actor actor);
+ 		[Version (since = "0.6")]
+ 		public unowned Clutter.Actor find_child_by_name (string child_name);
++		[CCode (cname = "clutter_container_class_find_child_property")]
++		public class unowned GLib.ParamSpec find_child_property (string property_name);
+ 		[Version (since = "0.8")]
+ 		public virtual unowned Clutter.ChildMeta get_child_meta (Clutter.Actor actor);
+ 		[Version (deprecated = true, deprecated_since = "1.10", since = "0.4")]
+ 		public GLib.List<weak Clutter.Actor> get_children ();
++		[CCode (cname = "clutter_container_class_list_child_properties")]
++		public class unowned GLib.ParamSpec[] list_child_properties ();
+ 		[CCode (vfunc_name = "lower")]
+ 		[Version (deprecated = true, deprecated_since = "1.10", since = "0.6")]
+ 		public virtual void lower_child (Clutter.Actor actor, Clutter.Actor? sibling = null);
+@@ -7256,9 +7292,9 @@ namespace Clutter {
+ 		public bool prev (out unowned Clutter.Actor child);
+ 		public void remove ();
+ 	}
+-	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[CCode (cheader_filename = "clutter/clutter.h", has_copy_function = false, has_destroy_function = false, has_type_id = false)]
+ 	public struct Capture {
+-		public weak Cairo.Surface image;
++		public Cairo.ImageSurface image;
+ 		public Cairo.RectangleInt rect;
+ 	}
+ 	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_color_get_type ()")]
+@@ -7277,11 +7313,12 @@ namespace Clutter {
+ 		public bool equal (Clutter.Color v2);
+ 		[Version (since = "0.2")]
+ 		public void free ();
+-		public static void from_hls (out Clutter.Color color, float hue, float luminance, float saturation);
+-		public static void from_pixel (out Clutter.Color color, uint32 pixel);
+-		[Version (since = "1.0")]
++		[CCode (cname = "clutter_color_from_hls")]
++		public Color.from_hls (float hue, float luminance, float saturation);
++		[CCode (cname = "clutter_color_from_pixel")]
++		public Color.from_pixel (uint32 pixel);
++		[CCode (cname = "clutter_color_from_string")]
+ 		public static bool from_string (out Clutter.Color color, string str);
+-		[Version (since = "1.6")]
+ 		public static unowned Clutter.Color? get_static (Clutter.StaticColor color);
+ 		[Version (since = "1.0")]
+ 		public uint hash ();
+@@ -7290,6 +7327,7 @@ namespace Clutter {
+ 		[Version (since = "1.6")]
+ 		public Clutter.Color interpolate (Clutter.Color final, double progress);
+ 		public Clutter.Color lighten ();
++		public bool parse_string (string str);
+ 		public Clutter.Color shade (double factor);
+ 		public Clutter.Color subtract (Clutter.Color b);
+ 		public void to_hls (out float hue, out float luminance, out float saturation);
+@@ -7298,11 +7336,6 @@ namespace Clutter {
+ 		public string to_string ();
+ 	}
+ 	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
+-	public struct FrameListenerIface {
+-		public weak global::before_frame before_frame;
+-		public weak global::frame frame;
+-	}
+-	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
+ 	public struct KbdA11ySettings {
+ 		public Clutter.KeyboardA11yFlags controls;
+ 		public int slowkeys_delay;
+@@ -7321,6 +7354,16 @@ namespace Clutter {
+ 		public bool equal (Clutter.Knot knot_b);
+ 		public void free ();
+ 	}
++	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_margin_get_type ()")]
++	[Version (since = "1.10")]
++	public struct Margin {
++		public float left;
++		public float right;
++		public float top;
++		public float bottom;
++		public Clutter.Margin? copy ();
++		public void free ();
++	}
+ 	[CCode (cheader_filename = "clutter/clutter.h", type_id = "COGL_TYPE_MATRIX")]
+ 	public struct Matrix : Cogl.Matrix {
+ 		[Version (since = "1.12")]
+@@ -7335,45 +7378,35 @@ namespace Clutter {
+ 		[Version (since = "1.12")]
+ 		public unowned Clutter.Matrix? init_identity ();
+ 	}
+-	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
+-	public struct PadButtonEvent {
+-		public Clutter.EventType type;
+-		public uint32 time;
+-		public Clutter.EventFlags flags;
+-		public weak Clutter.Stage stage;
+-		public weak Clutter.Actor source;
+-		public uint32 button;
+-		public uint32 group;
+-		public weak Clutter.InputDevice device;
+-		public uint32 mode;
+-	}
+-	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
+-	public struct PadRingEvent {
+-		public Clutter.EventType type;
+-		public uint32 time;
+-		public Clutter.EventFlags flags;
+-		public weak Clutter.Stage stage;
+-		public weak Clutter.Actor source;
+-		public weak Clutter.InputDevice device;
+-		public Clutter.InputDevicePadSource ring_source;
+-		public uint32 ring_number;
+-		public uint32 group;
+-		public double angle;
+-		public uint32 mode;
+-	}
+-	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
+-	public struct PadStripEvent {
+-		public Clutter.EventType type;
+-		public uint32 time;
+-		public Clutter.EventFlags flags;
+-		public weak Clutter.Stage stage;
+-		public weak Clutter.Actor source;
+-		public weak Clutter.InputDevice device;
+-		public Clutter.InputDevicePadSource strip_source;
+-		public uint32 strip_number;
+-		public uint32 group;
+-		public double value;
+-		public uint32 mode;
++	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_paint_volume_get_type ()")]
++	[Version (since = "1.4")]
++	public struct PaintVolume {
++		[Version (since = "1.6")]
++		public Clutter.PaintVolume? copy ();
++		[Version (since = "1.6")]
++		public void free ();
++		[Version (since = "1.6")]
++		public float get_depth ();
++		[Version (since = "1.6")]
++		public float get_height ();
++		[Version (since = "1.6")]
++		public Graphene.Point3D get_origin ();
++		[Version (since = "1.6")]
++		public float get_width ();
++		[Version (since = "1.6")]
++		public void set_depth (float depth);
++		[Version (since = "1.6")]
++		public bool set_from_allocation (Clutter.Actor actor);
++		[Version (since = "1.6")]
++		public void set_height (float height);
++		[Version (since = "1.6")]
++		public void set_origin (Graphene.Point3D origin);
++		[Version (since = "1.6")]
++		public void set_width (float width);
++		[Version (since = "1.6")]
++		public void union (Clutter.PaintVolume another_pv);
++		[Version (since = "1.10")]
++		public void union_box (Clutter.ActorBox box);
+ 	}
+ 	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_path_node_get_type ()")]
+ 	[Version (since = "1.0")]
+@@ -7406,21 +7439,25 @@ namespace Clutter {
+ 		public int dwell_delay;
+ 		public int dwell_threshold;
+ 	}
+-	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
+-	[Version (since = "1.28")]
+-	public struct ProximityEvent {
+-		public Clutter.EventType type;
+-		public uint32 time;
+-		public Clutter.EventFlags flags;
+-		public weak Clutter.Stage stage;
+-		public weak Clutter.Actor source;
+-		public weak Clutter.InputDevice device;
+-	}
+ 	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_units_get_type ()")]
+ 	[Version (since = "1.0")]
+ 	public struct Units {
+ 		public Clutter.Units? copy ();
+ 		public void free ();
++		[CCode (cname = "clutter_units_from_cm")]
++		public Units.from_cm (float cm);
++		[CCode (cname = "clutter_units_from_em")]
++		public Units.from_em (float em);
++		[CCode (cname = "clutter_units_from_em_for_font")]
++		public Units.from_em_for_font (string font_name, float em);
++		[CCode (cname = "clutter_units_from_mm")]
++		public Units.from_mm (float mm);
++		[CCode (cname = "clutter_units_from_pixels")]
++		public Units.from_pixels (int px);
++		[CCode (cname = "clutter_units_from_pt")]
++		public Units.from_pt (float pt);
++		[CCode (cname = "clutter_units_from_string")]
++		public Units.from_string (string str);
+ 		public Clutter.UnitType get_unit_type ();
+ 		public float get_unit_value ();
+ 		public float to_pixels ();
+@@ -7638,6 +7675,11 @@ namespace Clutter {
+ 		PAD_BUTTON_RELEASE,
+ 		PAD_STRIP,
+ 		PAD_RING,
++		DEVICE_ADDED,
++		DEVICE_REMOVED,
++		IM_COMMIT,
++		IM_DELETE,
++		IM_PREEDIT,
+ 		EVENT_LAST
+ 	}
+ 	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_FEATURE_", type_id = "clutter_feature_flags_get_type ()")]
+@@ -7787,8 +7829,8 @@ namespace Clutter {
+ 	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_INPUT_MODE_", type_id = "clutter_input_mode_get_type ()")]
+ 	[Version (since = "1.6")]
+ 	public enum InputMode {
+-		MASTER,
+-		SLAVE,
++		LOGICAL,
++		PHYSICAL,
+ 		FLOATING
+ 	}
+ 	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_INPUT_PANEL_STATE_", type_id = "clutter_input_panel_state_get_type ()")]
+@@ -7889,7 +7931,8 @@ namespace Clutter {
+ 	public enum PaintFlag {
+ 		NONE,
+ 		NO_CURSORS,
+-		FORCE_CURSORS
++		FORCE_CURSORS,
++		CLEAR
+ 	}
+ 	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_PAN_", type_id = "clutter_pan_axis_get_type ()")]
+ 	[Version (since = "1.12")]
+@@ -8231,6 +8274,9 @@ namespace Clutter {
+ 	[Version (since = "1.0")]
+ 	public static void cairo_set_source_color (Cairo.Context cr, Clutter.Color color);
+ 	[CCode (cheader_filename = "clutter/clutter.h")]
++	[Version (since = "1.6")]
++	public static unowned Clutter.Color? color_get_static (Clutter.StaticColor color);
++	[CCode (cheader_filename = "clutter/clutter.h")]
+ 	[Version (since = "1.14")]
+ 	public static void disable_accessibility ();
+ 	[CCode (cheader_filename = "clutter/clutter.h")]
+diff --git vapi/mutter-clutter-8-custom.vala vapi/mutter-clutter-8-custom.vala
+new file mode 100644
+index 00000000..60c9f611
+--- /dev/null
++++ vapi/mutter-clutter-8-custom.vala
+@@ -0,0 +1,42 @@
++namespace Clutter {
++
++	public struct Color {
++		[CCode (cname = "clutter_color_from_hls")]
++		public Color.from_hls (float hue, float luminance, float saturation);
++		[CCode (cname = "clutter_color_from_pixel")]
++		public Color.from_pixel (uint32 pixel);
++		[CCode (cname = "clutter_color_from_string")]
++		public static bool from_string (out Clutter.Color color, string str);
++		public bool parse_string (string str);
++		public static unowned Clutter.Color? get_static (Clutter.StaticColor color);
++	}
++
++	public interface Container : GLib.Object {
++		public void add (params Clutter.Actor[] actors);
++		[CCode (cname = "clutter_container_class_find_child_property")]
++		public class unowned GLib.ParamSpec find_child_property (string property_name);
++		[CCode (cname = "clutter_container_class_list_child_properties")]
++		public class unowned GLib.ParamSpec[] list_child_properties ();
++	}
++
++	public struct Units {
++		[CCode (cname = "clutter_units_from_cm")]
++		public Units.from_cm (float cm);
++		[CCode (cname = "clutter_units_from_em")]
++		public Units.from_em (float em);
++		[CCode (cname = "clutter_units_from_em_for_font")]
++		public Units.from_em_for_font (string font_name, float em);
++		[CCode (cname = "clutter_units_from_mm")]
++		public Units.from_mm (float mm);
++		[CCode (cname = "clutter_units_from_pixels")]
++		public Units.from_pixels (int px);
++		[CCode (cname = "clutter_units_from_pt")]
++		public Units.from_pt (float pt);
++		[CCode (cname = "clutter_units_from_string")]
++		public Units.from_string (string str);
++	}
++
++	[CCode (cheader_filename = "clutter/clutter.h", has_copy_function = false, has_destroy_function = false, has_type_id = false)]
++	public struct Capture {
++	}
++}
+diff --git vapi/mutter-clutter-8.deps vapi/mutter-clutter-8.deps
+new file mode 100644
+index 00000000..a03b108b
+--- /dev/null
++++ vapi/mutter-clutter-8.deps
+@@ -0,0 +1,5 @@
++atk
++cairo
++json-glib-1.0
++mutter-cogl-8
++graphene-gobject-1.0
+diff --git vapi/mutter-clutter-8.vapi vapi/mutter-clutter-8.vapi
+new file mode 100644
+index 00000000..e2fe5989
+--- /dev/null
++++ vapi/mutter-clutter-8.vapi
+@@ -0,0 +1,8279 @@
++/* mutter-clutter-8.vapi generated by vapigen, do not modify. */
++
++[CCode (cprefix = "Clutter", gir_namespace = "Clutter", gir_version = "8", lower_case_cprefix = "clutter_")]
++namespace Clutter {
++	namespace Key {
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_0")]
++		public const uint @0;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_1")]
++		public const uint @1;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_2")]
++		public const uint @2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3")]
++		public const uint @3;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_AltCursor")]
++		public const uint @3270_AltCursor;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_Attn")]
++		public const uint @3270_Attn;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_BackTab")]
++		public const uint @3270_BackTab;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_ChangeScreen")]
++		public const uint @3270_ChangeScreen;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_Copy")]
++		public const uint @3270_Copy;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_CursorBlink")]
++		public const uint @3270_CursorBlink;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_CursorSelect")]
++		public const uint @3270_CursorSelect;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_DeleteWord")]
++		public const uint @3270_DeleteWord;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_Duplicate")]
++		public const uint @3270_Duplicate;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_Enter")]
++		public const uint @3270_Enter;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_EraseEOF")]
++		public const uint @3270_EraseEOF;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_EraseInput")]
++		public const uint @3270_EraseInput;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_ExSelect")]
++		public const uint @3270_ExSelect;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_FieldMark")]
++		public const uint @3270_FieldMark;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_Ident")]
++		public const uint @3270_Ident;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_Jump")]
++		public const uint @3270_Jump;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_KeyClick")]
++		public const uint @3270_KeyClick;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_Left2")]
++		public const uint @3270_Left2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_PA1")]
++		public const uint @3270_PA1;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_PA2")]
++		public const uint @3270_PA2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_PA3")]
++		public const uint @3270_PA3;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_Play")]
++		public const uint @3270_Play;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_PrintScreen")]
++		public const uint @3270_PrintScreen;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_Quit")]
++		public const uint @3270_Quit;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_Record")]
++		public const uint @3270_Record;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_Reset")]
++		public const uint @3270_Reset;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_Right2")]
++		public const uint @3270_Right2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_Rule")]
++		public const uint @3270_Rule;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_Setup")]
++		public const uint @3270_Setup;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_Test")]
++		public const uint @3270_Test;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_4")]
++		public const uint @4;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_5")]
++		public const uint @5;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_6")]
++		public const uint @6;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_7")]
++		public const uint @7;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_8")]
++		public const uint @8;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_9")]
++		public const uint @9;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_A")]
++		public const uint A;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AE")]
++		public const uint AE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Aacute")]
++		public const uint Aacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Abelowdot")]
++		public const uint Abelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Abreve")]
++		public const uint Abreve;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Abreveacute")]
++		public const uint Abreveacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Abrevebelowdot")]
++		public const uint Abrevebelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Abrevegrave")]
++		public const uint Abrevegrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Abrevehook")]
++		public const uint Abrevehook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Abrevetilde")]
++		public const uint Abrevetilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AccessX_Enable")]
++		public const uint AccessX_Enable;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AccessX_Feedback_Enable")]
++		public const uint AccessX_Feedback_Enable;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Acircumflex")]
++		public const uint Acircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Acircumflexacute")]
++		public const uint Acircumflexacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Acircumflexbelowdot")]
++		public const uint Acircumflexbelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Acircumflexgrave")]
++		public const uint Acircumflexgrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Acircumflexhook")]
++		public const uint Acircumflexhook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Acircumflextilde")]
++		public const uint Acircumflextilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AddFavorite")]
++		public const uint AddFavorite;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Adiaeresis")]
++		public const uint Adiaeresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Agrave")]
++		public const uint Agrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ahook")]
++		public const uint Ahook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Alt_L")]
++		public const uint Alt_L;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Alt_R")]
++		public const uint Alt_R;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Amacron")]
++		public const uint Amacron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Aogonek")]
++		public const uint Aogonek;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ApplicationLeft")]
++		public const uint ApplicationLeft;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ApplicationRight")]
++		public const uint ApplicationRight;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_0")]
++		public const uint Arabic_0;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_1")]
++		public const uint Arabic_1;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_2")]
++		public const uint Arabic_2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_3")]
++		public const uint Arabic_3;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_4")]
++		public const uint Arabic_4;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_5")]
++		public const uint Arabic_5;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_6")]
++		public const uint Arabic_6;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_7")]
++		public const uint Arabic_7;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_8")]
++		public const uint Arabic_8;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_9")]
++		public const uint Arabic_9;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_ain")]
++		public const uint Arabic_ain;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_alef")]
++		public const uint Arabic_alef;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_alefmaksura")]
++		public const uint Arabic_alefmaksura;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_beh")]
++		public const uint Arabic_beh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_comma")]
++		public const uint Arabic_comma;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_dad")]
++		public const uint Arabic_dad;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_dal")]
++		public const uint Arabic_dal;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_damma")]
++		public const uint Arabic_damma;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_dammatan")]
++		public const uint Arabic_dammatan;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_ddal")]
++		public const uint Arabic_ddal;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_farsi_yeh")]
++		public const uint Arabic_farsi_yeh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_fatha")]
++		public const uint Arabic_fatha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_fathatan")]
++		public const uint Arabic_fathatan;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_feh")]
++		public const uint Arabic_feh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_fullstop")]
++		public const uint Arabic_fullstop;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_gaf")]
++		public const uint Arabic_gaf;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_ghain")]
++		public const uint Arabic_ghain;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_ha")]
++		public const uint Arabic_ha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_hah")]
++		public const uint Arabic_hah;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_hamza")]
++		public const uint Arabic_hamza;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_hamza_above")]
++		public const uint Arabic_hamza_above;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_hamza_below")]
++		public const uint Arabic_hamza_below;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_hamzaonalef")]
++		public const uint Arabic_hamzaonalef;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_hamzaonwaw")]
++		public const uint Arabic_hamzaonwaw;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_hamzaonyeh")]
++		public const uint Arabic_hamzaonyeh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_hamzaunderalef")]
++		public const uint Arabic_hamzaunderalef;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_heh")]
++		public const uint Arabic_heh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_heh_doachashmee")]
++		public const uint Arabic_heh_doachashmee;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_heh_goal")]
++		public const uint Arabic_heh_goal;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_jeem")]
++		public const uint Arabic_jeem;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_jeh")]
++		public const uint Arabic_jeh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_kaf")]
++		public const uint Arabic_kaf;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_kasra")]
++		public const uint Arabic_kasra;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_kasratan")]
++		public const uint Arabic_kasratan;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_keheh")]
++		public const uint Arabic_keheh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_khah")]
++		public const uint Arabic_khah;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_lam")]
++		public const uint Arabic_lam;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_madda_above")]
++		public const uint Arabic_madda_above;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_maddaonalef")]
++		public const uint Arabic_maddaonalef;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_meem")]
++		public const uint Arabic_meem;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_noon")]
++		public const uint Arabic_noon;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_noon_ghunna")]
++		public const uint Arabic_noon_ghunna;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_peh")]
++		public const uint Arabic_peh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_percent")]
++		public const uint Arabic_percent;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_qaf")]
++		public const uint Arabic_qaf;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_question_mark")]
++		public const uint Arabic_question_mark;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_ra")]
++		public const uint Arabic_ra;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_rreh")]
++		public const uint Arabic_rreh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_sad")]
++		public const uint Arabic_sad;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_seen")]
++		public const uint Arabic_seen;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_semicolon")]
++		public const uint Arabic_semicolon;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_shadda")]
++		public const uint Arabic_shadda;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_sheen")]
++		public const uint Arabic_sheen;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_sukun")]
++		public const uint Arabic_sukun;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_superscript_alef")]
++		public const uint Arabic_superscript_alef;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_switch")]
++		public const uint Arabic_switch;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_tah")]
++		public const uint Arabic_tah;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_tatweel")]
++		public const uint Arabic_tatweel;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_tcheh")]
++		public const uint Arabic_tcheh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_teh")]
++		public const uint Arabic_teh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_tehmarbuta")]
++		public const uint Arabic_tehmarbuta;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_thal")]
++		public const uint Arabic_thal;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_theh")]
++		public const uint Arabic_theh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_tteh")]
++		public const uint Arabic_tteh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_veh")]
++		public const uint Arabic_veh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_waw")]
++		public const uint Arabic_waw;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_yeh")]
++		public const uint Arabic_yeh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_yeh_baree")]
++		public const uint Arabic_yeh_baree;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_zah")]
++		public const uint Arabic_zah;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_zain")]
++		public const uint Arabic_zain;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Aring")]
++		public const uint Aring;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_AT")]
++		public const uint Armenian_AT;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_AYB")]
++		public const uint Armenian_AYB;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_BEN")]
++		public const uint Armenian_BEN;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_CHA")]
++		public const uint Armenian_CHA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_DA")]
++		public const uint Armenian_DA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_DZA")]
++		public const uint Armenian_DZA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_E")]
++		public const uint Armenian_E;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_FE")]
++		public const uint Armenian_FE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_GHAT")]
++		public const uint Armenian_GHAT;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_GIM")]
++		public const uint Armenian_GIM;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_HI")]
++		public const uint Armenian_HI;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_HO")]
++		public const uint Armenian_HO;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_INI")]
++		public const uint Armenian_INI;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_JE")]
++		public const uint Armenian_JE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_KE")]
++		public const uint Armenian_KE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_KEN")]
++		public const uint Armenian_KEN;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_KHE")]
++		public const uint Armenian_KHE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_LYUN")]
++		public const uint Armenian_LYUN;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_MEN")]
++		public const uint Armenian_MEN;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_NU")]
++		public const uint Armenian_NU;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_O")]
++		public const uint Armenian_O;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_PE")]
++		public const uint Armenian_PE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_PYUR")]
++		public const uint Armenian_PYUR;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_RA")]
++		public const uint Armenian_RA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_RE")]
++		public const uint Armenian_RE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_SE")]
++		public const uint Armenian_SE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_SHA")]
++		public const uint Armenian_SHA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_TCHE")]
++		public const uint Armenian_TCHE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_TO")]
++		public const uint Armenian_TO;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_TSA")]
++		public const uint Armenian_TSA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_TSO")]
++		public const uint Armenian_TSO;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_TYUN")]
++		public const uint Armenian_TYUN;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_VEV")]
++		public const uint Armenian_VEV;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_VO")]
++		public const uint Armenian_VO;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_VYUN")]
++		public const uint Armenian_VYUN;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_YECH")]
++		public const uint Armenian_YECH;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_ZA")]
++		public const uint Armenian_ZA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_ZHE")]
++		public const uint Armenian_ZHE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_accent")]
++		public const uint Armenian_accent;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_amanak")]
++		public const uint Armenian_amanak;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_apostrophe")]
++		public const uint Armenian_apostrophe;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_at")]
++		public const uint Armenian_at;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_ayb")]
++		public const uint Armenian_ayb;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_ben")]
++		public const uint Armenian_ben;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_but")]
++		public const uint Armenian_but;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_cha")]
++		public const uint Armenian_cha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_da")]
++		public const uint Armenian_da;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_dza")]
++		public const uint Armenian_dza;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_e")]
++		public const uint Armenian_e;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_exclam")]
++		public const uint Armenian_exclam;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_fe")]
++		public const uint Armenian_fe;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_full_stop")]
++		public const uint Armenian_full_stop;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_ghat")]
++		public const uint Armenian_ghat;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_gim")]
++		public const uint Armenian_gim;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_hi")]
++		public const uint Armenian_hi;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_ho")]
++		public const uint Armenian_ho;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_hyphen")]
++		public const uint Armenian_hyphen;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_ini")]
++		public const uint Armenian_ini;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_je")]
++		public const uint Armenian_je;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_ke")]
++		public const uint Armenian_ke;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_ken")]
++		public const uint Armenian_ken;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_khe")]
++		public const uint Armenian_khe;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_ligature_ew")]
++		public const uint Armenian_ligature_ew;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_lyun")]
++		public const uint Armenian_lyun;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_men")]
++		public const uint Armenian_men;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_nu")]
++		public const uint Armenian_nu;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_o")]
++		public const uint Armenian_o;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_paruyk")]
++		public const uint Armenian_paruyk;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_pe")]
++		public const uint Armenian_pe;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_pyur")]
++		public const uint Armenian_pyur;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_question")]
++		public const uint Armenian_question;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_ra")]
++		public const uint Armenian_ra;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_re")]
++		public const uint Armenian_re;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_se")]
++		public const uint Armenian_se;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_separation_mark")]
++		public const uint Armenian_separation_mark;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_sha")]
++		public const uint Armenian_sha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_shesht")]
++		public const uint Armenian_shesht;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_tche")]
++		public const uint Armenian_tche;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_to")]
++		public const uint Armenian_to;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_tsa")]
++		public const uint Armenian_tsa;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_tso")]
++		public const uint Armenian_tso;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_tyun")]
++		public const uint Armenian_tyun;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_verjaket")]
++		public const uint Armenian_verjaket;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_vev")]
++		public const uint Armenian_vev;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_vo")]
++		public const uint Armenian_vo;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_vyun")]
++		public const uint Armenian_vyun;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_yech")]
++		public const uint Armenian_yech;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_yentamna")]
++		public const uint Armenian_yentamna;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_za")]
++		public const uint Armenian_za;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_zhe")]
++		public const uint Armenian_zhe;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Atilde")]
++		public const uint Atilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudibleBell_Enable")]
++		public const uint AudibleBell_Enable;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioCycleTrack")]
++		public const uint AudioCycleTrack;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioForward")]
++		public const uint AudioForward;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioLowerVolume")]
++		public const uint AudioLowerVolume;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioMedia")]
++		public const uint AudioMedia;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioMicMute")]
++		public const uint AudioMicMute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioMute")]
++		public const uint AudioMute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioNext")]
++		public const uint AudioNext;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioPause")]
++		public const uint AudioPause;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioPlay")]
++		public const uint AudioPlay;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioPrev")]
++		public const uint AudioPrev;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioRaiseVolume")]
++		public const uint AudioRaiseVolume;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioRandomPlay")]
++		public const uint AudioRandomPlay;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioRecord")]
++		public const uint AudioRecord;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioRepeat")]
++		public const uint AudioRepeat;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioRewind")]
++		public const uint AudioRewind;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioStop")]
++		public const uint AudioStop;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Away")]
++		public const uint Away;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_B")]
++		public const uint B;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Babovedot")]
++		public const uint Babovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Back")]
++		public const uint Back;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_BackForward")]
++		public const uint BackForward;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_BackSpace")]
++		public const uint BackSpace;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Battery")]
++		public const uint Battery;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Begin")]
++		public const uint Begin;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Blue")]
++		public const uint Blue;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Bluetooth")]
++		public const uint Bluetooth;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Book")]
++		public const uint Book;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_BounceKeys_Enable")]
++		public const uint BounceKeys_Enable;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Break")]
++		public const uint Break;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_BrightnessAdjust")]
++		public const uint BrightnessAdjust;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Byelorussian_SHORTU")]
++		public const uint Byelorussian_SHORTU;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Byelorussian_shortu")]
++		public const uint Byelorussian_shortu;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_C")]
++		public const uint C;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_CD")]
++		public const uint CD;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_CH")]
++		public const uint CH;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_C_H")]
++		public const uint C_H;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_C_h")]
++		public const uint C_h;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cabovedot")]
++		public const uint Cabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cacute")]
++		public const uint Cacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Calculator")]
++		public const uint Calculator;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Calendar")]
++		public const uint Calendar;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cancel")]
++		public const uint Cancel;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Caps_Lock")]
++		public const uint Caps_Lock;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ccaron")]
++		public const uint Ccaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ccedilla")]
++		public const uint Ccedilla;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ccircumflex")]
++		public const uint Ccircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ch")]
++		public const uint Ch;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Clear")]
++		public const uint Clear;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ClearGrab")]
++		public const uint ClearGrab;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Close")]
++		public const uint Close;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Codeinput")]
++		public const uint Codeinput;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ColonSign")]
++		public const uint ColonSign;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Community")]
++		public const uint Community;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ContrastAdjust")]
++		public const uint ContrastAdjust;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Control_L")]
++		public const uint Control_L;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Control_R")]
++		public const uint Control_R;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Copy")]
++		public const uint Copy;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_CruzeiroSign")]
++		public const uint CruzeiroSign;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cut")]
++		public const uint Cut;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_CycleAngle")]
++		public const uint CycleAngle;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_A")]
++		public const uint Cyrillic_A;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_BE")]
++		public const uint Cyrillic_BE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_CHE")]
++		public const uint Cyrillic_CHE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_CHE_descender")]
++		public const uint Cyrillic_CHE_descender;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_CHE_vertstroke")]
++		public const uint Cyrillic_CHE_vertstroke;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_DE")]
++		public const uint Cyrillic_DE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_DZHE")]
++		public const uint Cyrillic_DZHE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_E")]
++		public const uint Cyrillic_E;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_EF")]
++		public const uint Cyrillic_EF;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_EL")]
++		public const uint Cyrillic_EL;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_EM")]
++		public const uint Cyrillic_EM;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_EN")]
++		public const uint Cyrillic_EN;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_EN_descender")]
++		public const uint Cyrillic_EN_descender;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ER")]
++		public const uint Cyrillic_ER;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ES")]
++		public const uint Cyrillic_ES;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_GHE")]
++		public const uint Cyrillic_GHE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_GHE_bar")]
++		public const uint Cyrillic_GHE_bar;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_HA")]
++		public const uint Cyrillic_HA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_HARDSIGN")]
++		public const uint Cyrillic_HARDSIGN;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_HA_descender")]
++		public const uint Cyrillic_HA_descender;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_I")]
++		public const uint Cyrillic_I;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_IE")]
++		public const uint Cyrillic_IE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_IO")]
++		public const uint Cyrillic_IO;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_I_macron")]
++		public const uint Cyrillic_I_macron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_JE")]
++		public const uint Cyrillic_JE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_KA")]
++		public const uint Cyrillic_KA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_KA_descender")]
++		public const uint Cyrillic_KA_descender;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_KA_vertstroke")]
++		public const uint Cyrillic_KA_vertstroke;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_LJE")]
++		public const uint Cyrillic_LJE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_NJE")]
++		public const uint Cyrillic_NJE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_O")]
++		public const uint Cyrillic_O;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_O_bar")]
++		public const uint Cyrillic_O_bar;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_PE")]
++		public const uint Cyrillic_PE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_SCHWA")]
++		public const uint Cyrillic_SCHWA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_SHA")]
++		public const uint Cyrillic_SHA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_SHCHA")]
++		public const uint Cyrillic_SHCHA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_SHHA")]
++		public const uint Cyrillic_SHHA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_SHORTI")]
++		public const uint Cyrillic_SHORTI;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_SOFTSIGN")]
++		public const uint Cyrillic_SOFTSIGN;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_TE")]
++		public const uint Cyrillic_TE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_TSE")]
++		public const uint Cyrillic_TSE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_U")]
++		public const uint Cyrillic_U;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_U_macron")]
++		public const uint Cyrillic_U_macron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_U_straight")]
++		public const uint Cyrillic_U_straight;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_U_straight_bar")]
++		public const uint Cyrillic_U_straight_bar;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_VE")]
++		public const uint Cyrillic_VE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_YA")]
++		public const uint Cyrillic_YA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_YERU")]
++		public const uint Cyrillic_YERU;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_YU")]
++		public const uint Cyrillic_YU;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ZE")]
++		public const uint Cyrillic_ZE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ZHE")]
++		public const uint Cyrillic_ZHE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ZHE_descender")]
++		public const uint Cyrillic_ZHE_descender;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_a")]
++		public const uint Cyrillic_a;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_be")]
++		public const uint Cyrillic_be;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_che")]
++		public const uint Cyrillic_che;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_che_descender")]
++		public const uint Cyrillic_che_descender;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_che_vertstroke")]
++		public const uint Cyrillic_che_vertstroke;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_de")]
++		public const uint Cyrillic_de;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_dzhe")]
++		public const uint Cyrillic_dzhe;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_e")]
++		public const uint Cyrillic_e;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ef")]
++		public const uint Cyrillic_ef;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_el")]
++		public const uint Cyrillic_el;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_em")]
++		public const uint Cyrillic_em;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_en")]
++		public const uint Cyrillic_en;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_en_descender")]
++		public const uint Cyrillic_en_descender;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_er")]
++		public const uint Cyrillic_er;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_es")]
++		public const uint Cyrillic_es;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ghe")]
++		public const uint Cyrillic_ghe;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ghe_bar")]
++		public const uint Cyrillic_ghe_bar;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ha")]
++		public const uint Cyrillic_ha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ha_descender")]
++		public const uint Cyrillic_ha_descender;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_hardsign")]
++		public const uint Cyrillic_hardsign;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_i")]
++		public const uint Cyrillic_i;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_i_macron")]
++		public const uint Cyrillic_i_macron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ie")]
++		public const uint Cyrillic_ie;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_io")]
++		public const uint Cyrillic_io;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_je")]
++		public const uint Cyrillic_je;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ka")]
++		public const uint Cyrillic_ka;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ka_descender")]
++		public const uint Cyrillic_ka_descender;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ka_vertstroke")]
++		public const uint Cyrillic_ka_vertstroke;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_lje")]
++		public const uint Cyrillic_lje;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_nje")]
++		public const uint Cyrillic_nje;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_o")]
++		public const uint Cyrillic_o;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_o_bar")]
++		public const uint Cyrillic_o_bar;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_pe")]
++		public const uint Cyrillic_pe;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_schwa")]
++		public const uint Cyrillic_schwa;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_sha")]
++		public const uint Cyrillic_sha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_shcha")]
++		public const uint Cyrillic_shcha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_shha")]
++		public const uint Cyrillic_shha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_shorti")]
++		public const uint Cyrillic_shorti;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_softsign")]
++		public const uint Cyrillic_softsign;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_te")]
++		public const uint Cyrillic_te;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_tse")]
++		public const uint Cyrillic_tse;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_u")]
++		public const uint Cyrillic_u;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_u_macron")]
++		public const uint Cyrillic_u_macron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_u_straight")]
++		public const uint Cyrillic_u_straight;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_u_straight_bar")]
++		public const uint Cyrillic_u_straight_bar;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ve")]
++		public const uint Cyrillic_ve;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ya")]
++		public const uint Cyrillic_ya;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_yeru")]
++		public const uint Cyrillic_yeru;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_yu")]
++		public const uint Cyrillic_yu;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ze")]
++		public const uint Cyrillic_ze;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_zhe")]
++		public const uint Cyrillic_zhe;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_zhe_descender")]
++		public const uint Cyrillic_zhe_descender;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_D")]
++		public const uint D;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_DOS")]
++		public const uint DOS;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Dabovedot")]
++		public const uint Dabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Dcaron")]
++		public const uint Dcaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Delete")]
++		public const uint Delete;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Display")]
++		public const uint Display;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Documents")]
++		public const uint Documents;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_DongSign")]
++		public const uint DongSign;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Down")]
++		public const uint Down;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Dstroke")]
++		public const uint Dstroke;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_E")]
++		public const uint E;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ENG")]
++		public const uint ENG;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ETH")]
++		public const uint ETH;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_EZH")]
++		public const uint EZH;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Eabovedot")]
++		public const uint Eabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Eacute")]
++		public const uint Eacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ebelowdot")]
++		public const uint Ebelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ecaron")]
++		public const uint Ecaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ecircumflex")]
++		public const uint Ecircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ecircumflexacute")]
++		public const uint Ecircumflexacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ecircumflexbelowdot")]
++		public const uint Ecircumflexbelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ecircumflexgrave")]
++		public const uint Ecircumflexgrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ecircumflexhook")]
++		public const uint Ecircumflexhook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ecircumflextilde")]
++		public const uint Ecircumflextilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_EcuSign")]
++		public const uint EcuSign;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ediaeresis")]
++		public const uint Ediaeresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Egrave")]
++		public const uint Egrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ehook")]
++		public const uint Ehook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Eisu_Shift")]
++		public const uint Eisu_Shift;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Eisu_toggle")]
++		public const uint Eisu_toggle;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Eject")]
++		public const uint Eject;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Emacron")]
++		public const uint Emacron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_End")]
++		public const uint End;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Eogonek")]
++		public const uint Eogonek;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Escape")]
++		public const uint Escape;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Eth")]
++		public const uint Eth;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Etilde")]
++		public const uint Etilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_EuroSign")]
++		public const uint EuroSign;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Excel")]
++		public const uint Excel;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Execute")]
++		public const uint Execute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Explorer")]
++		public const uint Explorer;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F")]
++		public const uint F;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F1")]
++		public const uint F1;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F10")]
++		public const uint F10;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F11")]
++		public const uint F11;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F12")]
++		public const uint F12;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F13")]
++		public const uint F13;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F14")]
++		public const uint F14;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F15")]
++		public const uint F15;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F16")]
++		public const uint F16;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F17")]
++		public const uint F17;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F18")]
++		public const uint F18;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F19")]
++		public const uint F19;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F2")]
++		public const uint F2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F20")]
++		public const uint F20;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F21")]
++		public const uint F21;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F22")]
++		public const uint F22;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F23")]
++		public const uint F23;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F24")]
++		public const uint F24;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F25")]
++		public const uint F25;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F26")]
++		public const uint F26;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F27")]
++		public const uint F27;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F28")]
++		public const uint F28;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F29")]
++		public const uint F29;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F3")]
++		public const uint F3;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F30")]
++		public const uint F30;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F31")]
++		public const uint F31;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F32")]
++		public const uint F32;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F33")]
++		public const uint F33;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F34")]
++		public const uint F34;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F35")]
++		public const uint F35;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F4")]
++		public const uint F4;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F5")]
++		public const uint F5;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F6")]
++		public const uint F6;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F7")]
++		public const uint F7;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F8")]
++		public const uint F8;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F9")]
++		public const uint F9;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_FFrancSign")]
++		public const uint FFrancSign;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Fabovedot")]
++		public const uint Fabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Farsi_0")]
++		public const uint Farsi_0;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Farsi_1")]
++		public const uint Farsi_1;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Farsi_2")]
++		public const uint Farsi_2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Farsi_3")]
++		public const uint Farsi_3;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Farsi_4")]
++		public const uint Farsi_4;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Farsi_5")]
++		public const uint Farsi_5;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Farsi_6")]
++		public const uint Farsi_6;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Farsi_7")]
++		public const uint Farsi_7;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Farsi_8")]
++		public const uint Farsi_8;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Farsi_9")]
++		public const uint Farsi_9;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Farsi_yeh")]
++		public const uint Farsi_yeh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Favorites")]
++		public const uint Favorites;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Finance")]
++		public const uint Finance;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Find")]
++		public const uint Find;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_First_Virtual_Screen")]
++		public const uint First_Virtual_Screen;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Forward")]
++		public const uint Forward;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_FrameBack")]
++		public const uint FrameBack;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_FrameForward")]
++		public const uint FrameForward;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_G")]
++		public const uint G;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Gabovedot")]
++		public const uint Gabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Game")]
++		public const uint Game;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Gbreve")]
++		public const uint Gbreve;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Gcaron")]
++		public const uint Gcaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Gcedilla")]
++		public const uint Gcedilla;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Gcircumflex")]
++		public const uint Gcircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_an")]
++		public const uint Georgian_an;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_ban")]
++		public const uint Georgian_ban;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_can")]
++		public const uint Georgian_can;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_char")]
++		public const uint Georgian_char;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_chin")]
++		public const uint Georgian_chin;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_cil")]
++		public const uint Georgian_cil;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_don")]
++		public const uint Georgian_don;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_en")]
++		public const uint Georgian_en;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_fi")]
++		public const uint Georgian_fi;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_gan")]
++		public const uint Georgian_gan;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_ghan")]
++		public const uint Georgian_ghan;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_hae")]
++		public const uint Georgian_hae;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_har")]
++		public const uint Georgian_har;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_he")]
++		public const uint Georgian_he;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_hie")]
++		public const uint Georgian_hie;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_hoe")]
++		public const uint Georgian_hoe;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_in")]
++		public const uint Georgian_in;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_jhan")]
++		public const uint Georgian_jhan;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_jil")]
++		public const uint Georgian_jil;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_kan")]
++		public const uint Georgian_kan;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_khar")]
++		public const uint Georgian_khar;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_las")]
++		public const uint Georgian_las;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_man")]
++		public const uint Georgian_man;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_nar")]
++		public const uint Georgian_nar;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_on")]
++		public const uint Georgian_on;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_par")]
++		public const uint Georgian_par;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_phar")]
++		public const uint Georgian_phar;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_qar")]
++		public const uint Georgian_qar;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_rae")]
++		public const uint Georgian_rae;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_san")]
++		public const uint Georgian_san;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_shin")]
++		public const uint Georgian_shin;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_tan")]
++		public const uint Georgian_tan;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_tar")]
++		public const uint Georgian_tar;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_un")]
++		public const uint Georgian_un;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_vin")]
++		public const uint Georgian_vin;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_we")]
++		public const uint Georgian_we;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_xan")]
++		public const uint Georgian_xan;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_zen")]
++		public const uint Georgian_zen;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_zhar")]
++		public const uint Georgian_zhar;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Go")]
++		public const uint Go;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_ALPHA")]
++		public const uint Greek_ALPHA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_ALPHAaccent")]
++		public const uint Greek_ALPHAaccent;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_BETA")]
++		public const uint Greek_BETA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_CHI")]
++		public const uint Greek_CHI;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_DELTA")]
++		public const uint Greek_DELTA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_EPSILON")]
++		public const uint Greek_EPSILON;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_EPSILONaccent")]
++		public const uint Greek_EPSILONaccent;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_ETA")]
++		public const uint Greek_ETA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_ETAaccent")]
++		public const uint Greek_ETAaccent;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_GAMMA")]
++		public const uint Greek_GAMMA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_IOTA")]
++		public const uint Greek_IOTA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_IOTAaccent")]
++		public const uint Greek_IOTAaccent;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_IOTAdiaeresis")]
++		public const uint Greek_IOTAdiaeresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_IOTAdieresis")]
++		public const uint Greek_IOTAdieresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_KAPPA")]
++		public const uint Greek_KAPPA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_LAMBDA")]
++		public const uint Greek_LAMBDA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_LAMDA")]
++		public const uint Greek_LAMDA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_MU")]
++		public const uint Greek_MU;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_NU")]
++		public const uint Greek_NU;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_OMEGA")]
++		public const uint Greek_OMEGA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_OMEGAaccent")]
++		public const uint Greek_OMEGAaccent;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_OMICRON")]
++		public const uint Greek_OMICRON;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_OMICRONaccent")]
++		public const uint Greek_OMICRONaccent;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_PHI")]
++		public const uint Greek_PHI;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_PI")]
++		public const uint Greek_PI;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_PSI")]
++		public const uint Greek_PSI;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_RHO")]
++		public const uint Greek_RHO;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_SIGMA")]
++		public const uint Greek_SIGMA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_TAU")]
++		public const uint Greek_TAU;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_THETA")]
++		public const uint Greek_THETA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_UPSILON")]
++		public const uint Greek_UPSILON;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_UPSILONaccent")]
++		public const uint Greek_UPSILONaccent;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_UPSILONdieresis")]
++		public const uint Greek_UPSILONdieresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_XI")]
++		public const uint Greek_XI;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_ZETA")]
++		public const uint Greek_ZETA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_accentdieresis")]
++		public const uint Greek_accentdieresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_alpha")]
++		public const uint Greek_alpha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_alphaaccent")]
++		public const uint Greek_alphaaccent;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_beta")]
++		public const uint Greek_beta;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_chi")]
++		public const uint Greek_chi;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_delta")]
++		public const uint Greek_delta;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_epsilon")]
++		public const uint Greek_epsilon;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_epsilonaccent")]
++		public const uint Greek_epsilonaccent;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_eta")]
++		public const uint Greek_eta;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_etaaccent")]
++		public const uint Greek_etaaccent;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_finalsmallsigma")]
++		public const uint Greek_finalsmallsigma;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_gamma")]
++		public const uint Greek_gamma;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_horizbar")]
++		public const uint Greek_horizbar;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_iota")]
++		public const uint Greek_iota;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_iotaaccent")]
++		public const uint Greek_iotaaccent;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_iotaaccentdieresis")]
++		public const uint Greek_iotaaccentdieresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_iotadieresis")]
++		public const uint Greek_iotadieresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_kappa")]
++		public const uint Greek_kappa;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_lambda")]
++		public const uint Greek_lambda;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_lamda")]
++		public const uint Greek_lamda;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_mu")]
++		public const uint Greek_mu;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_nu")]
++		public const uint Greek_nu;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_omega")]
++		public const uint Greek_omega;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_omegaaccent")]
++		public const uint Greek_omegaaccent;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_omicron")]
++		public const uint Greek_omicron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_omicronaccent")]
++		public const uint Greek_omicronaccent;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_phi")]
++		public const uint Greek_phi;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_pi")]
++		public const uint Greek_pi;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_psi")]
++		public const uint Greek_psi;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_rho")]
++		public const uint Greek_rho;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_sigma")]
++		public const uint Greek_sigma;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_switch")]
++		public const uint Greek_switch;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_tau")]
++		public const uint Greek_tau;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_theta")]
++		public const uint Greek_theta;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_upsilon")]
++		public const uint Greek_upsilon;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_upsilonaccent")]
++		public const uint Greek_upsilonaccent;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_upsilonaccentdieresis")]
++		public const uint Greek_upsilonaccentdieresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_upsilondieresis")]
++		public const uint Greek_upsilondieresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_xi")]
++		public const uint Greek_xi;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_zeta")]
++		public const uint Greek_zeta;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Green")]
++		public const uint Green;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_H")]
++		public const uint H;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul")]
++		public const uint Hangul;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_A")]
++		public const uint Hangul_A;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_AE")]
++		public const uint Hangul_AE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_AraeA")]
++		public const uint Hangul_AraeA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_AraeAE")]
++		public const uint Hangul_AraeAE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Banja")]
++		public const uint Hangul_Banja;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Cieuc")]
++		public const uint Hangul_Cieuc;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Codeinput")]
++		public const uint Hangul_Codeinput;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Dikeud")]
++		public const uint Hangul_Dikeud;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_E")]
++		public const uint Hangul_E;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_EO")]
++		public const uint Hangul_EO;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_EU")]
++		public const uint Hangul_EU;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_End")]
++		public const uint Hangul_End;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Hanja")]
++		public const uint Hangul_Hanja;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Hieuh")]
++		public const uint Hangul_Hieuh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_I")]
++		public const uint Hangul_I;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Ieung")]
++		public const uint Hangul_Ieung;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_Cieuc")]
++		public const uint Hangul_J_Cieuc;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_Dikeud")]
++		public const uint Hangul_J_Dikeud;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_Hieuh")]
++		public const uint Hangul_J_Hieuh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_Ieung")]
++		public const uint Hangul_J_Ieung;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_Jieuj")]
++		public const uint Hangul_J_Jieuj;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_Khieuq")]
++		public const uint Hangul_J_Khieuq;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_Kiyeog")]
++		public const uint Hangul_J_Kiyeog;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_KiyeogSios")]
++		public const uint Hangul_J_KiyeogSios;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_KkogjiDalrinIeung")]
++		public const uint Hangul_J_KkogjiDalrinIeung;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_Mieum")]
++		public const uint Hangul_J_Mieum;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_Nieun")]
++		public const uint Hangul_J_Nieun;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_NieunHieuh")]
++		public const uint Hangul_J_NieunHieuh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_NieunJieuj")]
++		public const uint Hangul_J_NieunJieuj;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_PanSios")]
++		public const uint Hangul_J_PanSios;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_Phieuf")]
++		public const uint Hangul_J_Phieuf;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_Pieub")]
++		public const uint Hangul_J_Pieub;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_PieubSios")]
++		public const uint Hangul_J_PieubSios;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_Rieul")]
++		public const uint Hangul_J_Rieul;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_RieulHieuh")]
++		public const uint Hangul_J_RieulHieuh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_RieulKiyeog")]
++		public const uint Hangul_J_RieulKiyeog;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_RieulMieum")]
++		public const uint Hangul_J_RieulMieum;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_RieulPhieuf")]
++		public const uint Hangul_J_RieulPhieuf;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_RieulPieub")]
++		public const uint Hangul_J_RieulPieub;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_RieulSios")]
++		public const uint Hangul_J_RieulSios;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_RieulTieut")]
++		public const uint Hangul_J_RieulTieut;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_Sios")]
++		public const uint Hangul_J_Sios;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_SsangKiyeog")]
++		public const uint Hangul_J_SsangKiyeog;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_SsangSios")]
++		public const uint Hangul_J_SsangSios;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_Tieut")]
++		public const uint Hangul_J_Tieut;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_YeorinHieuh")]
++		public const uint Hangul_J_YeorinHieuh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Jamo")]
++		public const uint Hangul_Jamo;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Jeonja")]
++		public const uint Hangul_Jeonja;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Jieuj")]
++		public const uint Hangul_Jieuj;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Khieuq")]
++		public const uint Hangul_Khieuq;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Kiyeog")]
++		public const uint Hangul_Kiyeog;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_KiyeogSios")]
++		public const uint Hangul_KiyeogSios;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_KkogjiDalrinIeung")]
++		public const uint Hangul_KkogjiDalrinIeung;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Mieum")]
++		public const uint Hangul_Mieum;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_MultipleCandidate")]
++		public const uint Hangul_MultipleCandidate;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Nieun")]
++		public const uint Hangul_Nieun;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_NieunHieuh")]
++		public const uint Hangul_NieunHieuh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_NieunJieuj")]
++		public const uint Hangul_NieunJieuj;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_O")]
++		public const uint Hangul_O;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_OE")]
++		public const uint Hangul_OE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_PanSios")]
++		public const uint Hangul_PanSios;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Phieuf")]
++		public const uint Hangul_Phieuf;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Pieub")]
++		public const uint Hangul_Pieub;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_PieubSios")]
++		public const uint Hangul_PieubSios;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_PostHanja")]
++		public const uint Hangul_PostHanja;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_PreHanja")]
++		public const uint Hangul_PreHanja;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_PreviousCandidate")]
++		public const uint Hangul_PreviousCandidate;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Rieul")]
++		public const uint Hangul_Rieul;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_RieulHieuh")]
++		public const uint Hangul_RieulHieuh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_RieulKiyeog")]
++		public const uint Hangul_RieulKiyeog;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_RieulMieum")]
++		public const uint Hangul_RieulMieum;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_RieulPhieuf")]
++		public const uint Hangul_RieulPhieuf;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_RieulPieub")]
++		public const uint Hangul_RieulPieub;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_RieulSios")]
++		public const uint Hangul_RieulSios;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_RieulTieut")]
++		public const uint Hangul_RieulTieut;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_RieulYeorinHieuh")]
++		public const uint Hangul_RieulYeorinHieuh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Romaja")]
++		public const uint Hangul_Romaja;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_SingleCandidate")]
++		public const uint Hangul_SingleCandidate;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Sios")]
++		public const uint Hangul_Sios;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Special")]
++		public const uint Hangul_Special;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_SsangDikeud")]
++		public const uint Hangul_SsangDikeud;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_SsangJieuj")]
++		public const uint Hangul_SsangJieuj;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_SsangKiyeog")]
++		public const uint Hangul_SsangKiyeog;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_SsangPieub")]
++		public const uint Hangul_SsangPieub;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_SsangSios")]
++		public const uint Hangul_SsangSios;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Start")]
++		public const uint Hangul_Start;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_SunkyeongeumMieum")]
++		public const uint Hangul_SunkyeongeumMieum;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_SunkyeongeumPhieuf")]
++		public const uint Hangul_SunkyeongeumPhieuf;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_SunkyeongeumPieub")]
++		public const uint Hangul_SunkyeongeumPieub;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Tieut")]
++		public const uint Hangul_Tieut;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_U")]
++		public const uint Hangul_U;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_WA")]
++		public const uint Hangul_WA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_WAE")]
++		public const uint Hangul_WAE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_WE")]
++		public const uint Hangul_WE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_WEO")]
++		public const uint Hangul_WEO;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_WI")]
++		public const uint Hangul_WI;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_YA")]
++		public const uint Hangul_YA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_YAE")]
++		public const uint Hangul_YAE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_YE")]
++		public const uint Hangul_YE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_YEO")]
++		public const uint Hangul_YEO;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_YI")]
++		public const uint Hangul_YI;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_YO")]
++		public const uint Hangul_YO;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_YU")]
++		public const uint Hangul_YU;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_YeorinHieuh")]
++		public const uint Hangul_YeorinHieuh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_switch")]
++		public const uint Hangul_switch;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hankaku")]
++		public const uint Hankaku;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hcircumflex")]
++		public const uint Hcircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hebrew_switch")]
++		public const uint Hebrew_switch;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Help")]
++		public const uint Help;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Henkan")]
++		public const uint Henkan;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Henkan_Mode")]
++		public const uint Henkan_Mode;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hibernate")]
++		public const uint Hibernate;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hiragana")]
++		public const uint Hiragana;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hiragana_Katakana")]
++		public const uint Hiragana_Katakana;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_History")]
++		public const uint History;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Home")]
++		public const uint Home;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_HomePage")]
++		public const uint HomePage;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_HotLinks")]
++		public const uint HotLinks;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hstroke")]
++		public const uint Hstroke;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hyper_L")]
++		public const uint Hyper_L;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hyper_R")]
++		public const uint Hyper_R;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_I")]
++		public const uint I;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Center_Object")]
++		public const uint ISO_Center_Object;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Continuous_Underline")]
++		public const uint ISO_Continuous_Underline;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Discontinuous_Underline")]
++		public const uint ISO_Discontinuous_Underline;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Emphasize")]
++		public const uint ISO_Emphasize;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Enter")]
++		public const uint ISO_Enter;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Fast_Cursor_Down")]
++		public const uint ISO_Fast_Cursor_Down;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Fast_Cursor_Left")]
++		public const uint ISO_Fast_Cursor_Left;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Fast_Cursor_Right")]
++		public const uint ISO_Fast_Cursor_Right;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Fast_Cursor_Up")]
++		public const uint ISO_Fast_Cursor_Up;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_First_Group")]
++		public const uint ISO_First_Group;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_First_Group_Lock")]
++		public const uint ISO_First_Group_Lock;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Group_Latch")]
++		public const uint ISO_Group_Latch;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Group_Lock")]
++		public const uint ISO_Group_Lock;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Group_Shift")]
++		public const uint ISO_Group_Shift;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Last_Group")]
++		public const uint ISO_Last_Group;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Last_Group_Lock")]
++		public const uint ISO_Last_Group_Lock;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Left_Tab")]
++		public const uint ISO_Left_Tab;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Level2_Latch")]
++		public const uint ISO_Level2_Latch;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Level3_Latch")]
++		public const uint ISO_Level3_Latch;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Level3_Lock")]
++		public const uint ISO_Level3_Lock;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Level3_Shift")]
++		public const uint ISO_Level3_Shift;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Level5_Latch")]
++		public const uint ISO_Level5_Latch;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Level5_Lock")]
++		public const uint ISO_Level5_Lock;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Level5_Shift")]
++		public const uint ISO_Level5_Shift;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Lock")]
++		public const uint ISO_Lock;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Move_Line_Down")]
++		public const uint ISO_Move_Line_Down;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Move_Line_Up")]
++		public const uint ISO_Move_Line_Up;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Next_Group")]
++		public const uint ISO_Next_Group;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Next_Group_Lock")]
++		public const uint ISO_Next_Group_Lock;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Partial_Line_Down")]
++		public const uint ISO_Partial_Line_Down;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Partial_Line_Up")]
++		public const uint ISO_Partial_Line_Up;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Partial_Space_Left")]
++		public const uint ISO_Partial_Space_Left;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Partial_Space_Right")]
++		public const uint ISO_Partial_Space_Right;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Prev_Group")]
++		public const uint ISO_Prev_Group;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Prev_Group_Lock")]
++		public const uint ISO_Prev_Group_Lock;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Release_Both_Margins")]
++		public const uint ISO_Release_Both_Margins;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Release_Margin_Left")]
++		public const uint ISO_Release_Margin_Left;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Release_Margin_Right")]
++		public const uint ISO_Release_Margin_Right;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Set_Margin_Left")]
++		public const uint ISO_Set_Margin_Left;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Set_Margin_Right")]
++		public const uint ISO_Set_Margin_Right;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Iabovedot")]
++		public const uint Iabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Iacute")]
++		public const uint Iacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ibelowdot")]
++		public const uint Ibelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ibreve")]
++		public const uint Ibreve;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Icircumflex")]
++		public const uint Icircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Idiaeresis")]
++		public const uint Idiaeresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Igrave")]
++		public const uint Igrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ihook")]
++		public const uint Ihook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Imacron")]
++		public const uint Imacron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Insert")]
++		public const uint Insert;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Iogonek")]
++		public const uint Iogonek;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Itilde")]
++		public const uint Itilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_J")]
++		public const uint J;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Jcircumflex")]
++		public const uint Jcircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_K")]
++		public const uint K;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_0")]
++		public const uint KP_0;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_1")]
++		public const uint KP_1;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_2")]
++		public const uint KP_2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_3")]
++		public const uint KP_3;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_4")]
++		public const uint KP_4;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_5")]
++		public const uint KP_5;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_6")]
++		public const uint KP_6;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_7")]
++		public const uint KP_7;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_8")]
++		public const uint KP_8;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_9")]
++		public const uint KP_9;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Add")]
++		public const uint KP_Add;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Begin")]
++		public const uint KP_Begin;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Decimal")]
++		public const uint KP_Decimal;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Delete")]
++		public const uint KP_Delete;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Divide")]
++		public const uint KP_Divide;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Down")]
++		public const uint KP_Down;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_End")]
++		public const uint KP_End;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Enter")]
++		public const uint KP_Enter;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Equal")]
++		public const uint KP_Equal;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_F1")]
++		public const uint KP_F1;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_F2")]
++		public const uint KP_F2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_F3")]
++		public const uint KP_F3;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_F4")]
++		public const uint KP_F4;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Home")]
++		public const uint KP_Home;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Insert")]
++		public const uint KP_Insert;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Left")]
++		public const uint KP_Left;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Multiply")]
++		public const uint KP_Multiply;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Next")]
++		public const uint KP_Next;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Page_Down")]
++		public const uint KP_Page_Down;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Page_Up")]
++		public const uint KP_Page_Up;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Prior")]
++		public const uint KP_Prior;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Right")]
++		public const uint KP_Right;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Separator")]
++		public const uint KP_Separator;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Space")]
++		public const uint KP_Space;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Subtract")]
++		public const uint KP_Subtract;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Tab")]
++		public const uint KP_Tab;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Up")]
++		public const uint KP_Up;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Kana_Lock")]
++		public const uint Kana_Lock;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Kana_Shift")]
++		public const uint Kana_Shift;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Kanji")]
++		public const uint Kanji;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Kanji_Bangou")]
++		public const uint Kanji_Bangou;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Katakana")]
++		public const uint Katakana;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KbdBrightnessDown")]
++		public const uint KbdBrightnessDown;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KbdBrightnessUp")]
++		public const uint KbdBrightnessUp;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KbdLightOnOff")]
++		public const uint KbdLightOnOff;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Kcedilla")]
++		public const uint Kcedilla;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Korean_Won")]
++		public const uint Korean_Won;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_L")]
++		public const uint L;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_L1")]
++		public const uint L1;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_L10")]
++		public const uint L10;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_L2")]
++		public const uint L2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_L3")]
++		public const uint L3;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_L4")]
++		public const uint L4;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_L5")]
++		public const uint L5;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_L6")]
++		public const uint L6;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_L7")]
++		public const uint L7;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_L8")]
++		public const uint L8;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_L9")]
++		public const uint L9;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Lacute")]
++		public const uint Lacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Last_Virtual_Screen")]
++		public const uint Last_Virtual_Screen;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Launch0")]
++		public const uint Launch0;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Launch1")]
++		public const uint Launch1;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Launch2")]
++		public const uint Launch2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Launch3")]
++		public const uint Launch3;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Launch4")]
++		public const uint Launch4;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Launch5")]
++		public const uint Launch5;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Launch6")]
++		public const uint Launch6;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Launch7")]
++		public const uint Launch7;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Launch8")]
++		public const uint Launch8;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Launch9")]
++		public const uint Launch9;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_LaunchA")]
++		public const uint LaunchA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_LaunchB")]
++		public const uint LaunchB;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_LaunchC")]
++		public const uint LaunchC;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_LaunchD")]
++		public const uint LaunchD;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_LaunchE")]
++		public const uint LaunchE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_LaunchF")]
++		public const uint LaunchF;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Lbelowdot")]
++		public const uint Lbelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Lcaron")]
++		public const uint Lcaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Lcedilla")]
++		public const uint Lcedilla;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Left")]
++		public const uint Left;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_LightBulb")]
++		public const uint LightBulb;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Linefeed")]
++		public const uint Linefeed;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_LiraSign")]
++		public const uint LiraSign;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_LogGrabInfo")]
++		public const uint LogGrabInfo;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_LogOff")]
++		public const uint LogOff;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_LogWindowTree")]
++		public const uint LogWindowTree;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Lstroke")]
++		public const uint Lstroke;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_M")]
++		public const uint M;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Mabovedot")]
++		public const uint Mabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Macedonia_DSE")]
++		public const uint Macedonia_DSE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Macedonia_GJE")]
++		public const uint Macedonia_GJE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Macedonia_KJE")]
++		public const uint Macedonia_KJE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Macedonia_dse")]
++		public const uint Macedonia_dse;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Macedonia_gje")]
++		public const uint Macedonia_gje;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Macedonia_kje")]
++		public const uint Macedonia_kje;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Mae_Koho")]
++		public const uint Mae_Koho;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Mail")]
++		public const uint Mail;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_MailForward")]
++		public const uint MailForward;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Market")]
++		public const uint Market;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Massyo")]
++		public const uint Massyo;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Meeting")]
++		public const uint Meeting;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Memo")]
++		public const uint Memo;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Menu")]
++		public const uint Menu;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_MenuKB")]
++		public const uint MenuKB;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_MenuPB")]
++		public const uint MenuPB;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Messenger")]
++		public const uint Messenger;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Meta_L")]
++		public const uint Meta_L;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Meta_R")]
++		public const uint Meta_R;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_MillSign")]
++		public const uint MillSign;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ModeLock")]
++		public const uint ModeLock;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Mode_switch")]
++		public const uint Mode_switch;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_MonBrightnessDown")]
++		public const uint MonBrightnessDown;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_MonBrightnessUp")]
++		public const uint MonBrightnessUp;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_MouseKeys_Accel_Enable")]
++		public const uint MouseKeys_Accel_Enable;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_MouseKeys_Enable")]
++		public const uint MouseKeys_Enable;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Muhenkan")]
++		public const uint Muhenkan;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Multi_key")]
++		public const uint Multi_key;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_MultipleCandidate")]
++		public const uint MultipleCandidate;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Music")]
++		public const uint Music;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_MyComputer")]
++		public const uint MyComputer;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_MySites")]
++		public const uint MySites;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_N")]
++		public const uint N;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Nacute")]
++		public const uint Nacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_NairaSign")]
++		public const uint NairaSign;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ncaron")]
++		public const uint Ncaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ncedilla")]
++		public const uint Ncedilla;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_New")]
++		public const uint New;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_NewSheqelSign")]
++		public const uint NewSheqelSign;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_News")]
++		public const uint News;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Next")]
++		public const uint Next;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Next_VMode")]
++		public const uint Next_VMode;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Next_Virtual_Screen")]
++		public const uint Next_Virtual_Screen;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ntilde")]
++		public const uint Ntilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Num_Lock")]
++		public const uint Num_Lock;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_O")]
++		public const uint O;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_OE")]
++		public const uint OE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Oacute")]
++		public const uint Oacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Obarred")]
++		public const uint Obarred;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Obelowdot")]
++		public const uint Obelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ocaron")]
++		public const uint Ocaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ocircumflex")]
++		public const uint Ocircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ocircumflexacute")]
++		public const uint Ocircumflexacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ocircumflexbelowdot")]
++		public const uint Ocircumflexbelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ocircumflexgrave")]
++		public const uint Ocircumflexgrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ocircumflexhook")]
++		public const uint Ocircumflexhook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ocircumflextilde")]
++		public const uint Ocircumflextilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Odiaeresis")]
++		public const uint Odiaeresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Odoubleacute")]
++		public const uint Odoubleacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_OfficeHome")]
++		public const uint OfficeHome;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ograve")]
++		public const uint Ograve;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ohook")]
++		public const uint Ohook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ohorn")]
++		public const uint Ohorn;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ohornacute")]
++		public const uint Ohornacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ohornbelowdot")]
++		public const uint Ohornbelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ohorngrave")]
++		public const uint Ohorngrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ohornhook")]
++		public const uint Ohornhook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ohorntilde")]
++		public const uint Ohorntilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Omacron")]
++		public const uint Omacron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ooblique")]
++		public const uint Ooblique;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Open")]
++		public const uint Open;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_OpenURL")]
++		public const uint OpenURL;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Option")]
++		public const uint Option;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Oslash")]
++		public const uint Oslash;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Otilde")]
++		public const uint Otilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Overlay1_Enable")]
++		public const uint Overlay1_Enable;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Overlay2_Enable")]
++		public const uint Overlay2_Enable;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_P")]
++		public const uint P;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pabovedot")]
++		public const uint Pabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Page_Down")]
++		public const uint Page_Down;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Page_Up")]
++		public const uint Page_Up;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Paste")]
++		public const uint Paste;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pause")]
++		public const uint Pause;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_PesetaSign")]
++		public const uint PesetaSign;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Phone")]
++		public const uint Phone;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pictures")]
++		public const uint Pictures;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Accelerate")]
++		public const uint Pointer_Accelerate;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Button1")]
++		public const uint Pointer_Button1;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Button2")]
++		public const uint Pointer_Button2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Button3")]
++		public const uint Pointer_Button3;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Button4")]
++		public const uint Pointer_Button4;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Button5")]
++		public const uint Pointer_Button5;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Button_Dflt")]
++		public const uint Pointer_Button_Dflt;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_DblClick1")]
++		public const uint Pointer_DblClick1;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_DblClick2")]
++		public const uint Pointer_DblClick2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_DblClick3")]
++		public const uint Pointer_DblClick3;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_DblClick4")]
++		public const uint Pointer_DblClick4;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_DblClick5")]
++		public const uint Pointer_DblClick5;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_DblClick_Dflt")]
++		public const uint Pointer_DblClick_Dflt;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_DfltBtnNext")]
++		public const uint Pointer_DfltBtnNext;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_DfltBtnPrev")]
++		public const uint Pointer_DfltBtnPrev;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Down")]
++		public const uint Pointer_Down;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_DownLeft")]
++		public const uint Pointer_DownLeft;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_DownRight")]
++		public const uint Pointer_DownRight;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Drag1")]
++		public const uint Pointer_Drag1;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Drag2")]
++		public const uint Pointer_Drag2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Drag3")]
++		public const uint Pointer_Drag3;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Drag4")]
++		public const uint Pointer_Drag4;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Drag5")]
++		public const uint Pointer_Drag5;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Drag_Dflt")]
++		public const uint Pointer_Drag_Dflt;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_EnableKeys")]
++		public const uint Pointer_EnableKeys;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Left")]
++		public const uint Pointer_Left;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Right")]
++		public const uint Pointer_Right;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Up")]
++		public const uint Pointer_Up;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_UpLeft")]
++		public const uint Pointer_UpLeft;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_UpRight")]
++		public const uint Pointer_UpRight;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_PowerDown")]
++		public const uint PowerDown;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_PowerOff")]
++		public const uint PowerOff;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Prev_VMode")]
++		public const uint Prev_VMode;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Prev_Virtual_Screen")]
++		public const uint Prev_Virtual_Screen;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_PreviousCandidate")]
++		public const uint PreviousCandidate;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Print")]
++		public const uint Print;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Prior")]
++		public const uint Prior;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Q")]
++		public const uint Q;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R")]
++		public const uint R;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R1")]
++		public const uint R1;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R10")]
++		public const uint R10;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R11")]
++		public const uint R11;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R12")]
++		public const uint R12;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R13")]
++		public const uint R13;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R14")]
++		public const uint R14;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R15")]
++		public const uint R15;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R2")]
++		public const uint R2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R3")]
++		public const uint R3;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R4")]
++		public const uint R4;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R5")]
++		public const uint R5;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R6")]
++		public const uint R6;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R7")]
++		public const uint R7;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R8")]
++		public const uint R8;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R9")]
++		public const uint R9;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Racute")]
++		public const uint Racute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Rcaron")]
++		public const uint Rcaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Rcedilla")]
++		public const uint Rcedilla;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Red")]
++		public const uint Red;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Redo")]
++		public const uint Redo;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Refresh")]
++		public const uint Refresh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Reload")]
++		public const uint Reload;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_RepeatKeys_Enable")]
++		public const uint RepeatKeys_Enable;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Reply")]
++		public const uint Reply;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Return")]
++		public const uint Return;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Right")]
++		public const uint Right;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_RockerDown")]
++		public const uint RockerDown;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_RockerEnter")]
++		public const uint RockerEnter;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_RockerUp")]
++		public const uint RockerUp;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Romaji")]
++		public const uint Romaji;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_RotateWindows")]
++		public const uint RotateWindows;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_RotationKB")]
++		public const uint RotationKB;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_RotationPB")]
++		public const uint RotationPB;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_RupeeSign")]
++		public const uint RupeeSign;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_S")]
++		public const uint S;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_SCHWA")]
++		public const uint SCHWA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sabovedot")]
++		public const uint Sabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sacute")]
++		public const uint Sacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Save")]
++		public const uint Save;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Scaron")]
++		public const uint Scaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Scedilla")]
++		public const uint Scedilla;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Scircumflex")]
++		public const uint Scircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ScreenSaver")]
++		public const uint ScreenSaver;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ScrollClick")]
++		public const uint ScrollClick;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ScrollDown")]
++		public const uint ScrollDown;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ScrollUp")]
++		public const uint ScrollUp;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Scroll_Lock")]
++		public const uint Scroll_Lock;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Search")]
++		public const uint Search;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Select")]
++		public const uint Select;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_SelectButton")]
++		public const uint SelectButton;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Send")]
++		public const uint Send;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Serbian_DJE")]
++		public const uint Serbian_DJE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Serbian_DZE")]
++		public const uint Serbian_DZE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Serbian_JE")]
++		public const uint Serbian_JE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Serbian_LJE")]
++		public const uint Serbian_LJE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Serbian_NJE")]
++		public const uint Serbian_NJE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Serbian_TSHE")]
++		public const uint Serbian_TSHE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Serbian_dje")]
++		public const uint Serbian_dje;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Serbian_dze")]
++		public const uint Serbian_dze;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Serbian_je")]
++		public const uint Serbian_je;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Serbian_lje")]
++		public const uint Serbian_lje;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Serbian_nje")]
++		public const uint Serbian_nje;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Serbian_tshe")]
++		public const uint Serbian_tshe;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Shift_L")]
++		public const uint Shift_L;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Shift_Lock")]
++		public const uint Shift_Lock;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Shift_R")]
++		public const uint Shift_R;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Shop")]
++		public const uint Shop;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_SingleCandidate")]
++		public const uint SingleCandidate;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_a")]
++		public const uint Sinh_a;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_aa")]
++		public const uint Sinh_aa;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_aa2")]
++		public const uint Sinh_aa2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ae")]
++		public const uint Sinh_ae;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ae2")]
++		public const uint Sinh_ae2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_aee")]
++		public const uint Sinh_aee;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_aee2")]
++		public const uint Sinh_aee2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ai")]
++		public const uint Sinh_ai;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ai2")]
++		public const uint Sinh_ai2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_al")]
++		public const uint Sinh_al;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_au")]
++		public const uint Sinh_au;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_au2")]
++		public const uint Sinh_au2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ba")]
++		public const uint Sinh_ba;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_bha")]
++		public const uint Sinh_bha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ca")]
++		public const uint Sinh_ca;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_cha")]
++		public const uint Sinh_cha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_dda")]
++		public const uint Sinh_dda;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ddha")]
++		public const uint Sinh_ddha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_dha")]
++		public const uint Sinh_dha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_dhha")]
++		public const uint Sinh_dhha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_e")]
++		public const uint Sinh_e;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_e2")]
++		public const uint Sinh_e2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ee")]
++		public const uint Sinh_ee;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ee2")]
++		public const uint Sinh_ee2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_fa")]
++		public const uint Sinh_fa;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ga")]
++		public const uint Sinh_ga;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_gha")]
++		public const uint Sinh_gha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_h2")]
++		public const uint Sinh_h2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ha")]
++		public const uint Sinh_ha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_i")]
++		public const uint Sinh_i;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_i2")]
++		public const uint Sinh_i2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ii")]
++		public const uint Sinh_ii;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ii2")]
++		public const uint Sinh_ii2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ja")]
++		public const uint Sinh_ja;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_jha")]
++		public const uint Sinh_jha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_jnya")]
++		public const uint Sinh_jnya;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ka")]
++		public const uint Sinh_ka;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_kha")]
++		public const uint Sinh_kha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_kunddaliya")]
++		public const uint Sinh_kunddaliya;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_la")]
++		public const uint Sinh_la;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_lla")]
++		public const uint Sinh_lla;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_lu")]
++		public const uint Sinh_lu;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_lu2")]
++		public const uint Sinh_lu2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_luu")]
++		public const uint Sinh_luu;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_luu2")]
++		public const uint Sinh_luu2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ma")]
++		public const uint Sinh_ma;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_mba")]
++		public const uint Sinh_mba;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_na")]
++		public const uint Sinh_na;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ndda")]
++		public const uint Sinh_ndda;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ndha")]
++		public const uint Sinh_ndha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ng")]
++		public const uint Sinh_ng;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ng2")]
++		public const uint Sinh_ng2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_nga")]
++		public const uint Sinh_nga;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_nja")]
++		public const uint Sinh_nja;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_nna")]
++		public const uint Sinh_nna;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_nya")]
++		public const uint Sinh_nya;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_o")]
++		public const uint Sinh_o;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_o2")]
++		public const uint Sinh_o2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_oo")]
++		public const uint Sinh_oo;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_oo2")]
++		public const uint Sinh_oo2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_pa")]
++		public const uint Sinh_pa;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_pha")]
++		public const uint Sinh_pha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ra")]
++		public const uint Sinh_ra;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ri")]
++		public const uint Sinh_ri;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_rii")]
++		public const uint Sinh_rii;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ru2")]
++		public const uint Sinh_ru2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ruu2")]
++		public const uint Sinh_ruu2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_sa")]
++		public const uint Sinh_sa;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_sha")]
++		public const uint Sinh_sha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ssha")]
++		public const uint Sinh_ssha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_tha")]
++		public const uint Sinh_tha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_thha")]
++		public const uint Sinh_thha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_tta")]
++		public const uint Sinh_tta;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ttha")]
++		public const uint Sinh_ttha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_u")]
++		public const uint Sinh_u;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_u2")]
++		public const uint Sinh_u2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_uu")]
++		public const uint Sinh_uu;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_uu2")]
++		public const uint Sinh_uu2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_va")]
++		public const uint Sinh_va;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ya")]
++		public const uint Sinh_ya;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sleep")]
++		public const uint Sleep;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_SlowKeys_Enable")]
++		public const uint SlowKeys_Enable;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Spell")]
++		public const uint Spell;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_SplitScreen")]
++		public const uint SplitScreen;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Standby")]
++		public const uint Standby;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Start")]
++		public const uint Start;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_StickyKeys_Enable")]
++		public const uint StickyKeys_Enable;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Stop")]
++		public const uint Stop;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Subtitle")]
++		public const uint Subtitle;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Super_L")]
++		public const uint Super_L;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Super_R")]
++		public const uint Super_R;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Support")]
++		public const uint Support;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Suspend")]
++		public const uint Suspend;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Switch_VT_1")]
++		public const uint Switch_VT_1;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Switch_VT_10")]
++		public const uint Switch_VT_10;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Switch_VT_11")]
++		public const uint Switch_VT_11;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Switch_VT_12")]
++		public const uint Switch_VT_12;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Switch_VT_2")]
++		public const uint Switch_VT_2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Switch_VT_3")]
++		public const uint Switch_VT_3;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Switch_VT_4")]
++		public const uint Switch_VT_4;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Switch_VT_5")]
++		public const uint Switch_VT_5;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Switch_VT_6")]
++		public const uint Switch_VT_6;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Switch_VT_7")]
++		public const uint Switch_VT_7;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Switch_VT_8")]
++		public const uint Switch_VT_8;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Switch_VT_9")]
++		public const uint Switch_VT_9;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sys_Req")]
++		public const uint Sys_Req;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_T")]
++		public const uint T;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_THORN")]
++		public const uint THORN;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Tab")]
++		public const uint Tab;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Tabovedot")]
++		public const uint Tabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_TaskPane")]
++		public const uint TaskPane;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Tcaron")]
++		public const uint Tcaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Tcedilla")]
++		public const uint Tcedilla;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Terminal")]
++		public const uint Terminal;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Terminate_Server")]
++		public const uint Terminate_Server;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_baht")]
++		public const uint Thai_baht;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_bobaimai")]
++		public const uint Thai_bobaimai;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_chochan")]
++		public const uint Thai_chochan;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_chochang")]
++		public const uint Thai_chochang;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_choching")]
++		public const uint Thai_choching;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_chochoe")]
++		public const uint Thai_chochoe;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_dochada")]
++		public const uint Thai_dochada;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_dodek")]
++		public const uint Thai_dodek;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_fofa")]
++		public const uint Thai_fofa;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_fofan")]
++		public const uint Thai_fofan;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_hohip")]
++		public const uint Thai_hohip;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_honokhuk")]
++		public const uint Thai_honokhuk;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_khokhai")]
++		public const uint Thai_khokhai;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_khokhon")]
++		public const uint Thai_khokhon;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_khokhuat")]
++		public const uint Thai_khokhuat;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_khokhwai")]
++		public const uint Thai_khokhwai;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_khorakhang")]
++		public const uint Thai_khorakhang;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_kokai")]
++		public const uint Thai_kokai;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_lakkhangyao")]
++		public const uint Thai_lakkhangyao;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_lekchet")]
++		public const uint Thai_lekchet;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_lekha")]
++		public const uint Thai_lekha;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_lekhok")]
++		public const uint Thai_lekhok;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_lekkao")]
++		public const uint Thai_lekkao;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_leknung")]
++		public const uint Thai_leknung;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_lekpaet")]
++		public const uint Thai_lekpaet;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_leksam")]
++		public const uint Thai_leksam;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_leksi")]
++		public const uint Thai_leksi;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_leksong")]
++		public const uint Thai_leksong;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_leksun")]
++		public const uint Thai_leksun;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_lochula")]
++		public const uint Thai_lochula;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_loling")]
++		public const uint Thai_loling;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_lu")]
++		public const uint Thai_lu;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_maichattawa")]
++		public const uint Thai_maichattawa;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_maiek")]
++		public const uint Thai_maiek;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_maihanakat")]
++		public const uint Thai_maihanakat;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_maihanakat_maitho")]
++		public const uint Thai_maihanakat_maitho;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_maitaikhu")]
++		public const uint Thai_maitaikhu;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_maitho")]
++		public const uint Thai_maitho;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_maitri")]
++		public const uint Thai_maitri;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_maiyamok")]
++		public const uint Thai_maiyamok;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_moma")]
++		public const uint Thai_moma;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_ngongu")]
++		public const uint Thai_ngongu;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_nikhahit")]
++		public const uint Thai_nikhahit;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_nonen")]
++		public const uint Thai_nonen;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_nonu")]
++		public const uint Thai_nonu;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_oang")]
++		public const uint Thai_oang;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_paiyannoi")]
++		public const uint Thai_paiyannoi;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_phinthu")]
++		public const uint Thai_phinthu;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_phophan")]
++		public const uint Thai_phophan;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_phophung")]
++		public const uint Thai_phophung;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_phosamphao")]
++		public const uint Thai_phosamphao;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_popla")]
++		public const uint Thai_popla;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_rorua")]
++		public const uint Thai_rorua;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_ru")]
++		public const uint Thai_ru;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_saraa")]
++		public const uint Thai_saraa;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_saraaa")]
++		public const uint Thai_saraaa;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_saraae")]
++		public const uint Thai_saraae;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_saraaimaimalai")]
++		public const uint Thai_saraaimaimalai;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_saraaimaimuan")]
++		public const uint Thai_saraaimaimuan;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_saraam")]
++		public const uint Thai_saraam;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_sarae")]
++		public const uint Thai_sarae;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_sarai")]
++		public const uint Thai_sarai;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_saraii")]
++		public const uint Thai_saraii;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_sarao")]
++		public const uint Thai_sarao;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_sarau")]
++		public const uint Thai_sarau;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_saraue")]
++		public const uint Thai_saraue;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_sarauee")]
++		public const uint Thai_sarauee;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_sarauu")]
++		public const uint Thai_sarauu;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_sorusi")]
++		public const uint Thai_sorusi;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_sosala")]
++		public const uint Thai_sosala;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_soso")]
++		public const uint Thai_soso;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_sosua")]
++		public const uint Thai_sosua;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_thanthakhat")]
++		public const uint Thai_thanthakhat;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_thonangmontho")]
++		public const uint Thai_thonangmontho;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_thophuthao")]
++		public const uint Thai_thophuthao;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_thothahan")]
++		public const uint Thai_thothahan;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_thothan")]
++		public const uint Thai_thothan;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_thothong")]
++		public const uint Thai_thothong;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_thothung")]
++		public const uint Thai_thothung;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_topatak")]
++		public const uint Thai_topatak;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_totao")]
++		public const uint Thai_totao;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_wowaen")]
++		public const uint Thai_wowaen;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_yoyak")]
++		public const uint Thai_yoyak;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_yoying")]
++		public const uint Thai_yoying;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thorn")]
++		public const uint Thorn;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Time")]
++		public const uint Time;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ToDoList")]
++		public const uint ToDoList;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Tools")]
++		public const uint Tools;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_TopMenu")]
++		public const uint TopMenu;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_TouchpadOff")]
++		public const uint TouchpadOff;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_TouchpadOn")]
++		public const uint TouchpadOn;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_TouchpadToggle")]
++		public const uint TouchpadToggle;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Touroku")]
++		public const uint Touroku;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Travel")]
++		public const uint Travel;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Tslash")]
++		public const uint Tslash;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_U")]
++		public const uint U;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_UWB")]
++		public const uint UWB;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Uacute")]
++		public const uint Uacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ubelowdot")]
++		public const uint Ubelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ubreve")]
++		public const uint Ubreve;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ucircumflex")]
++		public const uint Ucircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Udiaeresis")]
++		public const uint Udiaeresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Udoubleacute")]
++		public const uint Udoubleacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ugrave")]
++		public const uint Ugrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Uhook")]
++		public const uint Uhook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Uhorn")]
++		public const uint Uhorn;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Uhornacute")]
++		public const uint Uhornacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Uhornbelowdot")]
++		public const uint Uhornbelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Uhorngrave")]
++		public const uint Uhorngrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Uhornhook")]
++		public const uint Uhornhook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Uhorntilde")]
++		public const uint Uhorntilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ukrainian_GHE_WITH_UPTURN")]
++		public const uint Ukrainian_GHE_WITH_UPTURN;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ukrainian_I")]
++		public const uint Ukrainian_I;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ukrainian_IE")]
++		public const uint Ukrainian_IE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ukrainian_YI")]
++		public const uint Ukrainian_YI;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ukrainian_ghe_with_upturn")]
++		public const uint Ukrainian_ghe_with_upturn;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ukrainian_i")]
++		public const uint Ukrainian_i;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ukrainian_ie")]
++		public const uint Ukrainian_ie;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ukrainian_yi")]
++		public const uint Ukrainian_yi;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ukranian_I")]
++		public const uint Ukranian_I;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ukranian_JE")]
++		public const uint Ukranian_JE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ukranian_YI")]
++		public const uint Ukranian_YI;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ukranian_i")]
++		public const uint Ukranian_i;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ukranian_je")]
++		public const uint Ukranian_je;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ukranian_yi")]
++		public const uint Ukranian_yi;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Umacron")]
++		public const uint Umacron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Undo")]
++		public const uint Undo;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ungrab")]
++		public const uint Ungrab;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Uogonek")]
++		public const uint Uogonek;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Up")]
++		public const uint Up;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Uring")]
++		public const uint Uring;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_User1KB")]
++		public const uint User1KB;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_User2KB")]
++		public const uint User2KB;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_UserPB")]
++		public const uint UserPB;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Utilde")]
++		public const uint Utilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_V")]
++		public const uint V;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_VendorHome")]
++		public const uint VendorHome;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Video")]
++		public const uint Video;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_View")]
++		public const uint View;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_VoidSymbol")]
++		public const uint VoidSymbol;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_W")]
++		public const uint W;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_WLAN")]
++		public const uint WLAN;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_WWW")]
++		public const uint WWW;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Wacute")]
++		public const uint Wacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_WakeUp")]
++		public const uint WakeUp;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Wcircumflex")]
++		public const uint Wcircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Wdiaeresis")]
++		public const uint Wdiaeresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_WebCam")]
++		public const uint WebCam;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Wgrave")]
++		public const uint Wgrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_WheelButton")]
++		public const uint WheelButton;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_WindowClear")]
++		public const uint WindowClear;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_WonSign")]
++		public const uint WonSign;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Word")]
++		public const uint Word;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_X")]
++		public const uint X;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Xabovedot")]
++		public const uint Xabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Xfer")]
++		public const uint Xfer;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Y")]
++		public const uint Y;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Yacute")]
++		public const uint Yacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ybelowdot")]
++		public const uint Ybelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ycircumflex")]
++		public const uint Ycircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ydiaeresis")]
++		public const uint Ydiaeresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Yellow")]
++		public const uint Yellow;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ygrave")]
++		public const uint Ygrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Yhook")]
++		public const uint Yhook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ytilde")]
++		public const uint Ytilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Z")]
++		public const uint Z;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Zabovedot")]
++		public const uint Zabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Zacute")]
++		public const uint Zacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Zcaron")]
++		public const uint Zcaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Zen_Koho")]
++		public const uint Zen_Koho;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Zenkaku")]
++		public const uint Zenkaku;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Zenkaku_Hankaku")]
++		public const uint Zenkaku_Hankaku;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ZoomIn")]
++		public const uint ZoomIn;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ZoomOut")]
++		public const uint ZoomOut;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Zstroke")]
++		public const uint Zstroke;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_a")]
++		public const uint a;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_aacute")]
++		public const uint aacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_abelowdot")]
++		public const uint abelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_abovedot")]
++		public const uint abovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_abreve")]
++		public const uint abreve;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_abreveacute")]
++		public const uint abreveacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_abrevebelowdot")]
++		public const uint abrevebelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_abrevegrave")]
++		public const uint abrevegrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_abrevehook")]
++		public const uint abrevehook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_abrevetilde")]
++		public const uint abrevetilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_acircumflex")]
++		public const uint acircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_acircumflexacute")]
++		public const uint acircumflexacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_acircumflexbelowdot")]
++		public const uint acircumflexbelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_acircumflexgrave")]
++		public const uint acircumflexgrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_acircumflexhook")]
++		public const uint acircumflexhook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_acircumflextilde")]
++		public const uint acircumflextilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_acute")]
++		public const uint acute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_adiaeresis")]
++		public const uint adiaeresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ae")]
++		public const uint ae;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_agrave")]
++		public const uint agrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ahook")]
++		public const uint ahook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_amacron")]
++		public const uint amacron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ampersand")]
++		public const uint ampersand;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_aogonek")]
++		public const uint aogonek;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_apostrophe")]
++		public const uint apostrophe;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_approxeq")]
++		public const uint approxeq;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_approximate")]
++		public const uint approximate;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_aring")]
++		public const uint aring;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_asciicircum")]
++		public const uint asciicircum;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_asciitilde")]
++		public const uint asciitilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_asterisk")]
++		public const uint asterisk;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_at")]
++		public const uint at;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_atilde")]
++		public const uint atilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_b")]
++		public const uint b;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_babovedot")]
++		public const uint babovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_backslash")]
++		public const uint backslash;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ballotcross")]
++		public const uint ballotcross;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_bar")]
++		public const uint bar;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_because")]
++		public const uint because;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_blank")]
++		public const uint blank;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_botintegral")]
++		public const uint botintegral;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_botleftparens")]
++		public const uint botleftparens;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_botleftsqbracket")]
++		public const uint botleftsqbracket;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_botleftsummation")]
++		public const uint botleftsummation;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_botrightparens")]
++		public const uint botrightparens;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_botrightsqbracket")]
++		public const uint botrightsqbracket;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_botrightsummation")]
++		public const uint botrightsummation;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_bott")]
++		public const uint bott;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_botvertsummationconnector")]
++		public const uint botvertsummationconnector;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braceleft")]
++		public const uint braceleft;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braceright")]
++		public const uint braceright;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_bracketleft")]
++		public const uint bracketleft;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_bracketright")]
++		public const uint bracketright;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_blank")]
++		public const uint braille_blank;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dot_1")]
++		public const uint braille_dot_1;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dot_10")]
++		public const uint braille_dot_10;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dot_2")]
++		public const uint braille_dot_2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dot_3")]
++		public const uint braille_dot_3;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dot_4")]
++		public const uint braille_dot_4;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dot_5")]
++		public const uint braille_dot_5;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dot_6")]
++		public const uint braille_dot_6;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dot_7")]
++		public const uint braille_dot_7;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dot_8")]
++		public const uint braille_dot_8;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dot_9")]
++		public const uint braille_dot_9;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1")]
++		public const uint braille_dots_1;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12")]
++		public const uint braille_dots_12;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_123")]
++		public const uint braille_dots_123;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1234")]
++		public const uint braille_dots_1234;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12345")]
++		public const uint braille_dots_12345;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_123456")]
++		public const uint braille_dots_123456;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1234567")]
++		public const uint braille_dots_1234567;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12345678")]
++		public const uint braille_dots_12345678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1234568")]
++		public const uint braille_dots_1234568;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_123457")]
++		public const uint braille_dots_123457;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1234578")]
++		public const uint braille_dots_1234578;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_123458")]
++		public const uint braille_dots_123458;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12346")]
++		public const uint braille_dots_12346;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_123467")]
++		public const uint braille_dots_123467;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1234678")]
++		public const uint braille_dots_1234678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_123468")]
++		public const uint braille_dots_123468;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12347")]
++		public const uint braille_dots_12347;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_123478")]
++		public const uint braille_dots_123478;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12348")]
++		public const uint braille_dots_12348;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1235")]
++		public const uint braille_dots_1235;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12356")]
++		public const uint braille_dots_12356;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_123567")]
++		public const uint braille_dots_123567;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1235678")]
++		public const uint braille_dots_1235678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_123568")]
++		public const uint braille_dots_123568;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12357")]
++		public const uint braille_dots_12357;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_123578")]
++		public const uint braille_dots_123578;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12358")]
++		public const uint braille_dots_12358;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1236")]
++		public const uint braille_dots_1236;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12367")]
++		public const uint braille_dots_12367;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_123678")]
++		public const uint braille_dots_123678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12368")]
++		public const uint braille_dots_12368;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1237")]
++		public const uint braille_dots_1237;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12378")]
++		public const uint braille_dots_12378;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1238")]
++		public const uint braille_dots_1238;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_124")]
++		public const uint braille_dots_124;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1245")]
++		public const uint braille_dots_1245;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12456")]
++		public const uint braille_dots_12456;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_124567")]
++		public const uint braille_dots_124567;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1245678")]
++		public const uint braille_dots_1245678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_124568")]
++		public const uint braille_dots_124568;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12457")]
++		public const uint braille_dots_12457;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_124578")]
++		public const uint braille_dots_124578;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12458")]
++		public const uint braille_dots_12458;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1246")]
++		public const uint braille_dots_1246;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12467")]
++		public const uint braille_dots_12467;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_124678")]
++		public const uint braille_dots_124678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12468")]
++		public const uint braille_dots_12468;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1247")]
++		public const uint braille_dots_1247;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12478")]
++		public const uint braille_dots_12478;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1248")]
++		public const uint braille_dots_1248;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_125")]
++		public const uint braille_dots_125;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1256")]
++		public const uint braille_dots_1256;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12567")]
++		public const uint braille_dots_12567;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_125678")]
++		public const uint braille_dots_125678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12568")]
++		public const uint braille_dots_12568;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1257")]
++		public const uint braille_dots_1257;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12578")]
++		public const uint braille_dots_12578;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1258")]
++		public const uint braille_dots_1258;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_126")]
++		public const uint braille_dots_126;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1267")]
++		public const uint braille_dots_1267;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12678")]
++		public const uint braille_dots_12678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1268")]
++		public const uint braille_dots_1268;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_127")]
++		public const uint braille_dots_127;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1278")]
++		public const uint braille_dots_1278;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_128")]
++		public const uint braille_dots_128;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_13")]
++		public const uint braille_dots_13;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_134")]
++		public const uint braille_dots_134;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1345")]
++		public const uint braille_dots_1345;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_13456")]
++		public const uint braille_dots_13456;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_134567")]
++		public const uint braille_dots_134567;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1345678")]
++		public const uint braille_dots_1345678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_134568")]
++		public const uint braille_dots_134568;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_13457")]
++		public const uint braille_dots_13457;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_134578")]
++		public const uint braille_dots_134578;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_13458")]
++		public const uint braille_dots_13458;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1346")]
++		public const uint braille_dots_1346;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_13467")]
++		public const uint braille_dots_13467;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_134678")]
++		public const uint braille_dots_134678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_13468")]
++		public const uint braille_dots_13468;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1347")]
++		public const uint braille_dots_1347;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_13478")]
++		public const uint braille_dots_13478;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1348")]
++		public const uint braille_dots_1348;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_135")]
++		public const uint braille_dots_135;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1356")]
++		public const uint braille_dots_1356;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_13567")]
++		public const uint braille_dots_13567;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_135678")]
++		public const uint braille_dots_135678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_13568")]
++		public const uint braille_dots_13568;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1357")]
++		public const uint braille_dots_1357;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_13578")]
++		public const uint braille_dots_13578;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1358")]
++		public const uint braille_dots_1358;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_136")]
++		public const uint braille_dots_136;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1367")]
++		public const uint braille_dots_1367;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_13678")]
++		public const uint braille_dots_13678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1368")]
++		public const uint braille_dots_1368;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_137")]
++		public const uint braille_dots_137;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1378")]
++		public const uint braille_dots_1378;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_138")]
++		public const uint braille_dots_138;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_14")]
++		public const uint braille_dots_14;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_145")]
++		public const uint braille_dots_145;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1456")]
++		public const uint braille_dots_1456;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_14567")]
++		public const uint braille_dots_14567;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_145678")]
++		public const uint braille_dots_145678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_14568")]
++		public const uint braille_dots_14568;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1457")]
++		public const uint braille_dots_1457;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_14578")]
++		public const uint braille_dots_14578;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1458")]
++		public const uint braille_dots_1458;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_146")]
++		public const uint braille_dots_146;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1467")]
++		public const uint braille_dots_1467;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_14678")]
++		public const uint braille_dots_14678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1468")]
++		public const uint braille_dots_1468;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_147")]
++		public const uint braille_dots_147;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1478")]
++		public const uint braille_dots_1478;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_148")]
++		public const uint braille_dots_148;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_15")]
++		public const uint braille_dots_15;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_156")]
++		public const uint braille_dots_156;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1567")]
++		public const uint braille_dots_1567;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_15678")]
++		public const uint braille_dots_15678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1568")]
++		public const uint braille_dots_1568;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_157")]
++		public const uint braille_dots_157;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1578")]
++		public const uint braille_dots_1578;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_158")]
++		public const uint braille_dots_158;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_16")]
++		public const uint braille_dots_16;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_167")]
++		public const uint braille_dots_167;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1678")]
++		public const uint braille_dots_1678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_168")]
++		public const uint braille_dots_168;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_17")]
++		public const uint braille_dots_17;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_178")]
++		public const uint braille_dots_178;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_18")]
++		public const uint braille_dots_18;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2")]
++		public const uint braille_dots_2;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_23")]
++		public const uint braille_dots_23;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_234")]
++		public const uint braille_dots_234;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2345")]
++		public const uint braille_dots_2345;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_23456")]
++		public const uint braille_dots_23456;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_234567")]
++		public const uint braille_dots_234567;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2345678")]
++		public const uint braille_dots_2345678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_234568")]
++		public const uint braille_dots_234568;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_23457")]
++		public const uint braille_dots_23457;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_234578")]
++		public const uint braille_dots_234578;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_23458")]
++		public const uint braille_dots_23458;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2346")]
++		public const uint braille_dots_2346;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_23467")]
++		public const uint braille_dots_23467;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_234678")]
++		public const uint braille_dots_234678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_23468")]
++		public const uint braille_dots_23468;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2347")]
++		public const uint braille_dots_2347;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_23478")]
++		public const uint braille_dots_23478;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2348")]
++		public const uint braille_dots_2348;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_235")]
++		public const uint braille_dots_235;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2356")]
++		public const uint braille_dots_2356;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_23567")]
++		public const uint braille_dots_23567;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_235678")]
++		public const uint braille_dots_235678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_23568")]
++		public const uint braille_dots_23568;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2357")]
++		public const uint braille_dots_2357;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_23578")]
++		public const uint braille_dots_23578;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2358")]
++		public const uint braille_dots_2358;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_236")]
++		public const uint braille_dots_236;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2367")]
++		public const uint braille_dots_2367;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_23678")]
++		public const uint braille_dots_23678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2368")]
++		public const uint braille_dots_2368;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_237")]
++		public const uint braille_dots_237;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2378")]
++		public const uint braille_dots_2378;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_238")]
++		public const uint braille_dots_238;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_24")]
++		public const uint braille_dots_24;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_245")]
++		public const uint braille_dots_245;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2456")]
++		public const uint braille_dots_2456;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_24567")]
++		public const uint braille_dots_24567;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_245678")]
++		public const uint braille_dots_245678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_24568")]
++		public const uint braille_dots_24568;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2457")]
++		public const uint braille_dots_2457;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_24578")]
++		public const uint braille_dots_24578;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2458")]
++		public const uint braille_dots_2458;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_246")]
++		public const uint braille_dots_246;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2467")]
++		public const uint braille_dots_2467;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_24678")]
++		public const uint braille_dots_24678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2468")]
++		public const uint braille_dots_2468;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_247")]
++		public const uint braille_dots_247;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2478")]
++		public const uint braille_dots_2478;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_248")]
++		public const uint braille_dots_248;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_25")]
++		public const uint braille_dots_25;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_256")]
++		public const uint braille_dots_256;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2567")]
++		public const uint braille_dots_2567;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_25678")]
++		public const uint braille_dots_25678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2568")]
++		public const uint braille_dots_2568;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_257")]
++		public const uint braille_dots_257;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2578")]
++		public const uint braille_dots_2578;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_258")]
++		public const uint braille_dots_258;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_26")]
++		public const uint braille_dots_26;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_267")]
++		public const uint braille_dots_267;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2678")]
++		public const uint braille_dots_2678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_268")]
++		public const uint braille_dots_268;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_27")]
++		public const uint braille_dots_27;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_278")]
++		public const uint braille_dots_278;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_28")]
++		public const uint braille_dots_28;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_3")]
++		public const uint braille_dots_3;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_34")]
++		public const uint braille_dots_34;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_345")]
++		public const uint braille_dots_345;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_3456")]
++		public const uint braille_dots_3456;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_34567")]
++		public const uint braille_dots_34567;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_345678")]
++		public const uint braille_dots_345678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_34568")]
++		public const uint braille_dots_34568;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_3457")]
++		public const uint braille_dots_3457;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_34578")]
++		public const uint braille_dots_34578;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_3458")]
++		public const uint braille_dots_3458;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_346")]
++		public const uint braille_dots_346;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_3467")]
++		public const uint braille_dots_3467;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_34678")]
++		public const uint braille_dots_34678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_3468")]
++		public const uint braille_dots_3468;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_347")]
++		public const uint braille_dots_347;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_3478")]
++		public const uint braille_dots_3478;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_348")]
++		public const uint braille_dots_348;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_35")]
++		public const uint braille_dots_35;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_356")]
++		public const uint braille_dots_356;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_3567")]
++		public const uint braille_dots_3567;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_35678")]
++		public const uint braille_dots_35678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_3568")]
++		public const uint braille_dots_3568;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_357")]
++		public const uint braille_dots_357;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_3578")]
++		public const uint braille_dots_3578;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_358")]
++		public const uint braille_dots_358;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_36")]
++		public const uint braille_dots_36;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_367")]
++		public const uint braille_dots_367;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_3678")]
++		public const uint braille_dots_3678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_368")]
++		public const uint braille_dots_368;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_37")]
++		public const uint braille_dots_37;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_378")]
++		public const uint braille_dots_378;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_38")]
++		public const uint braille_dots_38;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_4")]
++		public const uint braille_dots_4;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_45")]
++		public const uint braille_dots_45;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_456")]
++		public const uint braille_dots_456;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_4567")]
++		public const uint braille_dots_4567;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_45678")]
++		public const uint braille_dots_45678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_4568")]
++		public const uint braille_dots_4568;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_457")]
++		public const uint braille_dots_457;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_4578")]
++		public const uint braille_dots_4578;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_458")]
++		public const uint braille_dots_458;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_46")]
++		public const uint braille_dots_46;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_467")]
++		public const uint braille_dots_467;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_4678")]
++		public const uint braille_dots_4678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_468")]
++		public const uint braille_dots_468;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_47")]
++		public const uint braille_dots_47;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_478")]
++		public const uint braille_dots_478;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_48")]
++		public const uint braille_dots_48;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_5")]
++		public const uint braille_dots_5;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_56")]
++		public const uint braille_dots_56;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_567")]
++		public const uint braille_dots_567;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_5678")]
++		public const uint braille_dots_5678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_568")]
++		public const uint braille_dots_568;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_57")]
++		public const uint braille_dots_57;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_578")]
++		public const uint braille_dots_578;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_58")]
++		public const uint braille_dots_58;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_6")]
++		public const uint braille_dots_6;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_67")]
++		public const uint braille_dots_67;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_678")]
++		public const uint braille_dots_678;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_68")]
++		public const uint braille_dots_68;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_7")]
++		public const uint braille_dots_7;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_78")]
++		public const uint braille_dots_78;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_8")]
++		public const uint braille_dots_8;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_breve")]
++		public const uint breve;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_brokenbar")]
++		public const uint brokenbar;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_c")]
++		public const uint c;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_c_h")]
++		public const uint c_h;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_cabovedot")]
++		public const uint cabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_cacute")]
++		public const uint cacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_careof")]
++		public const uint careof;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_caret")]
++		public const uint caret;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_caron")]
++		public const uint caron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ccaron")]
++		public const uint ccaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ccedilla")]
++		public const uint ccedilla;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ccircumflex")]
++		public const uint ccircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_cedilla")]
++		public const uint cedilla;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_cent")]
++		public const uint cent;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ch")]
++		public const uint ch;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_checkerboard")]
++		public const uint checkerboard;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_checkmark")]
++		public const uint checkmark;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_circle")]
++		public const uint circle;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_club")]
++		public const uint club;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_colon")]
++		public const uint colon;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_comma")]
++		public const uint comma;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_containsas")]
++		public const uint containsas;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_copyright")]
++		public const uint copyright;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_cr")]
++		public const uint cr;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_crossinglines")]
++		public const uint crossinglines;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_cuberoot")]
++		public const uint cuberoot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_currency")]
++		public const uint currency;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_cursor")]
++		public const uint cursor;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_d")]
++		public const uint d;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dabovedot")]
++		public const uint dabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dagger")]
++		public const uint dagger;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dcaron")]
++		public const uint dcaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_A")]
++		public const uint dead_A;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_E")]
++		public const uint dead_E;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_I")]
++		public const uint dead_I;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_O")]
++		public const uint dead_O;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_U")]
++		public const uint dead_U;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_a")]
++		public const uint dead_a;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_abovecomma")]
++		public const uint dead_abovecomma;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_abovedot")]
++		public const uint dead_abovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_abovereversedcomma")]
++		public const uint dead_abovereversedcomma;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_abovering")]
++		public const uint dead_abovering;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_aboveverticalline")]
++		public const uint dead_aboveverticalline;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_acute")]
++		public const uint dead_acute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_belowbreve")]
++		public const uint dead_belowbreve;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_belowcircumflex")]
++		public const uint dead_belowcircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_belowcomma")]
++		public const uint dead_belowcomma;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_belowdiaeresis")]
++		public const uint dead_belowdiaeresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_belowdot")]
++		public const uint dead_belowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_belowmacron")]
++		public const uint dead_belowmacron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_belowring")]
++		public const uint dead_belowring;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_belowtilde")]
++		public const uint dead_belowtilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_belowverticalline")]
++		public const uint dead_belowverticalline;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_breve")]
++		public const uint dead_breve;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_capital_schwa")]
++		public const uint dead_capital_schwa;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_caron")]
++		public const uint dead_caron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_cedilla")]
++		public const uint dead_cedilla;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_circumflex")]
++		public const uint dead_circumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_currency")]
++		public const uint dead_currency;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_dasia")]
++		public const uint dead_dasia;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_diaeresis")]
++		public const uint dead_diaeresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_doubleacute")]
++		public const uint dead_doubleacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_doublegrave")]
++		public const uint dead_doublegrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_e")]
++		public const uint dead_e;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_grave")]
++		public const uint dead_grave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_greek")]
++		public const uint dead_greek;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_hook")]
++		public const uint dead_hook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_horn")]
++		public const uint dead_horn;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_i")]
++		public const uint dead_i;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_invertedbreve")]
++		public const uint dead_invertedbreve;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_iota")]
++		public const uint dead_iota;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_longsolidusoverlay")]
++		public const uint dead_longsolidusoverlay;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_lowline")]
++		public const uint dead_lowline;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_macron")]
++		public const uint dead_macron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_o")]
++		public const uint dead_o;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_ogonek")]
++		public const uint dead_ogonek;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_perispomeni")]
++		public const uint dead_perispomeni;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_psili")]
++		public const uint dead_psili;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_semivoiced_sound")]
++		public const uint dead_semivoiced_sound;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_small_schwa")]
++		public const uint dead_small_schwa;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_stroke")]
++		public const uint dead_stroke;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_tilde")]
++		public const uint dead_tilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_u")]
++		public const uint dead_u;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_voiced_sound")]
++		public const uint dead_voiced_sound;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_decimalpoint")]
++		public const uint decimalpoint;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_degree")]
++		public const uint degree;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_diaeresis")]
++		public const uint diaeresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_diamond")]
++		public const uint diamond;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_digitspace")]
++		public const uint digitspace;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dintegral")]
++		public const uint dintegral;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_division")]
++		public const uint division;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dollar")]
++		public const uint dollar;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_doubbaselinedot")]
++		public const uint doubbaselinedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_doubleacute")]
++		public const uint doubleacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_doubledagger")]
++		public const uint doubledagger;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_doublelowquotemark")]
++		public const uint doublelowquotemark;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_downarrow")]
++		public const uint downarrow;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_downcaret")]
++		public const uint downcaret;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_downshoe")]
++		public const uint downshoe;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_downstile")]
++		public const uint downstile;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_downtack")]
++		public const uint downtack;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dstroke")]
++		public const uint dstroke;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_e")]
++		public const uint e;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_eabovedot")]
++		public const uint eabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_eacute")]
++		public const uint eacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ebelowdot")]
++		public const uint ebelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ecaron")]
++		public const uint ecaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ecircumflex")]
++		public const uint ecircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ecircumflexacute")]
++		public const uint ecircumflexacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ecircumflexbelowdot")]
++		public const uint ecircumflexbelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ecircumflexgrave")]
++		public const uint ecircumflexgrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ecircumflexhook")]
++		public const uint ecircumflexhook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ecircumflextilde")]
++		public const uint ecircumflextilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ediaeresis")]
++		public const uint ediaeresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_egrave")]
++		public const uint egrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ehook")]
++		public const uint ehook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_eightsubscript")]
++		public const uint eightsubscript;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_eightsuperior")]
++		public const uint eightsuperior;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_elementof")]
++		public const uint elementof;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ellipsis")]
++		public const uint ellipsis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_em3space")]
++		public const uint em3space;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_em4space")]
++		public const uint em4space;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_emacron")]
++		public const uint emacron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_emdash")]
++		public const uint emdash;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_emfilledcircle")]
++		public const uint emfilledcircle;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_emfilledrect")]
++		public const uint emfilledrect;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_emopencircle")]
++		public const uint emopencircle;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_emopenrectangle")]
++		public const uint emopenrectangle;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_emptyset")]
++		public const uint emptyset;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_emspace")]
++		public const uint emspace;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_endash")]
++		public const uint endash;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_enfilledcircbullet")]
++		public const uint enfilledcircbullet;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_enfilledsqbullet")]
++		public const uint enfilledsqbullet;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_eng")]
++		public const uint eng;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_enopencircbullet")]
++		public const uint enopencircbullet;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_enopensquarebullet")]
++		public const uint enopensquarebullet;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_enspace")]
++		public const uint enspace;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_eogonek")]
++		public const uint eogonek;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_equal")]
++		public const uint equal;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_eth")]
++		public const uint eth;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_etilde")]
++		public const uint etilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_exclam")]
++		public const uint exclam;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_exclamdown")]
++		public const uint exclamdown;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ezh")]
++		public const uint ezh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_f")]
++		public const uint f;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_fabovedot")]
++		public const uint fabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_femalesymbol")]
++		public const uint femalesymbol;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ff")]
++		public const uint ff;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_figdash")]
++		public const uint figdash;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_filledlefttribullet")]
++		public const uint filledlefttribullet;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_filledrectbullet")]
++		public const uint filledrectbullet;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_filledrighttribullet")]
++		public const uint filledrighttribullet;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_filledtribulletdown")]
++		public const uint filledtribulletdown;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_filledtribulletup")]
++		public const uint filledtribulletup;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_fiveeighths")]
++		public const uint fiveeighths;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_fivesixths")]
++		public const uint fivesixths;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_fivesubscript")]
++		public const uint fivesubscript;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_fivesuperior")]
++		public const uint fivesuperior;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_fourfifths")]
++		public const uint fourfifths;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_foursubscript")]
++		public const uint foursubscript;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_foursuperior")]
++		public const uint foursuperior;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_fourthroot")]
++		public const uint fourthroot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_function")]
++		public const uint function;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_g")]
++		public const uint g;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_gabovedot")]
++		public const uint gabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_gbreve")]
++		public const uint gbreve;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_gcaron")]
++		public const uint gcaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_gcedilla")]
++		public const uint gcedilla;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_gcircumflex")]
++		public const uint gcircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_grave")]
++		public const uint grave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_greater")]
++		public const uint greater;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_greaterthanequal")]
++		public const uint greaterthanequal;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_guillemotleft")]
++		public const uint guillemotleft;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_guillemotright")]
++		public const uint guillemotright;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_h")]
++		public const uint h;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hairspace")]
++		public const uint hairspace;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hcircumflex")]
++		public const uint hcircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_heart")]
++		public const uint heart;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_aleph")]
++		public const uint hebrew_aleph;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_ayin")]
++		public const uint hebrew_ayin;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_bet")]
++		public const uint hebrew_bet;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_beth")]
++		public const uint hebrew_beth;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_chet")]
++		public const uint hebrew_chet;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_dalet")]
++		public const uint hebrew_dalet;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_daleth")]
++		public const uint hebrew_daleth;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_doublelowline")]
++		public const uint hebrew_doublelowline;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_finalkaph")]
++		public const uint hebrew_finalkaph;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_finalmem")]
++		public const uint hebrew_finalmem;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_finalnun")]
++		public const uint hebrew_finalnun;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_finalpe")]
++		public const uint hebrew_finalpe;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_finalzade")]
++		public const uint hebrew_finalzade;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_finalzadi")]
++		public const uint hebrew_finalzadi;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_gimel")]
++		public const uint hebrew_gimel;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_gimmel")]
++		public const uint hebrew_gimmel;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_he")]
++		public const uint hebrew_he;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_het")]
++		public const uint hebrew_het;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_kaph")]
++		public const uint hebrew_kaph;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_kuf")]
++		public const uint hebrew_kuf;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_lamed")]
++		public const uint hebrew_lamed;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_mem")]
++		public const uint hebrew_mem;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_nun")]
++		public const uint hebrew_nun;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_pe")]
++		public const uint hebrew_pe;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_qoph")]
++		public const uint hebrew_qoph;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_resh")]
++		public const uint hebrew_resh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_samech")]
++		public const uint hebrew_samech;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_samekh")]
++		public const uint hebrew_samekh;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_shin")]
++		public const uint hebrew_shin;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_taf")]
++		public const uint hebrew_taf;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_taw")]
++		public const uint hebrew_taw;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_tet")]
++		public const uint hebrew_tet;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_teth")]
++		public const uint hebrew_teth;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_waw")]
++		public const uint hebrew_waw;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_yod")]
++		public const uint hebrew_yod;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_zade")]
++		public const uint hebrew_zade;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_zadi")]
++		public const uint hebrew_zadi;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_zain")]
++		public const uint hebrew_zain;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_zayin")]
++		public const uint hebrew_zayin;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hexagram")]
++		public const uint hexagram;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_horizconnector")]
++		public const uint horizconnector;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_horizlinescan1")]
++		public const uint horizlinescan1;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_horizlinescan3")]
++		public const uint horizlinescan3;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_horizlinescan5")]
++		public const uint horizlinescan5;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_horizlinescan7")]
++		public const uint horizlinescan7;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_horizlinescan9")]
++		public const uint horizlinescan9;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hstroke")]
++		public const uint hstroke;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ht")]
++		public const uint ht;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hyphen")]
++		public const uint hyphen;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_i")]
++		public const uint i;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_iTouch")]
++		public const uint iTouch;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_iacute")]
++		public const uint iacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ibelowdot")]
++		public const uint ibelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ibreve")]
++		public const uint ibreve;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_icircumflex")]
++		public const uint icircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_identical")]
++		public const uint identical;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_idiaeresis")]
++		public const uint idiaeresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_idotless")]
++		public const uint idotless;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ifonlyif")]
++		public const uint ifonlyif;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_igrave")]
++		public const uint igrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ihook")]
++		public const uint ihook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_imacron")]
++		public const uint imacron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_implies")]
++		public const uint implies;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_includedin")]
++		public const uint includedin;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_includes")]
++		public const uint includes;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_infinity")]
++		public const uint infinity;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_integral")]
++		public const uint integral;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_intersection")]
++		public const uint intersection;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_iogonek")]
++		public const uint iogonek;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_itilde")]
++		public const uint itilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_j")]
++		public const uint j;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_jcircumflex")]
++		public const uint jcircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_jot")]
++		public const uint jot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_k")]
++		public const uint k;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_A")]
++		public const uint kana_A;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_CHI")]
++		public const uint kana_CHI;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_E")]
++		public const uint kana_E;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_FU")]
++		public const uint kana_FU;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_HA")]
++		public const uint kana_HA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_HE")]
++		public const uint kana_HE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_HI")]
++		public const uint kana_HI;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_HO")]
++		public const uint kana_HO;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_HU")]
++		public const uint kana_HU;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_I")]
++		public const uint kana_I;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_KA")]
++		public const uint kana_KA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_KE")]
++		public const uint kana_KE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_KI")]
++		public const uint kana_KI;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_KO")]
++		public const uint kana_KO;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_KU")]
++		public const uint kana_KU;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_MA")]
++		public const uint kana_MA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_ME")]
++		public const uint kana_ME;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_MI")]
++		public const uint kana_MI;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_MO")]
++		public const uint kana_MO;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_MU")]
++		public const uint kana_MU;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_N")]
++		public const uint kana_N;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_NA")]
++		public const uint kana_NA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_NE")]
++		public const uint kana_NE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_NI")]
++		public const uint kana_NI;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_NO")]
++		public const uint kana_NO;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_NU")]
++		public const uint kana_NU;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_O")]
++		public const uint kana_O;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_RA")]
++		public const uint kana_RA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_RE")]
++		public const uint kana_RE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_RI")]
++		public const uint kana_RI;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_RO")]
++		public const uint kana_RO;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_RU")]
++		public const uint kana_RU;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_SA")]
++		public const uint kana_SA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_SE")]
++		public const uint kana_SE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_SHI")]
++		public const uint kana_SHI;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_SO")]
++		public const uint kana_SO;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_SU")]
++		public const uint kana_SU;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_TA")]
++		public const uint kana_TA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_TE")]
++		public const uint kana_TE;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_TI")]
++		public const uint kana_TI;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_TO")]
++		public const uint kana_TO;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_TSU")]
++		public const uint kana_TSU;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_TU")]
++		public const uint kana_TU;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_U")]
++		public const uint kana_U;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_WA")]
++		public const uint kana_WA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_WO")]
++		public const uint kana_WO;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_YA")]
++		public const uint kana_YA;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_YO")]
++		public const uint kana_YO;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_YU")]
++		public const uint kana_YU;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_a")]
++		public const uint kana_a;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_closingbracket")]
++		public const uint kana_closingbracket;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_comma")]
++		public const uint kana_comma;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_conjunctive")]
++		public const uint kana_conjunctive;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_e")]
++		public const uint kana_e;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_fullstop")]
++		public const uint kana_fullstop;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_i")]
++		public const uint kana_i;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_middledot")]
++		public const uint kana_middledot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_o")]
++		public const uint kana_o;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_openingbracket")]
++		public const uint kana_openingbracket;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_switch")]
++		public const uint kana_switch;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_tsu")]
++		public const uint kana_tsu;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_tu")]
++		public const uint kana_tu;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_u")]
++		public const uint kana_u;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_ya")]
++		public const uint kana_ya;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_yo")]
++		public const uint kana_yo;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_yu")]
++		public const uint kana_yu;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kappa")]
++		public const uint kappa;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kcedilla")]
++		public const uint kcedilla;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kra")]
++		public const uint kra;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_l")]
++		public const uint l;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_lacute")]
++		public const uint lacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_latincross")]
++		public const uint latincross;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_lbelowdot")]
++		public const uint lbelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_lcaron")]
++		public const uint lcaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_lcedilla")]
++		public const uint lcedilla;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_leftanglebracket")]
++		public const uint leftanglebracket;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_leftarrow")]
++		public const uint leftarrow;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_leftcaret")]
++		public const uint leftcaret;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_leftdoublequotemark")]
++		public const uint leftdoublequotemark;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_leftmiddlecurlybrace")]
++		public const uint leftmiddlecurlybrace;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_leftopentriangle")]
++		public const uint leftopentriangle;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_leftpointer")]
++		public const uint leftpointer;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_leftradical")]
++		public const uint leftradical;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_leftshoe")]
++		public const uint leftshoe;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_leftsinglequotemark")]
++		public const uint leftsinglequotemark;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_leftt")]
++		public const uint leftt;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_lefttack")]
++		public const uint lefttack;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_less")]
++		public const uint less;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_lessthanequal")]
++		public const uint lessthanequal;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_lf")]
++		public const uint lf;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_logicaland")]
++		public const uint logicaland;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_logicalor")]
++		public const uint logicalor;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_lowleftcorner")]
++		public const uint lowleftcorner;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_lowrightcorner")]
++		public const uint lowrightcorner;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_lstroke")]
++		public const uint lstroke;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_m")]
++		public const uint m;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_mabovedot")]
++		public const uint mabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_macron")]
++		public const uint macron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_malesymbol")]
++		public const uint malesymbol;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_maltesecross")]
++		public const uint maltesecross;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_marker")]
++		public const uint marker;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_masculine")]
++		public const uint masculine;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_minus")]
++		public const uint minus;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_minutes")]
++		public const uint minutes;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_mu")]
++		public const uint mu;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_multiply")]
++		public const uint multiply;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_musicalflat")]
++		public const uint musicalflat;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_musicalsharp")]
++		public const uint musicalsharp;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_n")]
++		public const uint n;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_nabla")]
++		public const uint nabla;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_nacute")]
++		public const uint nacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ncaron")]
++		public const uint ncaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ncedilla")]
++		public const uint ncedilla;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ninesubscript")]
++		public const uint ninesubscript;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ninesuperior")]
++		public const uint ninesuperior;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_nl")]
++		public const uint nl;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_nobreakspace")]
++		public const uint nobreakspace;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_notapproxeq")]
++		public const uint notapproxeq;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_notelementof")]
++		public const uint notelementof;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_notequal")]
++		public const uint notequal;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_notidentical")]
++		public const uint notidentical;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_notsign")]
++		public const uint notsign;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ntilde")]
++		public const uint ntilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_numbersign")]
++		public const uint numbersign;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_numerosign")]
++		public const uint numerosign;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_o")]
++		public const uint o;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_oacute")]
++		public const uint oacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_obarred")]
++		public const uint obarred;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_obelowdot")]
++		public const uint obelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ocaron")]
++		public const uint ocaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ocircumflex")]
++		public const uint ocircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ocircumflexacute")]
++		public const uint ocircumflexacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ocircumflexbelowdot")]
++		public const uint ocircumflexbelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ocircumflexgrave")]
++		public const uint ocircumflexgrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ocircumflexhook")]
++		public const uint ocircumflexhook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ocircumflextilde")]
++		public const uint ocircumflextilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_odiaeresis")]
++		public const uint odiaeresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_odoubleacute")]
++		public const uint odoubleacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_oe")]
++		public const uint oe;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ogonek")]
++		public const uint ogonek;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ograve")]
++		public const uint ograve;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ohook")]
++		public const uint ohook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ohorn")]
++		public const uint ohorn;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ohornacute")]
++		public const uint ohornacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ohornbelowdot")]
++		public const uint ohornbelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ohorngrave")]
++		public const uint ohorngrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ohornhook")]
++		public const uint ohornhook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ohorntilde")]
++		public const uint ohorntilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_omacron")]
++		public const uint omacron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_oneeighth")]
++		public const uint oneeighth;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_onefifth")]
++		public const uint onefifth;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_onehalf")]
++		public const uint onehalf;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_onequarter")]
++		public const uint onequarter;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_onesixth")]
++		public const uint onesixth;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_onesubscript")]
++		public const uint onesubscript;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_onesuperior")]
++		public const uint onesuperior;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_onethird")]
++		public const uint onethird;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ooblique")]
++		public const uint ooblique;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_openrectbullet")]
++		public const uint openrectbullet;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_openstar")]
++		public const uint openstar;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_opentribulletdown")]
++		public const uint opentribulletdown;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_opentribulletup")]
++		public const uint opentribulletup;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ordfeminine")]
++		public const uint ordfeminine;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_oslash")]
++		public const uint oslash;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_otilde")]
++		public const uint otilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_overbar")]
++		public const uint overbar;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_overline")]
++		public const uint overline;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_p")]
++		public const uint p;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_pabovedot")]
++		public const uint pabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_paragraph")]
++		public const uint paragraph;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_parenleft")]
++		public const uint parenleft;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_parenright")]
++		public const uint parenright;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_partdifferential")]
++		public const uint partdifferential;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_partialderivative")]
++		public const uint partialderivative;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_percent")]
++		public const uint percent;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_period")]
++		public const uint period;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_periodcentered")]
++		public const uint periodcentered;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_permille")]
++		public const uint permille;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_phonographcopyright")]
++		public const uint phonographcopyright;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_plus")]
++		public const uint plus;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_plusminus")]
++		public const uint plusminus;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_prescription")]
++		public const uint prescription;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_prolongedsound")]
++		public const uint prolongedsound;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_punctspace")]
++		public const uint punctspace;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_q")]
++		public const uint q;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_quad")]
++		public const uint quad;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_question")]
++		public const uint question;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_questiondown")]
++		public const uint questiondown;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_quotedbl")]
++		public const uint quotedbl;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_quoteleft")]
++		public const uint quoteleft;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_quoteright")]
++		public const uint quoteright;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_r")]
++		public const uint r;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_racute")]
++		public const uint racute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_radical")]
++		public const uint radical;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_rcaron")]
++		public const uint rcaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_rcedilla")]
++		public const uint rcedilla;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_registered")]
++		public const uint registered;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_rightanglebracket")]
++		public const uint rightanglebracket;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_rightarrow")]
++		public const uint rightarrow;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_rightcaret")]
++		public const uint rightcaret;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_rightdoublequotemark")]
++		public const uint rightdoublequotemark;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_rightmiddlecurlybrace")]
++		public const uint rightmiddlecurlybrace;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_rightmiddlesummation")]
++		public const uint rightmiddlesummation;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_rightopentriangle")]
++		public const uint rightopentriangle;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_rightpointer")]
++		public const uint rightpointer;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_rightshoe")]
++		public const uint rightshoe;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_rightsinglequotemark")]
++		public const uint rightsinglequotemark;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_rightt")]
++		public const uint rightt;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_righttack")]
++		public const uint righttack;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_s")]
++		public const uint s;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_sabovedot")]
++		public const uint sabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_sacute")]
++		public const uint sacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_scaron")]
++		public const uint scaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_scedilla")]
++		public const uint scedilla;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_schwa")]
++		public const uint schwa;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_scircumflex")]
++		public const uint scircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_script_switch")]
++		public const uint script_switch;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_seconds")]
++		public const uint seconds;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_section")]
++		public const uint section;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_semicolon")]
++		public const uint semicolon;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_semivoicedsound")]
++		public const uint semivoicedsound;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_seveneighths")]
++		public const uint seveneighths;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_sevensubscript")]
++		public const uint sevensubscript;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_sevensuperior")]
++		public const uint sevensuperior;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_signaturemark")]
++		public const uint signaturemark;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_signifblank")]
++		public const uint signifblank;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_similarequal")]
++		public const uint similarequal;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_singlelowquotemark")]
++		public const uint singlelowquotemark;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_sixsubscript")]
++		public const uint sixsubscript;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_sixsuperior")]
++		public const uint sixsuperior;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_slash")]
++		public const uint slash;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_soliddiamond")]
++		public const uint soliddiamond;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_space")]
++		public const uint space;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_squareroot")]
++		public const uint squareroot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ssharp")]
++		public const uint ssharp;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_sterling")]
++		public const uint sterling;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_stricteq")]
++		public const uint stricteq;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_t")]
++		public const uint t;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_tabovedot")]
++		public const uint tabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_tcaron")]
++		public const uint tcaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_tcedilla")]
++		public const uint tcedilla;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_telephone")]
++		public const uint telephone;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_telephonerecorder")]
++		public const uint telephonerecorder;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_therefore")]
++		public const uint therefore;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_thinspace")]
++		public const uint thinspace;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_thorn")]
++		public const uint thorn;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_threeeighths")]
++		public const uint threeeighths;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_threefifths")]
++		public const uint threefifths;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_threequarters")]
++		public const uint threequarters;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_threesubscript")]
++		public const uint threesubscript;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_threesuperior")]
++		public const uint threesuperior;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_tintegral")]
++		public const uint tintegral;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_topintegral")]
++		public const uint topintegral;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_topleftparens")]
++		public const uint topleftparens;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_topleftradical")]
++		public const uint topleftradical;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_topleftsqbracket")]
++		public const uint topleftsqbracket;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_topleftsummation")]
++		public const uint topleftsummation;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_toprightparens")]
++		public const uint toprightparens;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_toprightsqbracket")]
++		public const uint toprightsqbracket;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_toprightsummation")]
++		public const uint toprightsummation;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_topt")]
++		public const uint topt;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_topvertsummationconnector")]
++		public const uint topvertsummationconnector;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_trademark")]
++		public const uint trademark;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_trademarkincircle")]
++		public const uint trademarkincircle;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_tslash")]
++		public const uint tslash;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_twofifths")]
++		public const uint twofifths;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_twosubscript")]
++		public const uint twosubscript;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_twosuperior")]
++		public const uint twosuperior;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_twothirds")]
++		public const uint twothirds;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_u")]
++		public const uint u;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_uacute")]
++		public const uint uacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ubelowdot")]
++		public const uint ubelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ubreve")]
++		public const uint ubreve;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ucircumflex")]
++		public const uint ucircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_udiaeresis")]
++		public const uint udiaeresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_udoubleacute")]
++		public const uint udoubleacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ugrave")]
++		public const uint ugrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_uhook")]
++		public const uint uhook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_uhorn")]
++		public const uint uhorn;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_uhornacute")]
++		public const uint uhornacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_uhornbelowdot")]
++		public const uint uhornbelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_uhorngrave")]
++		public const uint uhorngrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_uhornhook")]
++		public const uint uhornhook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_uhorntilde")]
++		public const uint uhorntilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_umacron")]
++		public const uint umacron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_underbar")]
++		public const uint underbar;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_underscore")]
++		public const uint underscore;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_union")]
++		public const uint union;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_uogonek")]
++		public const uint uogonek;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_uparrow")]
++		public const uint uparrow;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_upcaret")]
++		public const uint upcaret;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_upleftcorner")]
++		public const uint upleftcorner;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_uprightcorner")]
++		public const uint uprightcorner;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_upshoe")]
++		public const uint upshoe;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_upstile")]
++		public const uint upstile;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_uptack")]
++		public const uint uptack;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_uring")]
++		public const uint uring;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_utilde")]
++		public const uint utilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_v")]
++		public const uint v;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_variation")]
++		public const uint variation;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_vertbar")]
++		public const uint vertbar;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_vertconnector")]
++		public const uint vertconnector;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_voicedsound")]
++		public const uint voicedsound;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_vt")]
++		public const uint vt;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_w")]
++		public const uint w;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_wacute")]
++		public const uint wacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_wcircumflex")]
++		public const uint wcircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_wdiaeresis")]
++		public const uint wdiaeresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_wgrave")]
++		public const uint wgrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_x")]
++		public const uint x;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_xabovedot")]
++		public const uint xabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_y")]
++		public const uint y;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_yacute")]
++		public const uint yacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ybelowdot")]
++		public const uint ybelowdot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ycircumflex")]
++		public const uint ycircumflex;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ydiaeresis")]
++		public const uint ydiaeresis;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_yen")]
++		public const uint yen;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ygrave")]
++		public const uint ygrave;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_yhook")]
++		public const uint yhook;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ytilde")]
++		public const uint ytilde;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_z")]
++		public const uint z;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_zabovedot")]
++		public const uint zabovedot;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_zacute")]
++		public const uint zacute;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_zcaron")]
++		public const uint zcaron;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_zerosubscript")]
++		public const uint zerosubscript;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_zerosuperior")]
++		public const uint zerosuperior;
++		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_zstroke")]
++		public const uint zstroke;
++	}
++	namespace Threads {
++		namespace Idle {
++			[CCode (cheader_filename = "clutter/clutter.h", cname = "clutter_threads_add_idle")]
++			[Version (since = "0.4")]
++			public static uint add (GLib.SourceFunc func);
++			[CCode (cheader_filename = "clutter/clutter.h", cname = "clutter_threads_add_idle_full")]
++			[Version (since = "0.4")]
++			public static uint add_full (int priority, owned GLib.SourceFunc func);
++		}
++		namespace Timeout {
++			[CCode (cheader_filename = "clutter/clutter.h", cname = "clutter_threads_add_timeout")]
++			[Version (since = "0.4")]
++			public static uint add (uint interval, GLib.SourceFunc func);
++			[CCode (cheader_filename = "clutter/clutter.h", cname = "clutter_threads_add_timeout_full")]
++			[Version (since = "0.4")]
++			public static uint add_full (int priority, uint interval, owned GLib.SourceFunc func);
++		}
++		[CCode (cheader_filename = "clutter/clutter.h")]
++		[Version (since = "1.0")]
++		public static uint add_repaint_func (owned GLib.SourceFunc func);
++		[CCode (cheader_filename = "clutter/clutter.h")]
++		[Version (since = "1.10")]
++		public static uint add_repaint_func_full (Clutter.RepaintFlags flags, owned GLib.SourceFunc func);
++		[CCode (cheader_filename = "clutter/clutter.h")]
++		[Version (since = "1.0")]
++		public static void remove_repaint_func (uint handle_id);
++	}
++	namespace Value {
++		[CCode (cheader_filename = "clutter/clutter.h")]
++		[Version (since = "1.10")]
++		public static Clutter.PaintNode dup_paint_node (GLib.Value value);
++		[CCode (cheader_filename = "clutter/clutter.h")]
++		[Version (since = "0.8")]
++		public static unowned Clutter.Color? get_color (GLib.Value value);
++		[CCode (cheader_filename = "clutter/clutter.h")]
++		[Version (since = "1.10")]
++		public static unowned Clutter.PaintNode get_paint_node (GLib.Value value);
++		[CCode (array_length_pos = 1.1, array_length_type = "gsize", cheader_filename = "clutter/clutter.h")]
++		[Version (since = "0.8")]
++		public static unowned float[] get_shader_float (GLib.Value value);
++		[CCode (array_length_pos = 1.1, array_length_type = "gsize", cheader_filename = "clutter/clutter.h")]
++		[Version (since = "0.8")]
++		public static unowned int[] get_shader_int (GLib.Value value);
++		[CCode (array_length_pos = 1.1, array_length_type = "gsize", cheader_filename = "clutter/clutter.h")]
++		[Version (since = "0.8")]
++		public static unowned float[] get_shader_matrix (GLib.Value value);
++		[CCode (cheader_filename = "clutter/clutter.h")]
++		[Version (since = "0.8")]
++		public static unowned Clutter.Units? get_units (GLib.Value value);
++		[CCode (cheader_filename = "clutter/clutter.h")]
++		[Version (since = "0.8")]
++		public static void set_color (GLib.Value value, Clutter.Color color);
++		[CCode (cheader_filename = "clutter/clutter.h")]
++		[Version (since = "1.10")]
++		public static void set_paint_node (GLib.Value value, Clutter.PaintNode? node);
++		[CCode (cheader_filename = "clutter/clutter.h")]
++		[Version (since = "0.8")]
++		public static void set_shader_float (GLib.Value value, [CCode (array_length_cname = "size", array_length_pos = 1.5)] float[] floats);
++		[CCode (cheader_filename = "clutter/clutter.h")]
++		[Version (since = "0.8")]
++		public static void set_shader_int (GLib.Value value, [CCode (array_length_cname = "size", array_length_pos = 1.5)] int[] ints);
++		[CCode (cheader_filename = "clutter/clutter.h")]
++		[Version (since = "0.8")]
++		public static void set_shader_matrix (GLib.Value value, [CCode (array_length_cname = "size", array_length_pos = 1.5)] float[] matrix);
++		[CCode (cheader_filename = "clutter/clutter.h")]
++		[Version (since = "0.8")]
++		public static void set_units (GLib.Value value, Clutter.Units units);
++		[CCode (cheader_filename = "clutter/clutter.h")]
++		[Version (since = "1.10")]
++		public static void take_paint_node (GLib.Value value, Clutter.PaintNode? node);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_action_get_type ()")]
++	public abstract class Action : Clutter.ActorMeta {
++		[CCode (has_construct_function = false)]
++		protected Action ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_actor_get_type ()")]
++	public class Actor : GLib.InitiallyUnowned, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
++		public uint32 flags;
++		[CCode (has_construct_function = false)]
++		[Version (since = "1.10")]
++		public Actor ();
++		[Version (since = "1.4")]
++		public void add_action (Clutter.Action action);
++		[Version (since = "1.4")]
++		public void add_action_with_name (string name, Clutter.Action action);
++		[Version (since = "1.10")]
++		public void add_child (Clutter.Actor child);
++		[Version (since = "1.4")]
++		public void add_constraint (Clutter.Constraint constraint);
++		[Version (since = "1.4")]
++		public void add_constraint_with_name (string name, Clutter.Constraint constraint);
++		[Version (since = "1.4")]
++		public void add_effect (Clutter.Effect effect);
++		[Version (since = "1.4")]
++		public void add_effect_with_name (string name, Clutter.Effect effect);
++		[Version (since = "1.10")]
++		public void add_transition (string name, Clutter.Transition transition);
++		[Version (since = "0.8")]
++		public virtual void allocate (Clutter.ActorBox box);
++		[Version (since = "1.4")]
++		public void allocate_align_fill (Clutter.ActorBox box, double x_align, double y_align, bool x_fill, bool y_fill);
++		[Version (since = "1.0")]
++		public void allocate_available_size (float x, float y, float available_width, float available_height);
++		[Version (since = "0.8")]
++		public void allocate_preferred_size (float x, float y);
++		[Version (since = "0.6")]
++		public Graphene.Point3D apply_relative_transform_to_point (Clutter.Actor? ancestor, Graphene.Point3D point);
++		[NoWrapper]
++		public virtual void apply_transform (ref Graphene.Matrix matrix);
++		[Version (since = "0.4")]
++		public Graphene.Point3D apply_transform_to_point (Graphene.Point3D point);
++		[Version (since = "1.24")]
++		public void bind_model (GLib.ListModel? model, owned Clutter.ActorCreateChildFunc create_child_func);
++		[NoWrapper]
++		public virtual float calculate_resource_scale (int phase);
++		[Version (since = "1.4")]
++		public void clear_actions ();
++		[Version (since = "1.4")]
++		public void clear_constraints ();
++		[Version (since = "1.4")]
++		public void clear_effects ();
++		[Version (since = "1.4")]
++		public bool contains (Clutter.Actor descendant);
++		[Version (since = "1.8")]
++		public void continue_paint (Clutter.PaintContext paint_context);
++		public void continue_pick (Clutter.PickContext pick_context);
++		[Version (since = "1.0")]
++		public Pango.Context create_pango_context ();
++		[Version (since = "1.0")]
++		public Pango.Layout create_pango_layout (string? text);
++		[Version (since = "1.10")]
++		public void destroy_all_children ();
++		[CCode (cname = "clutter_actor_event")]
++		[Version (since = "0.6")]
++		public bool emit_event (Clutter.Event event, bool capture);
++		[Version (since = "0.4")]
++		public void get_abs_allocation_vertices ([CCode (array_length = false)] Graphene.Point3D verts[4]);
++		public virtual unowned Atk.Object get_accessible ();
++		[Version (since = "1.4")]
++		public unowned Clutter.Action get_action (string name);
++		[Version (since = "1.4")]
++		public GLib.List<weak Clutter.Action> get_actions ();
++		[Version (since = "0.8")]
++		public Clutter.ActorBox get_allocation_box ();
++		[Version (since = "1.10")]
++		public Clutter.Color get_background_color ();
++		[Version (since = "1.10")]
++		public unowned Clutter.Actor get_child_at_index (int index_);
++		[Version (since = "1.12")]
++		public Graphene.Matrix get_child_transform ();
++		[Version (since = "1.10")]
++		public GLib.List<weak Clutter.Actor> get_children ();
++		[Version (since = "0.6")]
++		public void get_clip (out float xoff, out float yoff, out float width, out float height);
++		[Version (since = "1.4")]
++		public bool get_clip_to_allocation ();
++		[Version (since = "1.4")]
++		public unowned Clutter.Constraint get_constraint (string name);
++		[Version (since = "1.4")]
++		public GLib.List<weak Clutter.Constraint> get_constraints ();
++		[Version (since = "1.10")]
++		public unowned Clutter.Content get_content ();
++		[Version (since = "1.10")]
++		public Clutter.ActorBox get_content_box ();
++		[Version (since = "1.10")]
++		public Clutter.ContentGravity get_content_gravity ();
++		[Version (since = "1.12")]
++		public Clutter.ContentRepeat get_content_repeat ();
++		[Version (since = "1.10")]
++		public void get_content_scaling_filters (out Clutter.ScalingFilter min_filter, out Clutter.ScalingFilter mag_filter);
++		[Version (since = "1.10")]
++		public unowned Clutter.PaintVolume? get_default_paint_volume ();
++		[Version (since = "1.10")]
++		public uint get_easing_delay ();
++		[Version (since = "1.10")]
++		public uint get_easing_duration ();
++		[Version (since = "1.10")]
++		public Clutter.AnimationMode get_easing_mode ();
++		[Version (since = "1.4")]
++		public unowned Clutter.Effect get_effect (string name);
++		[Version (since = "1.4")]
++		public GLib.List<weak Clutter.Effect> get_effects ();
++		[Version (since = "1.10")]
++		public unowned Clutter.Actor get_first_child ();
++		public bool get_fixed_position (out float x, out float y);
++		[Version (since = "0.8")]
++		public bool get_fixed_position_set ();
++		[Version (since = "1.0")]
++		public Clutter.ActorFlags get_flags ();
++		[CCode (cname = "clutter_actor_has_pointer")]
++		[Version (since = "1.2")]
++		public bool get_has_pointer ();
++		public float get_height ();
++		[Version (since = "1.10")]
++		public unowned Clutter.Actor get_last_child ();
++		[Version (since = "1.10")]
++		public unowned Clutter.LayoutManager get_layout_manager ();
++		[Version (since = "1.10")]
++		public Clutter.Margin get_margin ();
++		[Version (since = "1.10")]
++		public float get_margin_bottom ();
++		[Version (since = "1.10")]
++		public float get_margin_left ();
++		[Version (since = "1.10")]
++		public float get_margin_right ();
++		[Version (since = "1.10")]
++		public float get_margin_top ();
++		[Version (since = "1.10")]
++		public int get_n_children ();
++		public unowned string get_name ();
++		[Version (since = "1.10")]
++		public unowned Clutter.Actor get_next_sibling ();
++		[Version (since = "1.8")]
++		public Clutter.OffscreenRedirect get_offscreen_redirect ();
++		public uint8 get_opacity ();
++		[Version (since = "1.22")]
++		public int get_opacity_override ();
++		[Version (since = "1.6")]
++		public bool get_paint_box (out Clutter.ActorBox box);
++		[Version (since = "0.8")]
++		public uint8 get_paint_opacity ();
++		[Version (since = "0.8")]
++		public bool get_paint_visibility ();
++		[Version (since = "1.6")]
++		public unowned Clutter.PaintVolume? get_paint_volume ();
++		[CCode (vfunc_name = "get_paint_volume")]
++		[NoWrapper]
++		public virtual bool get_paint_volume_vfunc (out Clutter.PaintVolume volume);
++		[Version (since = "1.0")]
++		public unowned Pango.Context get_pango_context ();
++		public unowned Clutter.Actor? get_parent ();
++		[Version (since = "1.12")]
++		public void get_pivot_point (out float pivot_x, out float pivot_y);
++		[Version (since = "1.12")]
++		public float get_pivot_point_z ();
++		[Version (since = "0.6")]
++		public void get_position (out float x, out float y);
++		[Version (since = "0.8")]
++		public virtual void get_preferred_height (float for_width, out float min_height_p, out float natural_height_p);
++		[Version (since = "0.8")]
++		public void get_preferred_size (out float min_width_p, out float min_height_p, out float natural_width_p, out float natural_height_p);
++		[Version (since = "0.8")]
++		public virtual void get_preferred_width (float for_height, out float min_width_p, out float natural_width_p);
++		[Version (since = "1.10")]
++		public unowned Clutter.Actor get_previous_sibling ();
++		[Version (since = "0.6")]
++		public bool get_reactive ();
++		[Version (since = "1.2")]
++		public Clutter.RequestMode get_request_mode ();
++		public float get_resource_scale ();
++		[Version (since = "1.12")]
++		public double get_rotation_angle (Clutter.RotateAxis axis);
++		[Version (since = "0.2")]
++		public void get_scale (out double scale_x, out double scale_y);
++		[Version (since = "1.12")]
++		public double get_scale_z ();
++		[Version (since = "0.2")]
++		public void get_size (out float width, out float height);
++		[Version (since = "0.8")]
++		public unowned Clutter.Stage get_stage ();
++		[Version (since = "1.2")]
++		public Clutter.TextDirection get_text_direction ();
++		[Version (since = "1.12")]
++		public Graphene.Matrix get_transform ();
++		public Graphene.Rect get_transformed_extents ();
++		[Version (since = "1.6")]
++		public unowned Clutter.PaintVolume? get_transformed_paint_volume (Clutter.Actor relative_to_ancestor);
++		[Version (since = "0.8")]
++		public void get_transformed_position (out float x, out float y);
++		[Version (since = "0.8")]
++		public void get_transformed_size (out float width, out float height);
++		[Version (since = "1.10")]
++		public unowned Clutter.Transition get_transition (string name);
++		[Version (since = "1.12")]
++		public void get_translation (out float translate_x, out float translate_y, out float translate_z);
++		public float get_width ();
++		public float get_x ();
++		[Version (since = "1.10")]
++		public Clutter.ActorAlign get_x_align ();
++		[Version (since = "1.12")]
++		public bool get_x_expand ();
++		public float get_y ();
++		[Version (since = "1.10")]
++		public Clutter.ActorAlign get_y_align ();
++		[Version (since = "1.12")]
++		public bool get_y_expand ();
++		[Version (since = "1.12")]
++		public float get_z_position ();
++		[Version (since = "1.0")]
++		public void grab_key_focus ();
++		public virtual bool has_accessible ();
++		[Version (since = "1.10")]
++		public bool has_actions ();
++		[Version (since = "1.4")]
++		public bool has_allocation ();
++		[Version (since = "1.10")]
++		public bool has_constraints ();
++		public bool has_damage ();
++		[Version (since = "1.10")]
++		public bool has_effects ();
++		[Version (since = "1.4")]
++		public bool has_key_focus ();
++		public bool has_mapped_clones ();
++		[Version (since = "1.8")]
++		public virtual bool has_overlaps ();
++		[NoWrapper]
++		public virtual void hide_all ();
++		public void inhibit_culling ();
++		[Version (since = "1.10")]
++		public void insert_child_above (Clutter.Actor child, Clutter.Actor? sibling);
++		[Version (since = "1.10")]
++		public void insert_child_at_index (Clutter.Actor child, int index_);
++		[Version (since = "1.10")]
++		public void insert_child_below (Clutter.Actor child, Clutter.Actor? sibling);
++		public void invalidate_transform ();
++		public bool is_effectively_on_stage_view (Clutter.StageView view);
++		[Version (since = "1.0")]
++		public bool is_in_clone_paint ();
++		[Version (since = "1.24")]
++		public bool is_mapped ();
++		[Version (since = "1.24")]
++		public bool is_realized ();
++		[Version (since = "0.6")]
++		public bool is_rotated ();
++		[Version (since = "0.6")]
++		public bool is_scaled ();
++		[Version (since = "1.24")]
++		public bool is_visible ();
++		[Version (since = "1.0")]
++		public virtual void map ();
++		[Version (since = "0.2")]
++		public void move_by (float dx, float dy);
++		[Version (since = "1.12")]
++		public bool needs_expand (Clutter.Orientation orientation);
++		public virtual void paint (Clutter.PaintContext paint_context);
++		[NoWrapper]
++		public virtual void paint_node (Clutter.PaintNode root);
++		public unowned GLib.List<Clutter.StageView> peek_stage_views ();
++		public void pick_box (Clutter.PickContext pick_context, Clutter.ActorBox box);
++		public void queue_redraw ();
++		[Version (since = "1.10")]
++		public void queue_redraw_with_clip (Cairo.RectangleInt? clip);
++		[Version (since = "1.4")]
++		public void remove_action (Clutter.Action action);
++		[Version (since = "1.4")]
++		public void remove_action_by_name (string name);
++		[Version (since = "1.10")]
++		public void remove_all_children ();
++		[Version (since = "1.10")]
++		public void remove_all_transitions ();
++		[Version (since = "1.10")]
++		public void remove_child (Clutter.Actor child);
++		public void remove_clip ();
++		[Version (since = "1.4")]
++		public void remove_constraint (Clutter.Constraint constraint);
++		[Version (since = "1.4")]
++		public void remove_constraint_by_name (string name);
++		[Version (since = "1.4")]
++		public void remove_effect (Clutter.Effect effect);
++		[Version (since = "1.4")]
++		public void remove_effect_by_name (string name);
++		[Version (since = "1.10")]
++		public void remove_transition (string name);
++		[Version (since = "1.10")]
++		public void replace_child (Clutter.Actor old_child, Clutter.Actor new_child);
++		[Version (since = "1.10")]
++		public void restore_easing_state ();
++		[Version (since = "1.10")]
++		public void save_easing_state ();
++		[Version (since = "1.10")]
++		public void set_allocation (Clutter.ActorBox box);
++		[Version (since = "1.10")]
++		public void set_background_color (Clutter.Color? color);
++		[Version (since = "1.10")]
++		public void set_child_above_sibling (Clutter.Actor child, Clutter.Actor? sibling);
++		[Version (since = "1.10")]
++		public void set_child_at_index (Clutter.Actor child, int index_);
++		[Version (since = "1.10")]
++		public void set_child_below_sibling (Clutter.Actor child, Clutter.Actor? sibling);
++		[Version (since = "1.12")]
++		public void set_child_transform (Graphene.Matrix? transform);
++		[Version (since = "0.6")]
++		public void set_clip (float xoff, float yoff, float width, float height);
++		[Version (since = "1.4")]
++		public void set_clip_to_allocation (bool clip_set);
++		[Version (since = "1.10")]
++		public void set_content (Clutter.Content? content);
++		[Version (since = "1.10")]
++		public void set_content_gravity (Clutter.ContentGravity gravity);
++		[Version (since = "1.12")]
++		public void set_content_repeat (Clutter.ContentRepeat repeat);
++		[Version (since = "1.10")]
++		public void set_content_scaling_filters (Clutter.ScalingFilter min_filter, Clutter.ScalingFilter mag_filter);
++		[Version (since = "1.10")]
++		public void set_easing_delay (uint msecs);
++		[Version (since = "1.10")]
++		public void set_easing_duration (uint msecs);
++		[Version (since = "1.10")]
++		public void set_easing_mode (Clutter.AnimationMode mode);
++		[Version (since = "0.8")]
++		public void set_fixed_position_set (bool is_set);
++		[Version (since = "1.0")]
++		public void set_flags (Clutter.ActorFlags flags);
++		[Version (since = "0.2")]
++		public void set_height (float height);
++		[Version (since = "1.10")]
++		public void set_layout_manager (Clutter.LayoutManager? manager);
++		[Version (since = "1.10")]
++		public void set_margin (Clutter.Margin margin);
++		[Version (since = "1.10")]
++		public void set_margin_bottom (float margin);
++		[Version (since = "1.10")]
++		public void set_margin_left (float margin);
++		[Version (since = "1.10")]
++		public void set_margin_right (float margin);
++		[Version (since = "1.10")]
++		public void set_margin_top (float margin);
++		public void set_name (string name);
++		[Version (since = "1.8")]
++		public void set_offscreen_redirect (Clutter.OffscreenRedirect redirect);
++		public void set_opacity (uint8 opacity);
++		public void set_opacity_override (int opacity);
++		[Version (since = "1.12")]
++		public void set_pivot_point (float pivot_x, float pivot_y);
++		[Version (since = "1.12")]
++		public void set_pivot_point_z (float pivot_z);
++		public void set_position (float x, float y);
++		[Version (since = "0.6")]
++		public void set_reactive (bool reactive);
++		[Version (since = "1.2")]
++		public void set_request_mode (Clutter.RequestMode mode);
++		[Version (since = "1.12")]
++		public void set_rotation_angle (Clutter.RotateAxis axis, double angle);
++		[Version (since = "0.2")]
++		public void set_scale (double scale_x, double scale_y);
++		[Version (since = "1.12")]
++		public void set_scale_z (double scale_z);
++		public void set_size (float width, float height);
++		[Version (since = "1.2")]
++		public void set_text_direction (Clutter.TextDirection text_dir);
++		[Version (since = "1.12")]
++		public void set_transform (Graphene.Matrix? transform);
++		[Version (since = "1.12")]
++		public void set_translation (float translate_x, float translate_y, float translate_z);
++		[Version (since = "0.2")]
++		public void set_width (float width);
++		[Version (since = "0.6")]
++		public void set_x (float x);
++		[Version (since = "1.10")]
++		public void set_x_align (Clutter.ActorAlign x_align);
++		[Version (since = "1.12")]
++		public void set_x_expand (bool expand);
++		[Version (since = "0.6")]
++		public void set_y (float y);
++		[Version (since = "1.10")]
++		public void set_y_align (Clutter.ActorAlign y_align);
++		[Version (since = "1.12")]
++		public void set_y_expand (bool expand);
++		[Version (since = "1.12")]
++		public void set_z_position (float z_position);
++		public bool should_pick (Clutter.PickContext pick_context);
++		[Version (since = "0.6")]
++		public bool transform_stage_point (float x, float y, out float x_out, out float y_out);
++		public void uninhibit_culling ();
++		[Version (since = "1.0")]
++		public virtual void unmap ();
++		[Version (since = "1.0")]
++		public void unset_flags (Clutter.ActorFlags flags);
++		[NoAccessorMethod]
++		[Version (since = "1.4")]
++		public Clutter.Action actions { set; }
++		[NoAccessorMethod]
++		[Version (since = "0.8")]
++		public Clutter.ActorBox allocation { owned get; }
++		[Version (since = "1.10")]
++		public Clutter.Color background_color { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "1.10")]
++		public bool background_color_set { get; }
++		[Version (since = "1.12")]
++		public Graphene.Matrix child_transform { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "1.12")]
++		public bool child_transform_set { get; }
++		[NoAccessorMethod]
++		[Version (since = "1.12")]
++		public Graphene.Rect clip_rect { owned get; set; }
++		[Version (since = "1.0")]
++		public bool clip_to_allocation { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "1.4")]
++		public Clutter.Constraint constraints { set; }
++		[Version (since = "1.10")]
++		public Clutter.Content content { get; set; }
++		[Version (since = "1.10")]
++		public Clutter.ActorBox content_box { get; }
++		[Version (since = "1.10")]
++		public Clutter.ContentGravity content_gravity { get; set; }
++		[Version (since = "1.12")]
++		public Clutter.ContentRepeat content_repeat { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "1.4")]
++		public Clutter.Effect effect { set; }
++		[Version (since = "1.10")]
++		public Clutter.Actor first_child { get; }
++		[Version (since = "0.8")]
++		public bool fixed_position_set { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "0.8")]
++		public float fixed_x { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "0.8")]
++		public float fixed_y { get; set; }
++		[NoAccessorMethod]
++		public bool has_clip { get; }
++		[NoAccessorMethod]
++		[Version (since = "1.2")]
++		public bool has_pointer { get; }
++		public float height { get; set; }
++		[Version (since = "1.10")]
++		public Clutter.Actor last_child { get; }
++		[Version (since = "1.10")]
++		public Clutter.LayoutManager layout_manager { get; set; }
++		[NoAccessorMethod]
++		public Clutter.ScalingFilter magnification_filter { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "1.0")]
++		public bool mapped { get; }
++		[Version (since = "1.10")]
++		public float margin_bottom { get; set; }
++		[Version (since = "1.10")]
++		public float margin_left { get; set; }
++		[Version (since = "1.10")]
++		public float margin_right { get; set; }
++		[Version (since = "1.10")]
++		public float margin_top { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "0.8")]
++		public float min_height { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "0.8")]
++		public bool min_height_set { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "0.8")]
++		public float min_width { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "0.8")]
++		public bool min_width_set { get; set; }
++		[NoAccessorMethod]
++		public Clutter.ScalingFilter minification_filter { get; set; }
++		[Version (since = "0.2")]
++		public string name { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "0.8")]
++		public float natural_height { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "0.8")]
++		public bool natural_height_set { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "0.8")]
++		public float natural_width { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "0.8")]
++		public bool natural_width_set { get; set; }
++		[Version (since = "1.8")]
++		public Clutter.OffscreenRedirect offscreen_redirect { get; set; }
++		public uint opacity { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "1.12")]
++		public Graphene.Point pivot_point { owned get; set; }
++		[Version (since = "1.12")]
++		public float pivot_point_z { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "1.12")]
++		public Graphene.Point position { owned get; set; }
++		[Version (since = "0.6")]
++		public bool reactive { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "1.0")]
++		public bool realized { get; }
++		[Version (since = "0.8")]
++		public Clutter.RequestMode request_mode { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "0.6")]
++		public double rotation_angle_x { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "0.6")]
++		public double rotation_angle_y { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "0.6")]
++		public double rotation_angle_z { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "0.6")]
++		public double scale_x { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "0.6")]
++		public double scale_y { get; set; }
++		[Version (since = "1.12")]
++		public double scale_z { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "0.8")]
++		public bool show_on_set_parent { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "1.12")]
++		public Graphene.Size size { owned get; set; }
++		[Version (since = "1.0")]
++		public Clutter.TextDirection text_direction { get; set; }
++		[Version (since = "1.12")]
++		public Graphene.Matrix transform { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "1.12")]
++		public bool transform_set { get; }
++		[NoAccessorMethod]
++		[Version (since = "1.12")]
++		public float translation_x { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "1.12")]
++		public float translation_y { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "1.12")]
++		public float translation_z { get; set; }
++		[NoAccessorMethod]
++		public bool visible { get; set; }
++		public float width { get; set; }
++		public float x { get; set; }
++		[Version (since = "1.10")]
++		public Clutter.ActorAlign x_align { get; set; }
++		[Version (since = "1.12")]
++		public bool x_expand { get; set; }
++		public float y { get; set; }
++		[Version (since = "1.10")]
++		public Clutter.ActorAlign y_align { get; set; }
++		[Version (since = "1.12")]
++		public bool y_expand { get; set; }
++		[Version (since = "1.12")]
++		public float z_position { get; set; }
++		[Version (since = "0.6")]
++		public virtual signal bool button_press_event (Clutter.ButtonEvent event);
++		[Version (since = "0.6")]
++		public virtual signal bool button_release_event (Clutter.ButtonEvent event);
++		[Version (since = "0.6")]
++		public virtual signal bool captured_event (Clutter.Event event);
++		[HasEmitter]
++		[Version (since = "0.2")]
++		public virtual signal void destroy ();
++		[Version (since = "0.6")]
++		public virtual signal bool enter_event (Clutter.CrossingEvent event);
++		[Version (since = "0.6")]
++		public virtual signal bool event (Clutter.Event event);
++		[HasEmitter]
++		[Version (since = "0.2")]
++		public virtual signal void hide ();
++		[Version (since = "0.6")]
++		public virtual signal void key_focus_in ();
++		[Version (since = "0.6")]
++		public virtual signal void key_focus_out ();
++		[Version (since = "0.6")]
++		public virtual signal bool key_press_event (Clutter.KeyEvent event);
++		[Version (since = "0.6")]
++		public virtual signal bool key_release_event (Clutter.KeyEvent event);
++		[Version (since = "0.6")]
++		public virtual signal bool leave_event (Clutter.CrossingEvent event);
++		[Version (since = "0.6")]
++		public virtual signal bool motion_event (Clutter.MotionEvent event);
++		[Version (since = "0.2")]
++		public virtual signal void parent_set (Clutter.Actor? old_parent);
++		[HasEmitter]
++		[Version (since = "1.0")]
++		public virtual signal void pick (Clutter.PickContext pick_context);
++		[HasEmitter]
++		[Version (since = "1.2")]
++		public virtual signal void queue_relayout ();
++		[HasEmitter]
++		[Version (deprecated = true, deprecated_since = "1.16", since = "0.8")]
++		public virtual signal void realize ();
++		public virtual signal void resource_scale_changed ();
++		[Version (since = "0.6")]
++		public virtual signal bool scroll_event (Clutter.ScrollEvent event);
++		[HasEmitter]
++		[Version (since = "0.2")]
++		public virtual signal void show ();
++		public signal void stage_views_changed ();
++		[Version (since = "1.12")]
++		public virtual signal bool touch_event (Clutter.Event event);
++		[Version (since = "1.12")]
++		public signal void transition_stopped (string name, bool is_finished);
++		[Version (since = "1.10")]
++		public signal void transitions_completed ();
++		[HasEmitter]
++		[Version (deprecated = true, deprecated_since = "1.16", since = "0.8")]
++		public virtual signal void unrealize ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_actor_meta_get_type ()")]
++	public abstract class ActorMeta : GLib.InitiallyUnowned {
++		[CCode (has_construct_function = false)]
++		protected ActorMeta ();
++		[Version (since = "1.4")]
++		public unowned Clutter.Actor get_actor ();
++		[Version (since = "1.4")]
++		public bool get_enabled ();
++		[Version (since = "1.4")]
++		public unowned string get_name ();
++		[NoWrapper]
++		public virtual void set_actor (Clutter.Actor? actor);
++		[Version (since = "1.4")]
++		public virtual void set_enabled (bool is_enabled);
++		[Version (since = "1.4")]
++		public void set_name (string name);
++		[Version (since = "1.4")]
++		public Clutter.Actor actor { get; }
++		[Version (since = "1.4")]
++		public bool enabled { get; set; }
++		[Version (since = "1.4")]
++		public string name { get; set; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_actor_node_get_type ()")]
++	public class ActorNode : Clutter.PaintNode {
++		[CCode (has_construct_function = false, type = "ClutterPaintNode*")]
++		public ActorNode (Clutter.Actor actor, int opacity);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_align_constraint_get_type ()")]
++	[Version (since = "1.4")]
++	public class AlignConstraint : Clutter.Constraint {
++		[CCode (has_construct_function = false, type = "ClutterConstraint*")]
++		public AlignConstraint (Clutter.Actor? source, Clutter.AlignAxis axis, float factor);
++		public Clutter.AlignAxis get_align_axis ();
++		public float get_factor ();
++		public Graphene.Point get_pivot_point ();
++		public unowned Clutter.Actor get_source ();
++		public void set_align_axis (Clutter.AlignAxis axis);
++		public void set_factor (float factor);
++		public void set_pivot_point (Graphene.Point pivot_point);
++		public void set_source (Clutter.Actor? source);
++		public Clutter.AlignAxis align_axis { get; set construct; }
++		public float factor { get; set construct; }
++		public Graphene.Point pivot_point { get; set; }
++		public Clutter.Actor source { get; set construct; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	[Version (since = "0.2")]
++	public class AnyEvent : Clutter.Event {
++		public Clutter.EventFlags flags;
++		public weak Clutter.Actor source;
++		public weak Clutter.Stage stage;
++		public uint32 time;
++		public Clutter.EventType type;
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_backend_get_type ()")]
++	[Version (since = "0.4")]
++	public abstract class Backend : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected Backend ();
++		[Version (since = "1.8")]
++		public unowned Cogl.Context get_cogl_context ();
++		public unowned Clutter.Seat get_default_seat ();
++		[Version (since = "0.8")]
++		public unowned Cairo.FontOptions get_font_options ();
++		public unowned Clutter.InputMethod get_input_method ();
++		public double get_resolution ();
++		[Version (since = "0.8")]
++		public void set_font_options (Cairo.FontOptions options);
++		public void set_input_method (Clutter.InputMethod method);
++		[Version (since = "1.0")]
++		public signal void font_changed ();
++		[Version (since = "1.0")]
++		public signal void resolution_changed ();
++		[Version (since = "1.4")]
++		public signal void settings_changed ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_bin_layout_get_type ()")]
++	[Version (since = "1.2")]
++	public class BinLayout : Clutter.LayoutManager {
++		[CCode (has_construct_function = false, type = "ClutterLayoutManager*")]
++		public BinLayout (Clutter.BinAlignment x_align = Clutter.BinAlignment.START, Clutter.BinAlignment y_align = Clutter.BinAlignment.START);
++		[NoAccessorMethod]
++		[Version (deprecated = true, deprecated_since = "1.12", since = "1.2")]
++		public Clutter.BinAlignment x_align { get; set; }
++		[NoAccessorMethod]
++		[Version (deprecated = true, deprecated_since = "1.12", since = "1.2")]
++		public Clutter.BinAlignment y_align { get; set; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_bind_constraint_get_type ()")]
++	[Version (since = "1.4")]
++	public class BindConstraint : Clutter.Constraint {
++		[CCode (has_construct_function = false, type = "ClutterConstraint*")]
++		public BindConstraint (Clutter.Actor? source, Clutter.BindCoordinate coordinate, float offset);
++		public Clutter.BindCoordinate get_coordinate ();
++		public float get_offset ();
++		public unowned Clutter.Actor get_source ();
++		public void set_coordinate (Clutter.BindCoordinate coordinate);
++		public void set_offset (float offset);
++		public void set_source (Clutter.Actor? source);
++		public Clutter.BindCoordinate coordinate { get; set construct; }
++		public float offset { get; set construct; }
++		public Clutter.Actor source { get; set construct; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_binding_pool_get_type ()")]
++	[Version (since = "1.0")]
++	public class BindingPool : GLib.Object {
++		[CCode (has_construct_function = false)]
++		public BindingPool (string name);
++		public bool activate (uint key_val, Clutter.ModifierType modifiers, GLib.Object gobject);
++		public void block_action (string action_name);
++		public static unowned Clutter.BindingPool find (string name);
++		public unowned string find_action (uint key_val, Clutter.ModifierType modifiers);
++		public static unowned Clutter.BindingPool get_for_class (void* klass);
++		public void install_action (string action_name, uint key_val, Clutter.ModifierType modifiers, owned Clutter.BindingActionFunc callback);
++		public void install_closure (string action_name, uint key_val, Clutter.ModifierType modifiers, GLib.Closure closure);
++		public void override_action (uint key_val, Clutter.ModifierType modifiers, owned GLib.Callback callback);
++		public void override_closure (uint key_val, Clutter.ModifierType modifiers, GLib.Closure closure);
++		public void remove_action (uint key_val, Clutter.ModifierType modifiers);
++		public void unblock_action (string action_name);
++		[NoAccessorMethod]
++		public string name { owned get; construct; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_blit_node_get_type ()")]
++	public class BlitNode : Clutter.PaintNode {
++		[CCode (has_construct_function = false, type = "ClutterPaintNode*")]
++		public BlitNode (Cogl.Framebuffer src);
++		public void add_blit_rectangle (int src_x, int src_y, int dst_x, int dst_y, int width, int height);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_blur_effect_get_type ()")]
++	[Version (since = "1.4")]
++	public class BlurEffect : Clutter.OffscreenEffect {
++		[CCode (has_construct_function = false, type = "ClutterEffect*")]
++		public BlurEffect ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_blur_node_get_type ()")]
++	public class BlurNode : Clutter.LayerNode {
++		[CCode (has_construct_function = false, type = "ClutterPaintNode*")]
++		public BlurNode (uint width, uint height, float sigma);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_box_layout_get_type ()")]
++	[Version (since = "1.2")]
++	public class BoxLayout : Clutter.LayoutManager {
++		[CCode (has_construct_function = false, type = "ClutterLayoutManager*")]
++		public BoxLayout ();
++		[Version (since = "1.4")]
++		public bool get_homogeneous ();
++		[Version (since = "1.12")]
++		public Clutter.Orientation get_orientation ();
++		public bool get_pack_start ();
++		public uint get_spacing ();
++		[Version (since = "1.4")]
++		public void set_homogeneous (bool homogeneous);
++		[Version (since = "1.12")]
++		public void set_orientation (Clutter.Orientation orientation);
++		public void set_pack_start (bool pack_start);
++		public void set_spacing (uint spacing);
++		[Version (since = "1.4")]
++		public bool homogeneous { get; set; }
++		[Version (since = "1.12")]
++		public Clutter.Orientation orientation { get; set; }
++		public bool pack_start { get; set; }
++		public uint spacing { get; set; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_brightness_contrast_effect_get_type ()")]
++	[Version (since = "1.10")]
++	public class BrightnessContrastEffect : Clutter.OffscreenEffect {
++		[CCode (has_construct_function = false, type = "ClutterEffect*")]
++		public BrightnessContrastEffect ();
++		public void get_brightness (out float red, out float green, out float blue);
++		public void get_contrast (out float red, out float green, out float blue);
++		public void set_brightness (float brightness);
++		public void set_brightness_full (float red, float green, float blue);
++		public void set_contrast (float contrast);
++		public void set_contrast_full (float red, float green, float blue);
++		[NoAccessorMethod]
++		public Clutter.Color brightness { owned get; set; }
++		[NoAccessorMethod]
++		public Clutter.Color contrast { owned get; set; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	[Version (since = "0.2")]
++	public class ButtonEvent : Clutter.Event {
++		public double axes;
++		public uint32 button;
++		public uint click_count;
++		public weak Clutter.InputDevice device;
++		public uint32 evdev_code;
++		public Clutter.EventFlags flags;
++		public Clutter.ModifierType modifier_state;
++		public weak Clutter.Actor source;
++		public weak Clutter.Stage stage;
++		public uint32 time;
++		public Clutter.EventType type;
++		public float x;
++		public float y;
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_canvas_get_type ()")]
++	[Version (since = "1.10")]
++	public class Canvas : GLib.Object, Clutter.Content {
++		[CCode (has_construct_function = false, type = "ClutterContent*")]
++		public Canvas ();
++		public float get_scale_factor ();
++		public void set_scale_factor (float scale);
++		public bool set_size (int width, int height);
++		[NoAccessorMethod]
++		public int height { get; set; }
++		public float scale_factor { get; set; }
++		[NoAccessorMethod]
++		public int width { get; set; }
++		public virtual signal bool draw (Cairo.Context cr, int width, int height);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_child_meta_get_type ()")]
++	[Version (since = "0.8")]
++	public abstract class ChildMeta : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected ChildMeta ();
++		public unowned Clutter.Actor get_actor ();
++		public unowned Clutter.Container get_container ();
++		public Clutter.Actor actor { get; construct; }
++		public Clutter.Container container { get; construct; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_click_action_get_type ()")]
++	public class ClickAction : Clutter.Action {
++		[CCode (has_construct_function = false, type = "ClutterAction*")]
++		[Version (since = "1.4")]
++		public ClickAction ();
++		[Version (since = "1.4")]
++		public uint get_button ();
++		[Version (since = "1.8")]
++		public void get_coords (out float press_x, out float press_y);
++		[Version (since = "1.6")]
++		public Clutter.ModifierType get_state ();
++		[Version (since = "1.4")]
++		public void release ();
++		[NoAccessorMethod]
++		[Version (since = "1.4")]
++		public bool held { get; }
++		[NoAccessorMethod]
++		[Version (since = "1.8")]
++		public int long_press_duration { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "1.8")]
++		public int long_press_threshold { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "1.4")]
++		public bool pressed { get; }
++		[Version (since = "1.4")]
++		public virtual signal void clicked (Clutter.Actor actor);
++		[Version (since = "1.8")]
++		public virtual signal bool long_press (Clutter.Actor actor, Clutter.LongPressState state);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_clip_node_get_type ()")]
++	[Version (since = "1.10")]
++	public class ClipNode : Clutter.PaintNode {
++		[CCode (has_construct_function = false, type = "ClutterPaintNode*")]
++		public ClipNode ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_clone_get_type ()")]
++	[Version (since = "1.0")]
++	public class Clone : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
++		[CCode (has_construct_function = false, type = "ClutterActor*")]
++		public Clone (Clutter.Actor source);
++		public unowned Clutter.Actor get_source ();
++		public void set_source (Clutter.Actor? source);
++		public Clutter.Actor source { get; set construct; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_color_node_get_type ()")]
++	[Version (since = "1.10")]
++	public class ColorNode : Clutter.PipelineNode {
++		[CCode (has_construct_function = false, type = "ClutterPaintNode*")]
++		public ColorNode (Clutter.Color? color);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_colorize_effect_get_type ()")]
++	[Version (since = "1.4")]
++	public class ColorizeEffect : Clutter.OffscreenEffect {
++		[CCode (has_construct_function = false, type = "ClutterEffect*")]
++		public ColorizeEffect (Clutter.Color tint);
++		public Clutter.Color get_tint ();
++		public void set_tint (Clutter.Color tint);
++		public Clutter.Color tint { get; set; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_constraint_get_type ()")]
++	[Version (since = "1.4")]
++	public abstract class Constraint : Clutter.ActorMeta {
++		[CCode (has_construct_function = false)]
++		protected Constraint ();
++		[NoWrapper]
++		public virtual void update_allocation (Clutter.Actor actor, Clutter.ActorBox allocation);
++		public virtual void update_preferred_size (Clutter.Actor actor, Clutter.Orientation direction, float for_size, ref float minimum_size, ref float natural_size);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	[Version (since = "0.2")]
++	public class CrossingEvent : Clutter.Event {
++		public weak Clutter.InputDevice device;
++		public Clutter.EventFlags flags;
++		public weak Clutter.Actor related;
++		public weak Clutter.EventSequence sequence;
++		public weak Clutter.Actor source;
++		public weak Clutter.Stage stage;
++		public uint32 time;
++		public Clutter.EventType type;
++		public float x;
++		public float y;
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_deform_effect_get_type ()")]
++	[Version (since = "1.4")]
++	public abstract class DeformEffect : Clutter.OffscreenEffect {
++		[CCode (has_construct_function = false)]
++		protected DeformEffect ();
++		[NoWrapper]
++		public virtual void deform_vertex (float width, float height, Cogl.TextureVertex vertex);
++		public unowned Cogl.Handle get_back_material ();
++		public void get_n_tiles (out uint x_tiles, out uint y_tiles);
++		public void invalidate ();
++		public void set_back_material (Cogl.Handle? material);
++		public void set_n_tiles (uint x_tiles, uint y_tiles);
++		[NoAccessorMethod]
++		public uint x_tiles { get; set; }
++		[NoAccessorMethod]
++		public uint y_tiles { get; set; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_desaturate_effect_get_type ()")]
++	[Version (since = "1.4")]
++	public class DesaturateEffect : Clutter.OffscreenEffect {
++		[CCode (has_construct_function = false, type = "ClutterEffect*")]
++		public DesaturateEffect (double factor);
++		public double get_factor ();
++		public void set_factor (double factor);
++		public double factor { get; set; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	public class DeviceEvent : Clutter.Event {
++		public weak Clutter.InputDevice device;
++		public Clutter.EventFlags flags;
++		public weak Clutter.Actor source;
++		public weak Clutter.Stage stage;
++		public uint32 time;
++		public Clutter.EventType type;
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_effect_get_type ()")]
++	[Version (since = "1.4")]
++	public abstract class Effect : Clutter.ActorMeta {
++		[CCode (has_construct_function = false)]
++		protected Effect ();
++		[NoWrapper]
++		public virtual bool modify_paint_volume (Clutter.PaintVolume volume);
++		[NoWrapper]
++		public virtual void paint (Clutter.PaintNode node, Clutter.PaintContext paint_context, Clutter.EffectPaintFlags flags);
++		[NoWrapper]
++		public virtual void paint_node (Clutter.PaintNode node, Clutter.PaintContext paint_context, Clutter.EffectPaintFlags flags);
++		[NoWrapper]
++		public virtual void pick (Clutter.PickContext pick_context);
++		[NoWrapper]
++		public virtual void post_paint (Clutter.PaintNode node, Clutter.PaintContext paint_context);
++		[NoWrapper]
++		public virtual bool pre_paint (Clutter.PaintNode node, Clutter.PaintContext paint_context);
++		[Version (since = "1.8")]
++		public void queue_repaint ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_event_get_type ()")]
++	[Compact]
++	[Version (since = "0.2")]
++	public class Event {
++		public Clutter.EventType type;
++		[CCode (has_construct_function = false)]
++		public Event (Clutter.EventType type);
++		[Version (since = "1.18")]
++		public static uint add_filter (Clutter.Stage? stage, [CCode (delegate_target_pos = 2.2, destroy_notify_pos = 2.1)] owned Clutter.EventFilterFunc func);
++		public Clutter.Event copy ();
++		public void free ();
++		[Version (since = "0.4")]
++		public static Clutter.Event @get ();
++		[Version (since = "1.12")]
++		public double get_angle (Clutter.Event target);
++		[Version (since = "1.6")]
++		public double get_axes (out uint n_axes);
++		[Version (since = "1.0")]
++		public uint32 get_button ();
++		[Version (since = "1.0")]
++		public uint get_click_count ();
++		[Version (since = "0.4")]
++		public void get_coords (out float x, out float y);
++		[Version (since = "1.0")]
++		public unowned Clutter.InputDevice get_device ();
++		[Version (since = "1.28")]
++		public unowned Clutter.InputDeviceTool get_device_tool ();
++		[Version (since = "1.0")]
++		public Clutter.InputDeviceType get_device_type ();
++		[Version (since = "1.12")]
++		public float get_distance (Clutter.Event target);
++		public uint32 get_event_code ();
++		[Version (since = "1.10")]
++		public unowned Clutter.EventSequence get_event_sequence ();
++		[Version (since = "1.0")]
++		public Clutter.EventFlags get_flags ();
++		[Version (since = "1.24")]
++		public void get_gesture_motion_delta (out double dx, out double dy);
++		public Clutter.TouchpadGesturePhase get_gesture_phase ();
++		[Version (since = "1.24")]
++		public double get_gesture_pinch_angle_delta ();
++		[Version (since = "1.24")]
++		public double get_gesture_pinch_scale ();
++		[Version (since = "1.0")]
++		public uint16 get_key_code ();
++		[Version (since = "1.0")]
++		public uint get_key_symbol ();
++		public unichar get_key_unicode ();
++		public uint get_mode_group ();
++		public bool get_pad_event_details (out uint number, out uint mode, out double value);
++		[Version (since = "1.12")]
++		public Graphene.Point get_position ();
++		[Version (since = "1.0")]
++		public unowned Clutter.Actor get_related ();
++		public bool get_relative_motion (double dx, double dy, double dx_unaccel, double dy_unaccel);
++		[Version (since = "1.10")]
++		public void get_scroll_delta (out double dx, out double dy);
++		[Version (since = "1.0")]
++		public Clutter.ScrollDirection get_scroll_direction ();
++		[Version (since = "1.26")]
++		public Clutter.ScrollFinishFlags get_scroll_finish_flags ();
++		[Version (since = "1.26")]
++		public Clutter.ScrollSource get_scroll_source ();
++		[Version (since = "0.6")]
++		public unowned Clutter.Actor get_source ();
++		[Version (since = "1.6")]
++		public unowned Clutter.InputDevice get_source_device ();
++		[Version (since = "0.8")]
++		public unowned Clutter.Stage get_stage ();
++		[Version (since = "0.4")]
++		public Clutter.ModifierType get_state ();
++		[Version (since = "1.16")]
++		public void get_state_full (out Clutter.ModifierType button_state, out Clutter.ModifierType base_state, out Clutter.ModifierType latched_state, out Clutter.ModifierType locked_state, out Clutter.ModifierType effective_state);
++		[Version (since = "0.4")]
++		public uint32 get_time ();
++		public int64 get_time_us ();
++		[Version (since = "1.24")]
++		public uint get_touchpad_gesture_finger_count ();
++		[CCode (cname = "clutter_event_type")]
++		public Clutter.EventType get_type ();
++		[Version (since = "1.12")]
++		public bool has_control_modifier ();
++		[Version (since = "1.12")]
++		public bool has_shift_modifier ();
++		[Version (since = "1.12")]
++		public bool is_pointer_emulated ();
++		[Version (since = "0.6")]
++		public void put ();
++		[Version (since = "1.18")]
++		public static void remove_filter (uint id);
++		[Version (since = "1.8")]
++		public void set_button (uint32 button);
++		[Version (since = "1.8")]
++		public void set_coords (float x, float y);
++		[Version (since = "1.6")]
++		public void set_device (Clutter.InputDevice? device);
++		[Version (since = "1.28")]
++		public void set_device_tool (Clutter.InputDeviceTool? tool);
++		[Version (since = "1.8")]
++		public void set_flags (Clutter.EventFlags flags);
++		[Version (since = "1.8")]
++		public void set_key_code (uint16 key_code);
++		[Version (since = "1.8")]
++		public void set_key_symbol (uint key_sym);
++		[Version (since = "1.8")]
++		public void set_key_unicode (unichar key_unicode);
++		[Version (since = "1.8")]
++		public void set_related (Clutter.Actor? actor);
++		[Version (since = "1.10")]
++		public void set_scroll_delta (double dx, double dy);
++		[Version (since = "1.8")]
++		public void set_scroll_direction (Clutter.ScrollDirection direction);
++		[Version (since = "1.8")]
++		public void set_source (Clutter.Actor? actor);
++		[Version (since = "1.8")]
++		public void set_source_device (Clutter.InputDevice? device);
++		[Version (since = "1.8")]
++		public void set_stage (Clutter.Stage? stage);
++		[Version (since = "1.8")]
++		public void set_state (Clutter.ModifierType state);
++		[Version (since = "1.8")]
++		public void set_time (uint32 time_);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_event_sequence_get_type ()")]
++	[Compact]
++	[Version (since = "1.12")]
++	public class EventSequence {
++		public int32 get_slot ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_fixed_layout_get_type ()")]
++	[Version (since = "1.2")]
++	public class FixedLayout : Clutter.LayoutManager {
++		[CCode (has_construct_function = false, type = "ClutterLayoutManager*")]
++		public FixedLayout ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_flow_layout_get_type ()")]
++	[Version (since = "1.2")]
++	public class FlowLayout : Clutter.LayoutManager {
++		[CCode (has_construct_function = false, type = "ClutterLayoutManager*")]
++		public FlowLayout (Clutter.FlowOrientation orientation);
++		public float get_column_spacing ();
++		public void get_column_width (out float min_width, out float max_width);
++		public bool get_homogeneous ();
++		public Clutter.FlowOrientation get_orientation ();
++		public void get_row_height (out float min_height, out float max_height);
++		public float get_row_spacing ();
++		[Version (since = "1.16")]
++		public bool get_snap_to_grid ();
++		public void set_column_spacing (float spacing);
++		public void set_column_width (float min_width, float max_width);
++		public void set_homogeneous (bool homogeneous);
++		public void set_orientation (Clutter.FlowOrientation orientation);
++		public void set_row_height (float min_height, float max_height);
++		public void set_row_spacing (float spacing);
++		[Version (since = "1.16")]
++		public void set_snap_to_grid (bool snap_to_grid);
++		public float column_spacing { get; set; }
++		public bool homogeneous { get; set; }
++		[NoAccessorMethod]
++		public float max_column_width { get; set; }
++		[NoAccessorMethod]
++		public float max_row_height { get; set; }
++		[NoAccessorMethod]
++		public float min_column_width { get; set; }
++		[NoAccessorMethod]
++		public float min_row_height { get; set; }
++		public Clutter.FlowOrientation orientation { get; set construct; }
++		public float row_spacing { get; set; }
++		[Version (since = "1.16")]
++		public bool snap_to_grid { get; set; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	public class Frame {
++		public bool has_result ();
++		public void set_result (Clutter.FrameResult result);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_frame_clock_get_type ()")]
++	public class FrameClock : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected FrameClock ();
++		public void add_timeline (Clutter.Timeline timeline);
++		public float get_refresh_rate ();
++		public void inhibit ();
++		public void notify_ready ();
++		public void remove_timeline (Clutter.Timeline timeline);
++		public void schedule_update ();
++		public void schedule_update_now ();
++		public void uninhibit ();
++		[HasEmitter]
++		public signal void destroy ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_gesture_action_get_type ()")]
++	public class GestureAction : Clutter.Action {
++		[CCode (has_construct_function = false, type = "ClutterAction*")]
++		[Version (since = "1.8")]
++		public GestureAction ();
++		[Version (since = "1.12")]
++		public void cancel ();
++		[NoWrapper]
++		public virtual bool gesture_prepare (Clutter.Actor actor);
++		[Version (since = "1.12")]
++		public unowned Clutter.InputDevice get_device (uint point);
++		[Version (since = "1.14")]
++		public unowned Clutter.Event get_last_event (uint point);
++		[Version (since = "1.8")]
++		public void get_motion_coords (uint point, out float motion_x, out float motion_y);
++		[Version (since = "1.12")]
++		public float get_motion_delta (uint point, out float delta_x, out float delta_y);
++		[Version (since = "1.12")]
++		public uint get_n_current_points ();
++		[Version (since = "1.12")]
++		public int get_n_touch_points ();
++		[Version (since = "1.8")]
++		public void get_press_coords (uint point, out float press_x, out float press_y);
++		[Version (since = "1.8")]
++		public void get_release_coords (uint point, out float release_x, out float release_y);
++		[Version (since = "1.12")]
++		public unowned Clutter.EventSequence get_sequence (uint point);
++		[Version (since = "1.18")]
++		public void get_threshold_trigger_distance (out float x, out float y);
++		[Version (since = "1.20")]
++		public Clutter.GestureTriggerEdge get_threshold_trigger_edge ();
++		[Version (deprecated = true, deprecated_since = "1.20", since = "1.18")]
++		public Clutter.GestureTriggerEdge get_threshold_trigger_egde ();
++		[Version (since = "1.12")]
++		public float get_velocity (uint point, out float velocity_x, out float velocity_y);
++		[Version (since = "1.12")]
++		public void set_n_touch_points (int nb_points);
++		[Version (since = "1.18")]
++		public void set_threshold_trigger_distance (float x, float y);
++		[Version (since = "1.18")]
++		public void set_threshold_trigger_edge (Clutter.GestureTriggerEdge edge);
++		[Version (since = "1.16")]
++		public int n_touch_points { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "1.18")]
++		public float threshold_trigger_distance_x { get; construct; }
++		[NoAccessorMethod]
++		[Version (since = "1.18")]
++		public float threshold_trigger_distance_y { get; construct; }
++		[Version (since = "1.18")]
++		public Clutter.GestureTriggerEdge threshold_trigger_edge { get; construct; }
++		[Version (since = "1.8")]
++		public virtual signal bool gesture_begin (Clutter.Actor actor);
++		[Version (since = "1.8")]
++		public virtual signal void gesture_cancel (Clutter.Actor actor);
++		[Version (since = "1.8")]
++		public virtual signal void gesture_end (Clutter.Actor actor);
++		[Version (since = "1.8")]
++		public virtual signal bool gesture_progress (Clutter.Actor actor);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_grid_layout_get_type ()")]
++	[Version (since = "1.12")]
++	public class GridLayout : Clutter.LayoutManager {
++		[CCode (has_construct_function = false, type = "ClutterLayoutManager*")]
++		public GridLayout ();
++		public void attach (Clutter.Actor child, int left, int top, int width, int height);
++		public void attach_next_to (Clutter.Actor child, Clutter.Actor? sibling, Clutter.GridPosition side, int width, int height);
++		public unowned Clutter.Actor get_child_at (int left, int top);
++		public bool get_column_homogeneous ();
++		public uint get_column_spacing ();
++		public Clutter.Orientation get_orientation ();
++		public bool get_row_homogeneous ();
++		public uint get_row_spacing ();
++		public void insert_column (int position);
++		public void insert_next_to (Clutter.Actor sibling, Clutter.GridPosition side);
++		public void insert_row (int position);
++		public void set_column_homogeneous (bool homogeneous);
++		public void set_column_spacing (uint spacing);
++		public void set_orientation (Clutter.Orientation orientation);
++		public void set_row_homogeneous (bool homogeneous);
++		public void set_row_spacing (uint spacing);
++		public bool column_homogeneous { get; set; }
++		public uint column_spacing { get; set; }
++		public Clutter.Orientation orientation { get; set; }
++		public bool row_homogeneous { get; set; }
++		public uint row_spacing { get; set; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	public class IMEvent : Clutter.Event {
++		public Clutter.EventFlags flags;
++		public uint32 len;
++		public int32 offset;
++		public weak Clutter.Actor source;
++		public weak Clutter.Stage stage;
++		public weak string text;
++		public uint32 time;
++		public Clutter.EventType type;
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_image_get_type ()")]
++	[Version (since = "1.10")]
++	public class Image : GLib.Object, Clutter.Content {
++		[CCode (has_construct_function = false, type = "ClutterContent*")]
++		public Image ();
++		public unowned Cogl.Texture get_texture ();
++		public bool set_area ([CCode (array_length = false)] uint8[] data, Cogl.PixelFormat pixel_format, Cairo.RectangleInt rect, uint row_stride) throws GLib.Error;
++		[Version (since = "1.12")]
++		public bool set_bytes (GLib.Bytes data, Cogl.PixelFormat pixel_format, uint width, uint height, uint row_stride) throws GLib.Error;
++		public bool set_data ([CCode (array_length = false)] uint8[] data, Cogl.PixelFormat pixel_format, uint width, uint height, uint row_stride) throws GLib.Error;
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_input_device_get_type ()")]
++	public class InputDevice : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected InputDevice ();
++		public Clutter.InputAxis get_axis (uint index_);
++		public bool get_axis_value (double axes, Clutter.InputAxis axis, double value);
++		[Version (since = "1.6")]
++		public Clutter.InputMode get_device_mode ();
++		[Version (since = "1.2")]
++		public unowned string get_device_name ();
++		public unowned string get_device_node ();
++		[Version (since = "1.0")]
++		public Clutter.InputDeviceType get_device_type ();
++		[Version (since = "1.10")]
++		public unowned Clutter.Actor get_grabbed_actor ();
++		public virtual int get_group_n_modes (int group);
++		[Version (since = "1.6")]
++		public bool get_has_cursor ();
++		public int get_mode_switch_button_group (uint button);
++		public uint get_n_axes ();
++		public int get_n_buttons ();
++		public int get_n_mode_groups ();
++		public int get_n_rings ();
++		public int get_n_strips ();
++		public virtual int get_pad_feature_group (Clutter.InputDevicePadFeature feature, int n_feature);
++		[Version (since = "1.22")]
++		public unowned string get_product_id ();
++		public unowned Clutter.Seat get_seat ();
++		[Version (since = "1.22")]
++		public unowned string get_vendor_id ();
++		[Version (since = "1.10")]
++		public void grab (Clutter.Actor actor);
++		public virtual bool is_grouped (Clutter.InputDevice other_device);
++		public virtual bool is_mode_switch_button (uint group, uint button);
++		[Version (since = "1.12")]
++		public unowned Clutter.Actor sequence_get_grabbed_actor (Clutter.EventSequence sequence);
++		[Version (since = "1.12")]
++		public void sequence_grab (Clutter.EventSequence sequence, Clutter.Actor actor);
++		[Version (since = "1.12")]
++		public void sequence_ungrab (Clutter.EventSequence sequence);
++		[Version (since = "1.10")]
++		public void ungrab ();
++		[NoAccessorMethod]
++		[Version (since = "1.6")]
++		public Clutter.Backend backend { owned get; construct; }
++		public Clutter.InputMode device_mode { get; construct; }
++		public string device_node { get; construct; }
++		[Version (since = "1.2")]
++		public Clutter.InputDeviceType device_type { get; construct; }
++		[Version (since = "1.6")]
++		public bool has_cursor { get; construct; }
++		public int n_buttons { get; construct; }
++		public int n_mode_groups { get; construct; }
++		public int n_rings { get; construct; }
++		public int n_strips { get; construct; }
++		[NoAccessorMethod]
++		[Version (since = "1.2")]
++		public string name { owned get; construct; }
++		[Version (since = "1.22")]
++		public string product_id { get; construct; }
++		public Clutter.Seat seat { get; construct; }
++		[Version (since = "1.22")]
++		public string vendor_id { get; construct; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_input_device_tool_get_type ()")]
++	public abstract class InputDeviceTool : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected InputDeviceTool ();
++		public Clutter.InputAxisFlags get_axes ();
++		public uint64 get_id ();
++		[Version (since = "1.28")]
++		public uint64 get_serial ();
++		[Version (since = "1.28")]
++		public Clutter.InputDeviceToolType get_tool_type ();
++		public Clutter.InputAxisFlags axes { get; construct; }
++		public uint64 id { get; construct; }
++		public uint64 serial { get; construct; }
++		[NoAccessorMethod]
++		public Clutter.InputDeviceToolType type { get; construct; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_input_focus_get_type ()")]
++	public abstract class InputFocus : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected InputFocus ();
++		[NoWrapper]
++		public virtual void commit_text (string text);
++		[NoWrapper]
++		public virtual void delete_surrounding (int offset, uint len);
++		public bool filter_event (Clutter.Event event);
++		[NoWrapper]
++		public virtual void focus_in (Clutter.InputMethod input_method);
++		[NoWrapper]
++		public virtual void focus_out ();
++		public bool is_focused ();
++		[NoWrapper]
++		public virtual void request_surrounding ();
++		public void reset ();
++		public void set_can_show_preedit (bool can_show_preedit);
++		public void set_content_hints (Clutter.InputContentHintFlags hint);
++		public void set_content_purpose (Clutter.InputContentPurpose purpose);
++		public void set_cursor_location (Graphene.Rect rect);
++		public void set_input_panel_state (Clutter.InputPanelState state);
++		[NoWrapper]
++		public virtual void set_preedit_text (string preedit, uint cursor);
++		public void set_surrounding (string text, uint cursor, uint anchor);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_input_method_get_type ()")]
++	public abstract class InputMethod : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected InputMethod ();
++		[NoWrapper]
++		public virtual bool filter_key_event (Clutter.Event key);
++		public virtual void focus_in (Clutter.InputFocus actor);
++		public virtual void focus_out ();
++		public void forward_key (uint32 keyval, uint32 keycode, uint32 state, uint64 time_, bool press);
++		public void notify_key_event (Clutter.Event event, bool filtered);
++		[NoWrapper]
++		public virtual void reset ();
++		[NoWrapper]
++		public virtual void set_cursor_location (Graphene.Rect rect);
++		public void set_input_panel_state (Clutter.InputPanelState state);
++		public void set_preedit_text (string? preedit, uint cursor);
++		[NoWrapper]
++		public virtual void set_surrounding (string text, uint cursor, uint anchor);
++		[NoWrapper]
++		public virtual void update_content_hints (Clutter.InputContentHintFlags hint);
++		[NoWrapper]
++		public virtual void update_content_purpose (Clutter.InputContentPurpose purpose);
++		[NoAccessorMethod]
++		public bool can_show_preedit { get; set; }
++		[NoAccessorMethod]
++		public Clutter.InputContentHintFlags content_hints { get; set; }
++		[NoAccessorMethod]
++		public Clutter.InputContentPurpose content_purpose { get; set; }
++		[HasEmitter]
++		public signal void commit (string text);
++		public signal void cursor_location_changed (Graphene.Rect object);
++		[HasEmitter]
++		public signal void delete_surrounding (int offset, uint len);
++		public signal void input_panel_state (Clutter.InputPanelState object);
++		[HasEmitter]
++		public signal void request_surrounding ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_interval_get_type ()")]
++	[Version (since = "1.0")]
++	public class Interval : GLib.InitiallyUnowned, Clutter.Scriptable {
++		[CCode (has_construct_function = false)]
++		public Interval (GLib.Type gtype, ...);
++		public Clutter.Interval clone ();
++		[Version (since = "1.4")]
++		public unowned GLib.Value? compute (double factor);
++		public virtual bool compute_value (double factor, out GLib.Value value);
++		public GLib.Value get_final_value ();
++		public GLib.Value get_initial_value ();
++		public void get_interval (...);
++		public GLib.Type get_value_type ();
++		[Version (since = "1.12")]
++		public bool is_valid ();
++		public unowned GLib.Value? peek_final_value ();
++		public unowned GLib.Value? peek_initial_value ();
++		public static void register_progress_func (GLib.Type value_type, Clutter.ProgressFunc func);
++		[Version (since = "1.10")]
++		public void set_final (...);
++		public void set_final_value (GLib.Value value);
++		[Version (since = "1.10")]
++		public void set_initial (...);
++		public void set_initial_value (GLib.Value value);
++		public void set_interval (...);
++		public virtual bool validate (GLib.ParamSpec pspec);
++		[CCode (has_construct_function = false)]
++		public Interval.with_values (GLib.Type gtype, GLib.Value? initial, GLib.Value? final);
++		[NoAccessorMethod]
++		[Version (since = "1.12")]
++		public GLib.Value final { owned get; set; }
++		[NoAccessorMethod]
++		[Version (since = "1.12")]
++		public GLib.Value initial { owned get; set; }
++		public GLib.Type value_type { get; construct; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	[Version (since = "0.2")]
++	public class KeyEvent : Clutter.Event {
++		public weak Clutter.InputDevice device;
++		public uint32 evdev_code;
++		public Clutter.EventFlags flags;
++		public uint16 hardware_keycode;
++		public uint keyval;
++		public Clutter.ModifierType modifier_state;
++		public weak Clutter.Actor source;
++		public weak Clutter.Stage stage;
++		public uint32 time;
++		public Clutter.EventType type;
++		public unichar unicode_value;
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_keyframe_transition_get_type ()")]
++	[Version (since = "1.12")]
++	public class KeyframeTransition : Clutter.PropertyTransition, Clutter.Scriptable {
++		[CCode (has_construct_function = false, type = "ClutterTransition*")]
++		public KeyframeTransition (string property_name);
++		public void clear ();
++		public void get_key_frame (uint index_, out double key, out Clutter.AnimationMode mode, out GLib.Value value);
++		public uint get_n_key_frames ();
++		public void set_key_frame (uint index_, double key, Clutter.AnimationMode mode, GLib.Value value);
++		public void set_key_frames ([CCode (array_length_cname = "n_key_frames", array_length_pos = 0.5, array_length_type = "guint")] double[] key_frames);
++		public void set_modes ([CCode (array_length_cname = "n_modes", array_length_pos = 0.5, array_length_type = "guint")] Clutter.AnimationMode[] modes);
++		public void set_values ([CCode (array_length_cname = "n_values", array_length_pos = 0.5, array_length_type = "guint")] GLib.Value[] values);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_keymap_get_type ()")]
++	public abstract class Keymap : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected Keymap ();
++		public virtual bool get_caps_lock_state ();
++		public virtual Pango.Direction get_direction ();
++		public virtual bool get_num_lock_state ();
++		public signal void state_changed ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_layer_node_get_type ()")]
++	public class LayerNode : Clutter.PaintNode {
++		[CCode (has_construct_function = false, type = "ClutterPaintNode*")]
++		public LayerNode (Graphene.Matrix projection, Cairo.Rectangle viewport, float width, float height, uint8 opacity);
++		[CCode (has_construct_function = false, type = "ClutterPaintNode*")]
++		public LayerNode.to_framebuffer (Cogl.Framebuffer framebuffer, Cogl.Pipeline pipeline);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_layout_manager_get_type ()")]
++	[Version (since = "1.2")]
++	public abstract class LayoutManager : GLib.InitiallyUnowned {
++		[CCode (has_construct_function = false)]
++		protected LayoutManager ();
++		public virtual void allocate (Clutter.Container container, Clutter.ActorBox allocation);
++		public void child_get (Clutter.Container container, Clutter.Actor actor, ...);
++		public void child_get_property (Clutter.Container container, Clutter.Actor actor, string property_name, GLib.Value value);
++		public void child_set (Clutter.Container container, Clutter.Actor actor, ...);
++		public void child_set_property (Clutter.Container container, Clutter.Actor actor, string property_name, GLib.Value value);
++		[NoWrapper]
++		public virtual unowned Clutter.LayoutMeta create_child_meta (Clutter.Container container, Clutter.Actor actor);
++		public unowned GLib.ParamSpec find_child_property (string name);
++		[Version (since = "1.0")]
++		public unowned Clutter.LayoutMeta get_child_meta (Clutter.Container container, Clutter.Actor actor);
++		[NoWrapper]
++		public virtual GLib.Type get_child_meta_type ();
++		public virtual void get_preferred_height (Clutter.Container container, float for_width, out float min_height_p, out float nat_height_p);
++		public virtual void get_preferred_width (Clutter.Container container, float for_height, out float min_width_p, out float nat_width_p);
++		[CCode (array_length_pos = 0.1, array_length_type = "guint")]
++		public GLib.ParamSpec[] list_child_properties ();
++		public virtual void set_container (Clutter.Container? container);
++		[HasEmitter]
++		public virtual signal void layout_changed ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_layout_meta_get_type ()")]
++	[Version (since = "1.2")]
++	public abstract class LayoutMeta : Clutter.ChildMeta {
++		[CCode (has_construct_function = false)]
++		protected LayoutMeta ();
++		public unowned Clutter.LayoutManager get_manager ();
++		public Clutter.LayoutManager manager { get; construct; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	[Version (since = "0.2")]
++	public class MotionEvent : Clutter.Event {
++		public double axes;
++		public weak Clutter.InputDevice device;
++		public double dx;
++		public double dx_unaccel;
++		public double dy;
++		public double dy_unaccel;
++		public Clutter.EventFlags flags;
++		public Clutter.ModifierType modifier_state;
++		public weak Clutter.Actor source;
++		public weak Clutter.Stage stage;
++		public uint32 time;
++		public int64 time_us;
++		public Clutter.EventType type;
++		public float x;
++		public float y;
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_offscreen_effect_get_type ()")]
++	[Version (since = "1.4")]
++	public abstract class OffscreenEffect : Clutter.Effect {
++		[CCode (has_construct_function = false)]
++		protected OffscreenEffect ();
++		public virtual Cogl.Handle create_texture (float width, float height);
++		public unowned Cogl.Pipeline? get_pipeline ();
++		[Version (since = "1.8")]
++		public bool get_target_size (out float width, out float height);
++		[Version (since = "1.10")]
++		public unowned Cogl.Handle get_texture ();
++		public virtual void paint_target (Clutter.PaintNode node, Clutter.PaintContext paint_context);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	public class PadButtonEvent : Clutter.Event {
++		public uint32 button;
++		public weak Clutter.InputDevice device;
++		public Clutter.EventFlags flags;
++		public uint32 group;
++		public uint32 mode;
++		public weak Clutter.Actor source;
++		public weak Clutter.Stage stage;
++		public uint32 time;
++		public Clutter.EventType type;
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	public class PadRingEvent : Clutter.Event {
++		public double angle;
++		public weak Clutter.InputDevice device;
++		public Clutter.EventFlags flags;
++		public uint32 group;
++		public uint32 mode;
++		public uint32 ring_number;
++		public Clutter.InputDevicePadSource ring_source;
++		public weak Clutter.Actor source;
++		public weak Clutter.Stage stage;
++		public uint32 time;
++		public Clutter.EventType type;
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	public class PadStripEvent : Clutter.Event {
++		public weak Clutter.InputDevice device;
++		public Clutter.EventFlags flags;
++		public uint32 group;
++		public uint32 mode;
++		public weak Clutter.Actor source;
++		public weak Clutter.Stage stage;
++		public uint32 strip_number;
++		public Clutter.InputDevicePadSource strip_source;
++		public uint32 time;
++		public Clutter.EventType type;
++		public double value;
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_page_turn_effect_get_type ()")]
++	[Version (since = "1.4")]
++	public class PageTurnEffect : Clutter.DeformEffect {
++		[CCode (has_construct_function = false, type = "ClutterEffect*")]
++		public PageTurnEffect (double period, double angle, float radius);
++		public double get_angle ();
++		public double get_period ();
++		public float get_radius ();
++		public void set_angle (double angle);
++		public void set_period (double period);
++		public void set_radius (float radius);
++		public double angle { get; set; }
++		public double period { get; set; }
++		public float radius { get; set; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", ref_function = "clutter_paint_context_ref", type_id = "clutter_paint_context_get_type ()", unref_function = "clutter_paint_context_unref")]
++	[Compact]
++	public class PaintContext {
++		public void destroy ();
++		public unowned Cogl.Framebuffer get_framebuffer ();
++		public unowned Cairo.Region get_redraw_clip ();
++		public void pop_framebuffer ();
++		public void push_framebuffer (Cogl.Framebuffer framebuffer);
++		public unowned Clutter.PaintContext @ref ();
++		public void unref ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_paint_node_get_type ()")]
++	[Version (since = "1.10")]
++	public abstract class PaintNode {
++		[CCode (has_construct_function = false)]
++		protected PaintNode ();
++		public void add_child (Clutter.PaintNode child);
++		public void add_multitexture_rectangle (Clutter.ActorBox rect, float text_coords, uint text_coords_len);
++		public void add_rectangle (Clutter.ActorBox rect);
++		public void add_rectangles ([CCode (array_length_cname = "n_rects", array_length_pos = 1.1, array_length_type = "guint")] float[] coords);
++		public void add_texture_rectangle (Clutter.ActorBox rect, float x_1, float y_1, float x_2, float y_2);
++		public void add_texture_rectangles ([CCode (array_length_cname = "n_rects", array_length_pos = 1.1, array_length_type = "guint")] float[] coords);
++		public unowned Cogl.Framebuffer get_framebuffer ();
++		public void paint (Clutter.PaintContext paint_context);
++		public unowned Clutter.PaintNode @ref ();
++		public void set_name (string name);
++		public void unref ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_pan_action_get_type ()")]
++	[Version (since = "1.12")]
++	public class PanAction : Clutter.GestureAction {
++		[CCode (has_construct_function = false, type = "ClutterAction*")]
++		public PanAction ();
++		public double get_acceleration_factor ();
++		[Version (since = "1.24")]
++		public float get_constrained_motion_delta (uint point, out float delta_x, out float delta_y);
++		public double get_deceleration ();
++		public bool get_interpolate ();
++		public void get_interpolated_coords (out float interpolated_x, out float interpolated_y);
++		public float get_interpolated_delta (out float delta_x, out float delta_y);
++		[Version (since = "1.14")]
++		public void get_motion_coords (uint point, out float motion_x, out float motion_y);
++		[Version (since = "1.14")]
++		public float get_motion_delta (uint point, out float delta_x, out float delta_y);
++		public Clutter.PanAxis get_pan_axis ();
++		public void set_acceleration_factor (double factor);
++		public void set_deceleration (double rate);
++		public void set_interpolate (bool should_interpolate);
++		public void set_pan_axis (Clutter.PanAxis axis);
++		public double acceleration_factor { get; set; }
++		public double deceleration { get; set; }
++		public bool interpolate { get; set; }
++		public Clutter.PanAxis pan_axis { get; set; }
++		public virtual signal bool pan (Clutter.Actor actor, bool is_interpolated);
++		public virtual signal void pan_stopped (Clutter.Actor actor);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", lower_case_csuffix = "param_units", type_id = "clutter_param_units_get_type ()")]
++	public class ParamSpecUnit : GLib.ParamSpec {
++		[CCode (has_construct_function = false)]
++		protected ParamSpecUnit ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_path_get_type ()")]
++	[Version (since = "1.0")]
++	public class Path : GLib.InitiallyUnowned {
++		[CCode (has_construct_function = false)]
++		public Path ();
++		public void add_cairo_path (Cairo.Path cpath);
++		public void add_close ();
++		public void add_curve_to (int x_1, int y_1, int x_2, int y_2, int x_3, int y_3);
++		public void add_line_to (int x, int y);
++		public void add_move_to (int x, int y);
++		public void add_node (Clutter.PathNode node);
++		public void add_rel_curve_to (int x_1, int y_1, int x_2, int y_2, int x_3, int y_3);
++		public void add_rel_line_to (int x, int y);
++		public void add_rel_move_to (int x, int y);
++		public bool add_string (string str);
++		public void clear ();
++		public void @foreach (Clutter.PathCallback callback);
++		public string get_description ();
++		public uint get_length ();
++		public uint get_n_nodes ();
++		public Clutter.PathNode get_node (uint index_);
++		public GLib.SList<weak Clutter.PathNode?> get_nodes ();
++		public uint get_position (double progress, out Clutter.Knot position);
++		public void insert_node (int index_, Clutter.PathNode node);
++		public void remove_node (uint index_);
++		public void replace_node (uint index_, Clutter.PathNode node);
++		public bool set_description (string str);
++		public void to_cairo_path (Cairo.Context cr);
++		[CCode (has_construct_function = false)]
++		public Path.with_description (string desc);
++		public string description { owned get; set; }
++		public uint length { get; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_path_constraint_get_type ()")]
++	[Version (since = "1.6")]
++	public class PathConstraint : Clutter.Constraint {
++		[CCode (has_construct_function = false, type = "ClutterConstraint*")]
++		public PathConstraint (Clutter.Path? path, float offset);
++		public float get_offset ();
++		public unowned Clutter.Path get_path ();
++		public void set_offset (float offset);
++		public void set_path (Clutter.Path? path);
++		public float offset { get; set; }
++		public Clutter.Path path { get; set; }
++		public signal void node_reached (Clutter.Actor actor, uint index);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", ref_function = "clutter_pick_context_ref", type_id = "clutter_pick_context_get_type ()", unref_function = "clutter_pick_context_unref")]
++	[Compact]
++	public class PickContext {
++		public void destroy ();
++		public Graphene.Matrix get_transform ();
++		public void log_pick (Clutter.ActorBox box, Clutter.Actor actor);
++		public void pop_clip ();
++		public void pop_transform ();
++		public void push_clip (Clutter.ActorBox box);
++		public void push_transform (Graphene.Matrix transform);
++		public unowned Clutter.PickContext @ref ();
++		public void unref ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_pipeline_node_get_type ()")]
++	[Version (since = "1.10")]
++	public class PipelineNode : Clutter.PaintNode {
++		[CCode (has_construct_function = false, type = "ClutterPaintNode*")]
++		public PipelineNode (Cogl.Pipeline? pipeline);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_property_transition_get_type ()")]
++	[Version (since = "1.10")]
++	public class PropertyTransition : Clutter.Transition, Clutter.Scriptable {
++		[CCode (has_construct_function = false, type = "ClutterTransition*")]
++		public PropertyTransition (string? property_name);
++		[CCode (has_construct_function = false, type = "ClutterTransition*")]
++		public PropertyTransition.for_actor (Clutter.Actor actor, string? property_name);
++		public unowned string get_property_name ();
++		public void set_property_name (string? property_name);
++		public string property_name { get; set; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	[Version (since = "1.28")]
++	public class ProximityEvent : Clutter.Event {
++		public weak Clutter.InputDevice device;
++		public Clutter.EventFlags flags;
++		public weak Clutter.Actor source;
++		public weak Clutter.Stage stage;
++		public uint32 time;
++		public Clutter.EventType type;
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_root_node_get_type ()")]
++	public class RootNode : Clutter.PaintNode {
++		[CCode (has_construct_function = false, type = "ClutterPaintNode*")]
++		public RootNode (Cogl.Framebuffer framebuffer, Clutter.Color clear_color, Cogl.BufferBit clear_flags);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_rotate_action_get_type ()")]
++	[Version (since = "1.12")]
++	public class RotateAction : Clutter.GestureAction {
++		[CCode (has_construct_function = false, type = "ClutterAction*")]
++		public RotateAction ();
++		public virtual signal bool rotate (Clutter.Actor actor, double angle);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_script_get_type ()")]
++	[Version (since = "0.6")]
++	public class Script : GLib.Object {
++		[CCode (has_construct_function = false)]
++		public Script ();
++		[Version (since = "0.8")]
++		public void add_search_paths ([CCode (array_length_cname = "n_paths", array_length_pos = 1.1, array_length_type = "gsize")] string[] paths);
++		public void connect_signals (void* user_data);
++		public void connect_signals_full (Clutter.ScriptConnectFunc func);
++		public void ensure_objects ();
++		public unowned GLib.Object get_object (string name);
++		public int get_objects (...);
++		[Version (since = "1.10")]
++		public unowned string get_translation_domain ();
++		public virtual GLib.Type get_type_from_name (string type_name);
++		[Version (since = "0.8")]
++		public GLib.List<weak GLib.Object> list_objects ();
++		public uint load_from_data (string data, ssize_t length) throws GLib.Error;
++		public uint load_from_file (string filename) throws GLib.Error;
++		[Version (since = "1.10")]
++		public uint load_from_resource (string resource_path) throws GLib.Error;
++		[Version (since = "0.8")]
++		public string lookup_filename (string filename);
++		[Version (since = "1.10")]
++		public void set_translation_domain (string? domain);
++		public void unmerge_objects (uint merge_id);
++		[NoAccessorMethod]
++		public string filename { owned get; }
++		[NoAccessorMethod]
++		public bool filename_set { get; }
++		[Version (since = "1.10")]
++		public string translation_domain { get; set; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_scroll_actor_get_type ()")]
++	[Version (since = "1.12")]
++	public class ScrollActor : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
++		[CCode (has_construct_function = false, type = "ClutterActor*")]
++		public ScrollActor ();
++		public Clutter.ScrollMode get_scroll_mode ();
++		public void scroll_to_point (Graphene.Point point);
++		public void scroll_to_rect (Graphene.Rect rect);
++		public void set_scroll_mode (Clutter.ScrollMode mode);
++		public Clutter.ScrollMode scroll_mode { get; set; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	[Version (since = "0.2")]
++	public class ScrollEvent : Clutter.Event {
++		public double axes;
++		public weak Clutter.InputDevice device;
++		public Clutter.ScrollDirection direction;
++		public Clutter.ScrollFinishFlags finish_flags;
++		public Clutter.EventFlags flags;
++		public Clutter.ModifierType modifier_state;
++		public Clutter.ScrollSource scroll_source;
++		public weak Clutter.Actor source;
++		public weak Clutter.Stage stage;
++		public uint32 time;
++		public Clutter.EventType type;
++		public float x;
++		public float y;
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_seat_get_type ()")]
++	public abstract class Seat : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected Seat ();
++		public virtual void bell_notify ();
++		public virtual Clutter.VirtualInputDevice create_virtual_device (Clutter.InputDeviceType device_type);
++		public void ensure_a11y_state ();
++		public virtual unowned Clutter.InputDevice get_keyboard ();
++		public virtual unowned Clutter.Keymap get_keymap ();
++		public virtual unowned Clutter.InputDevice get_pointer ();
++		public void get_pointer_a11y_settings (Clutter.PointerA11ySettings settings);
++		public bool get_touch_mode ();
++		public virtual bool handle_event_post (Clutter.Event event);
++		public void inhibit_unfocus ();
++		public bool is_unfocus_inhibited ();
++		public GLib.List<weak Clutter.InputDevice> list_devices ();
++		public virtual bool query_state (Clutter.InputDevice device, Clutter.EventSequence sequence, Graphene.Point coords, Clutter.ModifierType modifiers);
++		public void set_pointer_a11y_dwell_click_type (Clutter.PointerA11yDwellClickType click_type);
++		public void set_pointer_a11y_settings (Clutter.PointerA11ySettings settings);
++		public void uninhibit_unfocus ();
++		public virtual void warp_pointer (int x, int y);
++		[NoAccessorMethod]
++		public Clutter.Backend backend { owned get; construct; }
++		public bool touch_mode { get; }
++		public signal void device_added (Clutter.InputDevice object);
++		public signal void device_removed (Clutter.InputDevice object);
++		public signal void is_unfocus_inhibited_changed ();
++		public signal void kbd_a11y_flags_changed (uint settings_flags, uint changed_mask);
++		public signal void kbd_a11y_mods_state_changed (uint latched_mask, uint locked_mask);
++		public signal void ptr_a11y_dwell_click_type_changed (Clutter.PointerA11yDwellClickType click_type);
++		public signal void ptr_a11y_timeout_started (Clutter.InputDevice device, Clutter.PointerA11yTimeoutType timeout_type, uint delay);
++		public signal void ptr_a11y_timeout_stopped (Clutter.InputDevice device, Clutter.PointerA11yTimeoutType timeout_type, bool clicked);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_settings_get_type ()")]
++	[Version (since = "1.4")]
++	public class Settings : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected Settings ();
++		public static unowned Clutter.Settings get_default ();
++		[NoAccessorMethod]
++		[Version (deprecated = true, deprecated_since = "1.10", since = "1.4")]
++		public Clutter.Backend backend { construct; }
++		[NoAccessorMethod]
++		[Version (since = "1.8")]
++		public int dnd_drag_threshold { get; set; }
++		[NoAccessorMethod]
++		public int double_click_distance { get; set; }
++		[NoAccessorMethod]
++		public int double_click_time { get; set; }
++		[NoAccessorMethod]
++		public int font_antialias { get; set; }
++		[NoAccessorMethod]
++		public int font_dpi { get; set; }
++		[NoAccessorMethod]
++		public string font_hint_style { owned get; set; }
++		[NoAccessorMethod]
++		public int font_hinting { get; set; }
++		[NoAccessorMethod]
++		public string font_name { owned get; set; }
++		[NoAccessorMethod]
++		public string font_subpixel_order { owned get; set; }
++		[NoAccessorMethod]
++		public uint fontconfig_timestamp { set; }
++		[NoAccessorMethod]
++		[Version (since = "1.8")]
++		public int long_press_duration { get; set; }
++		[NoAccessorMethod]
++		public uint password_hint_time { get; set; }
++		[NoAccessorMethod]
++		public int unscaled_font_dpi { set; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	public class Shader {
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_shader_effect_get_type ()")]
++	[Version (since = "1.4")]
++	public class ShaderEffect : Clutter.OffscreenEffect {
++		[CCode (has_construct_function = false, type = "ClutterEffect*")]
++		[Version (since = "1.8")]
++		public ShaderEffect (Clutter.ShaderType shader_type);
++		public unowned Cogl.Handle get_program ();
++		public unowned Cogl.Handle get_shader ();
++		[NoWrapper]
++		public virtual string get_static_shader_source ();
++		public bool set_shader_source (string source);
++		public void set_uniform_value (string name, GLib.Value value);
++		[NoAccessorMethod]
++		public Clutter.ShaderType shader_type { construct; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_shader_float_get_type ()")]
++	public class ShaderFloat {
++		[CCode (has_construct_function = false)]
++		protected ShaderFloat ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_shader_int_get_type ()")]
++	public class ShaderInt {
++		[CCode (has_construct_function = false)]
++		protected ShaderInt ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_shader_matrix_get_type ()")]
++	public class ShaderMatrix {
++		[CCode (has_construct_function = false)]
++		protected ShaderMatrix ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_snap_constraint_get_type ()")]
++	[Version (since = "1.6")]
++	public class SnapConstraint : Clutter.Constraint {
++		[CCode (has_construct_function = false, type = "ClutterConstraint*")]
++		public SnapConstraint (Clutter.Actor? source, Clutter.SnapEdge from_edge, Clutter.SnapEdge to_edge, float offset);
++		public void get_edges (out Clutter.SnapEdge from_edge, out Clutter.SnapEdge to_edge);
++		public float get_offset ();
++		public unowned Clutter.Actor get_source ();
++		public void set_edges (Clutter.SnapEdge from_edge, Clutter.SnapEdge to_edge);
++		public void set_offset (float offset);
++		public void set_source (Clutter.Actor? source);
++		[NoAccessorMethod]
++		public Clutter.SnapEdge from_edge { get; set construct; }
++		public float offset { get; set construct; }
++		public Clutter.Actor source { get; set construct; }
++		[NoAccessorMethod]
++		public Clutter.SnapEdge to_edge { get; set construct; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_stage_get_type ()")]
++	[Version (since = "0.2")]
++	public class Stage : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
++		[CCode (has_construct_function = false)]
++		protected Stage ();
++		public void capture_into (Cairo.RectangleInt rect, uint8 data);
++		public void clear_stage_views ();
++		[CCode (cname = "clutter_stage_event")]
++		public bool emit_event (Clutter.Event event);
++		[Version (since = "1.0")]
++		public void ensure_viewport ();
++		public unowned Clutter.Actor get_actor_at_pos (Clutter.PickMode pick_mode, float x, float y);
++		public bool get_capture_final_size (Cairo.RectangleInt rect, out int out_width, out int out_height, out float out_scale);
++		public unowned Clutter.Actor get_device_actor (Clutter.InputDevice device, Clutter.EventSequence? sequence);
++		public int64 get_frame_counter ();
++		[Version (since = "0.6")]
++		public unowned Clutter.Actor get_key_focus ();
++		[Version (since = "1.2")]
++		public void get_minimum_size (out uint width, out uint height);
++		[Version (since = "1.8")]
++		public bool get_motion_events_enabled ();
++		public Clutter.Perspective get_perspective ();
++		[Version (since = "1.0")]
++		public bool get_throttle_motion_events ();
++		[Version (since = "0.4")]
++		public unowned string get_title ();
++		public bool get_use_alpha ();
++		public bool paint_to_buffer (Cairo.RectangleInt rect, float scale, [CCode (array_length = false)] ref uint8[] data, int stride, Cogl.PixelFormat format, Clutter.PaintFlag paint_flags) throws GLib.Error;
++		public void paint_to_framebuffer (Cogl.Framebuffer framebuffer, Cairo.RectangleInt rect, float scale, Clutter.PaintFlag paint_flags);
++		[CCode (array_length = false)]
++		public uint8[] read_pixels (int x, int y, int width = -1, int height = -1);
++		public void repick_device (Clutter.InputDevice device);
++		public void schedule_update ();
++		[Version (since = "0.6")]
++		public void set_key_focus (Clutter.Actor? actor);
++		[Version (since = "1.2")]
++		public void set_minimum_size (uint width, uint height);
++		[Version (since = "1.8")]
++		public void set_motion_events_enabled (bool enabled);
++		[Version (since = "1.0")]
++		public void set_throttle_motion_events (bool throttle);
++		[Version (since = "0.4")]
++		public void set_title (string title);
++		public void set_use_alpha (bool use_alpha);
++		public void update_device (Clutter.InputDevice device, Clutter.EventSequence sequence, Graphene.Point point, uint32 time, Clutter.Actor new_actor, bool emit_crossing);
++		[Version (since = "1.2")]
++		public Clutter.Actor key_focus { get; set; }
++		[Version (since = "0.8")]
++		public Clutter.Perspective perspective { get; }
++		[Version (since = "0.4")]
++		public string title { get; set; }
++		[Version (since = "0.6")]
++		public virtual signal void activate ();
++		[Version (since = "1.20")]
++		public signal void after_paint (Clutter.StageView view);
++		public signal void after_update (Clutter.StageView view);
++		public virtual signal void before_paint (Clutter.StageView view);
++		public signal void before_update (Clutter.StageView view);
++		[Version (since = "0.6")]
++		public virtual signal void deactivate ();
++		public virtual signal void paint_view (Clutter.StageView view, Cairo.Region redraw_clip);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_stage_manager_get_type ()")]
++	[Version (since = "1.0")]
++	public class StageManager : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected StageManager ();
++		[Version (since = "0.8")]
++		public static unowned Clutter.StageManager get_default ();
++		[Version (since = "0.8")]
++		public unowned Clutter.Stage get_default_stage ();
++		[Version (since = "0.8")]
++		public GLib.SList<weak Clutter.Stage> list_stages ();
++		public unowned GLib.SList<Clutter.Stage> peek_stages ();
++		[Version (since = "0.8")]
++		public Clutter.Stage default_stage { get; }
++		[Version (since = "0.8")]
++		public virtual signal void stage_added (Clutter.Stage stage);
++		[Version (since = "0.8")]
++		public virtual signal void stage_removed (Clutter.Stage stage);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_stage_view_get_type ()")]
++	public class StageView : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected StageView ();
++		public void assign_next_scanout (Cogl.Scanout scanout);
++		public void destroy ();
++		public unowned Cogl.Framebuffer get_framebuffer ();
++		public void get_layout (Cairo.RectangleInt rect);
++		public virtual void get_offscreen_transformation_matrix (Graphene.Matrix matrix);
++		public unowned Cogl.Framebuffer get_onscreen ();
++		public float get_refresh_rate ();
++		public float get_scale ();
++		public void invalidate_offscreen_blit_pipeline ();
++		[NoWrapper]
++		public virtual void setup_offscreen_blit_pipeline (Cogl.Pipeline pipeline);
++		[NoWrapper]
++		public virtual void transform_rect_to_onscreen (Cairo.RectangleInt src_rect, int dst_width, int dst_height, Cairo.RectangleInt dst_rect);
++		[NoAccessorMethod]
++		public Cogl.Framebuffer framebuffer { owned get; set construct; }
++		[NoAccessorMethod]
++		public string name { owned get; construct; }
++		[NoAccessorMethod]
++		public Cogl.Offscreen offscreen { owned get; construct; }
++		[NoAccessorMethod]
++		public float refresh_rate { get; set construct; }
++		[NoAccessorMethod]
++		public float scale { get; set construct; }
++		[NoAccessorMethod]
++		public Clutter.Stage stage { owned get; construct; }
++		[NoAccessorMethod]
++		public bool use_shadowfb { get; construct; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_swipe_action_get_type ()")]
++	[Version (since = "1.8")]
++	public class SwipeAction : Clutter.GestureAction {
++		[CCode (has_construct_function = false, type = "ClutterAction*")]
++		public SwipeAction ();
++		[Version (deprecated = true, deprecated_since = "1.14", since = "1.8")]
++		public virtual signal void swept (Clutter.Actor actor, Clutter.SwipeDirection direction);
++		[Version (since = "1.14")]
++		public virtual signal bool swipe (Clutter.Actor actor, Clutter.SwipeDirection direction);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_tap_action_get_type ()")]
++	[Version (since = "1.14")]
++	public class TapAction : Clutter.GestureAction {
++		[CCode (has_construct_function = false, type = "ClutterAction*")]
++		public TapAction ();
++		public virtual signal void tap (Clutter.Actor actor);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_text_get_type ()")]
++	[Version (since = "1.0")]
++	public class Text : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
++		[CCode (has_construct_function = false, type = "ClutterActor*")]
++		public Text ();
++		[Version (since = "1.10")]
++		public int coords_to_position (float x, float y);
++		public void delete_chars (uint n_chars);
++		public bool delete_selection ();
++		[CCode (has_construct_function = false, type = "ClutterActor*")]
++		public Text.full (string font_name, string text, Clutter.Color color);
++		public bool get_activatable ();
++		public unowned Pango.AttrList get_attributes ();
++		[Version (since = "1.10")]
++		public unowned Clutter.TextBuffer get_buffer ();
++		public string get_chars (ssize_t start_pos, ssize_t end_pos);
++		public Clutter.Color get_color ();
++		public Clutter.Color get_cursor_color ();
++		public int get_cursor_position ();
++		[Version (since = "1.16")]
++		public Graphene.Rect get_cursor_rect ();
++		public uint get_cursor_size ();
++		public bool get_cursor_visible ();
++		public bool get_editable ();
++		public Pango.EllipsizeMode get_ellipsize ();
++		[Version (since = "1.2")]
++		public Pango.FontDescription get_font_description ();
++		public unowned string get_font_name ();
++		public Clutter.InputContentHintFlags get_input_hints ();
++		public Clutter.InputContentPurpose get_input_purpose ();
++		[Version (since = "0.6")]
++		public bool get_justify ();
++		public unowned Pango.Layout get_layout ();
++		[Version (since = "1.8")]
++		public void get_layout_offsets (out int x, out int y);
++		public Pango.Alignment get_line_alignment ();
++		public bool get_line_wrap ();
++		public Pango.WrapMode get_line_wrap_mode ();
++		public int get_max_length ();
++		public unichar get_password_char ();
++		public bool get_selectable ();
++		[Version (since = "1.8")]
++		public Clutter.Color get_selected_text_color ();
++		public string get_selection ();
++		public int get_selection_bound ();
++		public Clutter.Color get_selection_color ();
++		public bool get_single_line_mode ();
++		public unowned string get_text ();
++		public bool get_use_markup ();
++		public bool has_preedit ();
++		public void insert_text (string text, ssize_t position);
++		public void insert_unichar (unichar wc);
++		public bool position_to_coords (int position, out float x, out float y, out float line_height = null);
++		public void set_activatable (bool activatable);
++		public void set_attributes (Pango.AttrList? attrs);
++		[Version (since = "1.10")]
++		public void set_buffer (Clutter.TextBuffer buffer);
++		public void set_color (Clutter.Color color);
++		public void set_cursor_color (Clutter.Color? color);
++		public void set_cursor_position (int position);
++		public void set_cursor_size (int size);
++		public void set_cursor_visible (bool cursor_visible);
++		public void set_editable (bool editable);
++		public void set_ellipsize (Pango.EllipsizeMode mode);
++		[Version (since = "1.2")]
++		public void set_font_description (Pango.FontDescription font_desc);
++		public void set_font_name (string? font_name);
++		public void set_input_hints (Clutter.InputContentHintFlags hints);
++		public void set_input_purpose (Clutter.InputContentPurpose purpose);
++		public void set_justify (bool justify);
++		public void set_line_alignment (Pango.Alignment alignment);
++		public void set_line_wrap (bool line_wrap);
++		public void set_line_wrap_mode (Pango.WrapMode wrap_mode);
++		public void set_markup (string? markup);
++		public void set_max_length (int max);
++		public void set_password_char (unichar wc);
++		[Version (since = "1.2")]
++		public void set_preedit_string (string? preedit_str, Pango.AttrList? preedit_attrs, uint cursor_pos);
++		public void set_selectable (bool selectable);
++		[Version (since = "1.8")]
++		public void set_selected_text_color (Clutter.Color? color);
++		public void set_selection (ssize_t start_pos, ssize_t end_pos);
++		public void set_selection_bound (int selection_bound);
++		public void set_selection_color (Clutter.Color? color);
++		public void set_single_line_mode (bool single_line);
++		public void set_text (string? text);
++		public void set_use_markup (bool setting);
++		[CCode (cname = "clutter_text_activate")]
++		public bool try_activate ();
++		[CCode (has_construct_function = false, type = "ClutterActor*")]
++		[Version (since = "1.10")]
++		public Text.with_buffer (Clutter.TextBuffer buffer);
++		[CCode (has_construct_function = false, type = "ClutterActor*")]
++		public Text.with_text (string? font_name, string text);
++		public bool activatable { get; set; }
++		public Pango.AttrList attributes { get; set; }
++		[Version (since = "1.8")]
++		public Clutter.TextBuffer buffer { get; set; }
++		public Clutter.Color color { get; set; }
++		public Clutter.Color cursor_color { get; set; }
++		[NoAccessorMethod]
++		public bool cursor_color_set { get; }
++		[Version (since = "1.12")]
++		public int cursor_position { get; set; }
++		public int cursor_size { get; set; }
++		public bool cursor_visible { get; set; }
++		public bool editable { get; set; }
++		public Pango.EllipsizeMode ellipsize { get; set; }
++		[Version (since = "1.2")]
++		public Pango.FontDescription font_description { owned get; set; }
++		public string font_name { get; set; }
++		public Clutter.InputContentHintFlags input_hints { get; set; }
++		public Clutter.InputContentPurpose input_purpose { get; set; }
++		public bool justify { get; set; }
++		public Pango.Alignment line_alignment { get; set; }
++		public bool line_wrap { get; set; }
++		public Pango.WrapMode line_wrap_mode { get; set; }
++		public int max_length { get; set; }
++		public uint password_char { get; set; }
++		[NoAccessorMethod]
++		[Version (deprecated = true, deprecated_since = "1.12", since = "1.0")]
++		public int position { get; set; }
++		public bool selectable { get; set; }
++		[Version (since = "1.8")]
++		public Clutter.Color selected_text_color { get; set; }
++		[NoAccessorMethod]
++		[Version (since = "1.8")]
++		public bool selected_text_color_set { get; }
++		public int selection_bound { get; set; }
++		public Clutter.Color selection_color { get; set; }
++		[NoAccessorMethod]
++		public bool selection_color_set { get; }
++		public bool single_line_mode { get; set; }
++		public string text { get; set; }
++		public bool use_markup { get; set; }
++		public virtual signal void activate ();
++		[Version (since = "1.16")]
++		public virtual signal void cursor_changed ();
++		[Version (deprecated = true, deprecated_since = "1.16", since = "1.0")]
++		public virtual signal void cursor_event (Graphene.Rect rect);
++		[HasEmitter]
++		[Version (since = "1.2")]
++		public signal void delete_text (int start_pos, int end_pos);
++		public virtual signal void text_changed ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_text_buffer_get_type ()")]
++	[Version (since = "1.10")]
++	public class TextBuffer : GLib.Object {
++		[CCode (has_construct_function = false)]
++		public TextBuffer ();
++		public virtual uint delete_text (uint position, uint n_chars);
++		public void emit_deleted_text (uint position, uint n_chars);
++		public void emit_inserted_text (uint position, string chars, uint n_chars);
++		public size_t get_bytes ();
++		public virtual uint get_length ();
++		public int get_max_length ();
++		public unowned string get_text ();
++		[CCode (vfunc_name = "get_text")]
++		[NoWrapper]
++		public virtual unowned string get_text_with_length (size_t n_bytes);
++		public virtual uint insert_text (uint position, string chars, uint n_chars);
++		public void set_max_length (int max_length);
++		public void set_text (string chars, int n_chars);
++		[CCode (has_construct_function = false)]
++		public TextBuffer.with_text (string? text, ssize_t text_len);
++		public uint length { get; }
++		public int max_length { get; set; }
++		public string text { get; }
++		public virtual signal void deleted_text (uint position, uint n_chars);
++		public virtual signal void inserted_text (uint position, string chars, uint n_chars);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_text_node_get_type ()")]
++	[Version (since = "1.10")]
++	public class TextNode : Clutter.PaintNode {
++		[CCode (has_construct_function = false, type = "ClutterPaintNode*")]
++		public TextNode (Pango.Layout? layout, Clutter.Color? color);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_texture_node_get_type ()")]
++	[Version (since = "1.10")]
++	public class TextureNode : Clutter.PipelineNode {
++		[CCode (has_construct_function = false, type = "ClutterPaintNode*")]
++		public TextureNode (Cogl.Texture texture, Clutter.Color? color, Clutter.ScalingFilter min_filter, Clutter.ScalingFilter mag_filter);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_timeline_get_type ()")]
++	[Version (since = "0.2")]
++	public class Timeline : GLib.Object, Clutter.Scriptable {
++		[CCode (has_construct_function = false)]
++		[Version (since = "0.6")]
++		public Timeline (uint duration_ms);
++		[Version (since = "1.14")]
++		public void add_marker (string marker_name, double progress);
++		[Version (since = "0.8")]
++		public void add_marker_at_time (string marker_name, uint msecs);
++		public void advance (uint msecs);
++		[Version (since = "0.8")]
++		public void advance_to_marker (string marker_name);
++		[CCode (has_construct_function = false)]
++		public Timeline.for_actor (Clutter.Actor actor, uint duration_ms);
++		[CCode (has_construct_function = false)]
++		public Timeline.for_frame_clock (Clutter.FrameClock frame_clock, uint duration_ms);
++		public unowned Clutter.Actor get_actor ();
++		[Version (since = "1.6")]
++		public bool get_auto_reverse ();
++		[Version (since = "1.12")]
++		public bool get_cubic_bezier_progress (out Graphene.Point c_1, out Graphene.Point c_2);
++		[Version (since = "1.10")]
++		public int get_current_repeat ();
++		[Version (since = "0.4")]
++		public uint get_delay ();
++		[Version (since = "0.6")]
++		public uint get_delta ();
++		[Version (since = "0.6")]
++		public Clutter.TimelineDirection get_direction ();
++		[Version (since = "0.6")]
++		public uint get_duration ();
++		[Version (since = "1.10")]
++		public int64 get_duration_hint ();
++		public uint get_elapsed_time ();
++		[Version (since = "0.6")]
++		public double get_progress ();
++		[Version (since = "1.10")]
++		public Clutter.AnimationMode get_progress_mode ();
++		[Version (since = "1.10")]
++		public int get_repeat_count ();
++		[Version (since = "1.12")]
++		public bool get_step_progress (out int n_steps, out Clutter.StepMode step_mode);
++		[Version (since = "0.8")]
++		public bool has_marker (string marker_name);
++		public bool is_playing ();
++		[CCode (array_length = true, array_length_pos = 1.1, array_length_type = "gsize", array_null_terminated = true)]
++		[Version (since = "0.8")]
++		public string[] list_markers (int msecs);
++		public void pause ();
++		[Version (since = "0.8")]
++		public void remove_marker (string marker_name);
++		public void rewind ();
++		public void set_actor (Clutter.Actor? actor);
++		[Version (since = "1.6")]
++		public void set_auto_reverse (bool reverse);
++		[Version (since = "1.12")]
++		public void set_cubic_bezier_progress (Graphene.Point c_1, Graphene.Point c_2);
++		[Version (since = "0.4")]
++		public void set_delay (uint msecs);
++		[Version (since = "0.6")]
++		public void set_direction (Clutter.TimelineDirection direction);
++		[Version (since = "0.6")]
++		public void set_duration (uint msecs);
++		public void set_frame_clock (Clutter.FrameClock frame_clock);
++		[Version (since = "1.10")]
++		public void set_progress_func (owned Clutter.TimelineProgressFunc? func);
++		[Version (since = "1.10")]
++		public void set_progress_mode (Clutter.AnimationMode mode);
++		[Version (since = "1.10")]
++		public void set_repeat_count (int count);
++		[Version (since = "1.12")]
++		public void set_step_progress (int n_steps, Clutter.StepMode step_mode);
++		public void skip (uint msecs);
++		public void start ();
++		public void stop ();
++		public Clutter.Actor actor { get; set construct; }
++		[Version (since = "1.6")]
++		public bool auto_reverse { get; set; }
++		[Version (since = "0.4")]
++		public uint delay { get; set; }
++		[Version (since = "0.6")]
++		public Clutter.TimelineDirection direction { get; set; }
++		[Version (since = "0.6")]
++		public uint duration { get; set; }
++		[NoAccessorMethod]
++		public Clutter.FrameClock frame_clock { owned get; set construct; }
++		[Version (since = "1.10")]
++		public Clutter.AnimationMode progress_mode { get; set; }
++		[Version (since = "1.10")]
++		public int repeat_count { get; set; }
++		public virtual signal void completed ();
++		[Version (since = "0.8")]
++		public virtual signal void marker_reached (string marker_name, int msecs);
++		public virtual signal void new_frame (int msecs);
++		public virtual signal void paused ();
++		public virtual signal void started ();
++		[Version (since = "1.12")]
++		public virtual signal void stopped (bool is_finished);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	[Version (since = "1.10")]
++	public class TouchEvent : Clutter.Event {
++		public double axes;
++		public weak Clutter.InputDevice device;
++		public Clutter.EventFlags flags;
++		public Clutter.ModifierType modifier_state;
++		public weak Clutter.EventSequence sequence;
++		public weak Clutter.Actor source;
++		public weak Clutter.Stage stage;
++		public uint32 time;
++		public Clutter.EventType type;
++		public float x;
++		public float y;
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	[Version (since = "1.24")]
++	public class TouchpadPinchEvent : Clutter.Event {
++		public float angle_delta;
++		public float dx;
++		public float dy;
++		public Clutter.EventFlags flags;
++		public uint n_fingers;
++		public Clutter.TouchpadGesturePhase phase;
++		public float scale;
++		public weak Clutter.Actor source;
++		public weak Clutter.Stage stage;
++		public uint32 time;
++		public Clutter.EventType type;
++		public float x;
++		public float y;
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Compact]
++	[Version (since = "1.24")]
++	public class TouchpadSwipeEvent : Clutter.Event {
++		public float dx;
++		public float dy;
++		public Clutter.EventFlags flags;
++		public uint n_fingers;
++		public Clutter.TouchpadGesturePhase phase;
++		public weak Clutter.Actor source;
++		public weak Clutter.Stage stage;
++		public uint32 time;
++		public Clutter.EventType type;
++		public float x;
++		public float y;
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_transform_node_get_type ()")]
++	public class TransformNode : Clutter.PaintNode {
++		[CCode (has_construct_function = false, type = "ClutterPaintNode*")]
++		public TransformNode (Graphene.Matrix projection);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_transition_get_type ()")]
++	[Version (since = "1.10")]
++	public abstract class Transition : Clutter.Timeline, Clutter.Scriptable {
++		[CCode (has_construct_function = false)]
++		protected Transition ();
++		[NoWrapper]
++		public virtual void attached (Clutter.Animatable animatable);
++		[NoWrapper]
++		public virtual void compute_value (Clutter.Animatable animatable, Clutter.Interval interval, double progress);
++		[NoWrapper]
++		public virtual void detached (Clutter.Animatable animatable);
++		public unowned Clutter.Animatable get_animatable ();
++		public unowned Clutter.Interval get_interval ();
++		public bool get_remove_on_complete ();
++		public void set_animatable (Clutter.Animatable? animatable);
++		[Version (since = "1.12")]
++		public void set_from_value (GLib.Value value);
++		public void set_interval (Clutter.Interval? interval);
++		public void set_remove_on_complete (bool remove_complete);
++		[Version (since = "1.12")]
++		public void set_to_value (GLib.Value value);
++		public Clutter.Animatable animatable { get; set; }
++		public Clutter.Interval interval { get; set; }
++		public bool remove_on_complete { get; set; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_transition_group_get_type ()")]
++	[Version (since = "1.12")]
++	public class TransitionGroup : Clutter.Transition, Clutter.Scriptable {
++		[CCode (has_construct_function = false, type = "ClutterTransition*")]
++		public TransitionGroup ();
++		public void add_transition (Clutter.Transition transition);
++		public void remove_all ();
++		public void remove_transition (Clutter.Transition transition);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_virtual_input_device_get_type ()")]
++	public class VirtualInputDevice : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected VirtualInputDevice ();
++		public int get_device_type ();
++		public virtual void notify_absolute_motion (uint64 time_us, double x, double y);
++		public virtual void notify_button (uint64 time_us, uint32 button, Clutter.ButtonState button_state);
++		public virtual void notify_discrete_scroll (uint64 time_us, Clutter.ScrollDirection direction, Clutter.ScrollSource scroll_source);
++		public virtual void notify_key (uint64 time_us, uint32 key, Clutter.KeyState key_state);
++		public virtual void notify_keyval (uint64 time_us, uint32 keyval, Clutter.KeyState key_state);
++		public virtual void notify_relative_motion (uint64 time_us, double dx, double dy);
++		public virtual void notify_scroll_continuous (uint64 time_us, double dx, double dy, Clutter.ScrollSource scroll_source, Clutter.ScrollFinishFlags finish_flags);
++		public virtual void notify_touch_down (uint64 time_us, int slot, double x, double y);
++		public virtual void notify_touch_motion (uint64 time_us, int slot, double x, double y);
++		public virtual void notify_touch_up (uint64 time_us, int slot);
++		public Clutter.InputDeviceType device_type { get; construct; }
++		[NoAccessorMethod]
++		public Clutter.Seat seat { owned get; construct; }
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_zoom_action_get_type ()")]
++	[Version (since = "1.12")]
++	public class ZoomAction : Clutter.GestureAction {
++		[CCode (has_construct_function = false, type = "ClutterAction*")]
++		public ZoomAction ();
++		public Graphene.Point get_focal_point ();
++		public Graphene.Point get_transformed_focal_point ();
++		public Clutter.ZoomAxis get_zoom_axis ();
++		public void set_zoom_axis (Clutter.ZoomAxis axis);
++		public Clutter.ZoomAxis zoom_axis { get; set; }
++		public virtual signal bool zoom (Clutter.Actor actor, Graphene.Point focal_point, double factor);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_cname = "ClutterAnimatableInterface", type_id = "clutter_animatable_get_type ()")]
++	public interface Animatable : GLib.Object {
++		[Version (since = "1.4")]
++		public abstract unowned GLib.ParamSpec find_property (string property_name);
++		public abstract unowned Clutter.Actor get_actor ();
++		[Version (since = "1.4")]
++		public abstract void get_initial_state (string property_name, GLib.Value value);
++		[Version (since = "1.8")]
++		public abstract bool interpolate_value (string property_name, Clutter.Interval interval, double progress, out GLib.Value value);
++		[Version (since = "1.4")]
++		public abstract void set_final_state (string property_name, GLib.Value value);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_container_get_type ()")]
++	[Version (since = "0.4")]
++	public interface Container : GLib.Object {
++		public void add (params Clutter.Actor[] actors);
++		[CCode (vfunc_name = "add")]
++		[Version (deprecated = true, deprecated_since = "1.10", since = "0.4")]
++		public abstract void add_actor (Clutter.Actor actor);
++		[Version (since = "0.8")]
++		public void child_get (Clutter.Actor actor, ...);
++		[Version (since = "0.8")]
++		public void child_get_property (Clutter.Actor child, string property, GLib.Value value);
++		[Version (since = "0.8")]
++		public void child_set (Clutter.Actor actor, ...);
++		[Version (since = "0.8")]
++		public void child_set_property (Clutter.Actor child, string property, GLib.Value value);
++		[Version (since = "1.2")]
++		public virtual void create_child_meta (Clutter.Actor actor);
++		[Version (since = "1.2")]
++		public virtual void destroy_child_meta (Clutter.Actor actor);
++		[Version (since = "0.6")]
++		public unowned Clutter.Actor find_child_by_name (string child_name);
++		[CCode (cname = "clutter_container_class_find_child_property")]
++		public class unowned GLib.ParamSpec find_child_property (string property_name);
++		[Version (since = "0.8")]
++		public virtual unowned Clutter.ChildMeta get_child_meta (Clutter.Actor actor);
++		[Version (deprecated = true, deprecated_since = "1.10", since = "0.4")]
++		public GLib.List<weak Clutter.Actor> get_children ();
++		[CCode (cname = "clutter_container_class_list_child_properties")]
++		public class unowned GLib.ParamSpec[] list_child_properties ();
++		[CCode (vfunc_name = "lower")]
++		[Version (deprecated = true, deprecated_since = "1.10", since = "0.6")]
++		public virtual void lower_child (Clutter.Actor actor, Clutter.Actor? sibling = null);
++		[CCode (vfunc_name = "raise")]
++		[Version (deprecated = true, deprecated_since = "1.10", since = "0.6")]
++		public virtual void raise_child (Clutter.Actor actor, Clutter.Actor? sibling = null);
++		[Version (deprecated = true, deprecated_since = "1.10", since = "0.4")]
++		public void remove (...);
++		[CCode (vfunc_name = "remove")]
++		[Version (deprecated = true, deprecated_since = "1.10", since = "0.4")]
++		public abstract void remove_actor (Clutter.Actor actor);
++		[Version (deprecated = true, deprecated_since = "1.10", since = "0.6")]
++		public abstract void sort_depth_order ();
++		public virtual signal void actor_added (Clutter.Actor actor);
++		public virtual signal void actor_removed (Clutter.Actor actor);
++		[HasEmitter]
++		[Version (since = "0.8")]
++		public virtual signal void child_notify (Clutter.Actor child, GLib.ParamSpec pspec);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_cname = "ClutterContentInterface", type_id = "clutter_content_get_type ()")]
++	public interface Content : GLib.Object {
++		[Version (since = "1.10")]
++		public abstract bool get_preferred_size (out float width, out float height);
++		[Version (since = "1.10")]
++		public abstract void invalidate ();
++		public abstract void invalidate_size ();
++		[NoWrapper]
++		public abstract void paint_content (Clutter.Actor actor, Clutter.PaintNode node, Clutter.PaintContext paint_context);
++		[Version (since = "1.10")]
++		public virtual signal void attached (Clutter.Actor actor);
++		[Version (since = "1.10")]
++		public virtual signal void detached (Clutter.Actor actor);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_scriptable_get_type ()")]
++	[Version (since = "0.6")]
++	public interface Scriptable : GLib.Object {
++		public abstract unowned string get_id ();
++		public abstract bool parse_custom_node (Clutter.Script script, GLib.Value value, string name, Json.Node node);
++		public abstract void set_custom_property (Clutter.Script script, string name, GLib.Value value);
++		public abstract void set_id (string id_);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_actor_box_get_type ()")]
++	public struct ActorBox {
++		public float x1;
++		public float y1;
++		public float x2;
++		public float y2;
++		[Version (since = "1.12")]
++		public static Clutter.ActorBox? alloc ();
++		[Version (since = "1.2")]
++		public static void clamp_to_pixel (ref Clutter.ActorBox box);
++		[Version (since = "1.0")]
++		public bool contains (float x, float y);
++		[Version (since = "1.0")]
++		public Clutter.ActorBox? copy ();
++		[Version (since = "1.0")]
++		public bool equal (Clutter.ActorBox box_b);
++		[Version (since = "1.0")]
++		public void free ();
++		[Version (since = "1.0")]
++		public float get_area ();
++		[Version (since = "1.0")]
++		public float get_height ();
++		[Version (since = "1.0")]
++		public void get_origin (out float x, out float y);
++		[Version (since = "1.0")]
++		public void get_size (out float width, out float height);
++		[Version (since = "1.0")]
++		public float get_width ();
++		[Version (since = "1.0")]
++		public float get_x ();
++		[Version (since = "1.0")]
++		public float get_y ();
++		[Version (since = "1.10")]
++		public unowned Clutter.ActorBox? init (float x_1, float y_1, float x_2, float y_2);
++		[Version (since = "1.10")]
++		public void init_rect (float x, float y, float width, float height);
++		[Version (since = "1.2")]
++		public Clutter.ActorBox interpolate (Clutter.ActorBox final, double progress);
++		public bool is_initialized ();
++		[Version (since = "1.6")]
++		public void scale (float scale);
++		[Version (since = "1.6")]
++		public void set_origin (float x, float y);
++		[Version (since = "1.6")]
++		public void set_size (float width, float height);
++		[Version (since = "1.4")]
++		public Clutter.ActorBox union (Clutter.ActorBox b);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	[Version (since = "1.10")]
++	public struct ActorIter {
++		public void destroy ();
++		public void init (Clutter.Actor root);
++		[Version (since = "1.12")]
++		public bool is_valid ();
++		public bool next (out unowned Clutter.Actor child);
++		public bool prev (out unowned Clutter.Actor child);
++		public void remove ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_copy_function = false, has_destroy_function = false, has_type_id = false)]
++	public struct Capture {
++		public Cairo.ImageSurface image;
++		public Cairo.RectangleInt rect;
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_color_get_type ()")]
++	public struct Color {
++		public uint8 red;
++		public uint8 green;
++		public uint8 blue;
++		public uint8 alpha;
++		public Clutter.Color add (Clutter.Color b);
++		[Version (since = "1.12")]
++		public static Clutter.Color? alloc ();
++		[Version (since = "0.2")]
++		public Clutter.Color? copy ();
++		public Clutter.Color darken ();
++		[Version (since = "0.2")]
++		public bool equal (Clutter.Color v2);
++		[Version (since = "0.2")]
++		public void free ();
++		[CCode (cname = "clutter_color_from_hls")]
++		public Color.from_hls (float hue, float luminance, float saturation);
++		[CCode (cname = "clutter_color_from_pixel")]
++		public Color.from_pixel (uint32 pixel);
++		[CCode (cname = "clutter_color_from_string")]
++		public static bool from_string (out Clutter.Color color, string str);
++		public static unowned Clutter.Color? get_static (Clutter.StaticColor color);
++		[Version (since = "1.0")]
++		public uint hash ();
++		[Version (since = "1.12")]
++		public unowned Clutter.Color? init (uint8 red, uint8 green, uint8 blue, uint8 alpha);
++		[Version (since = "1.6")]
++		public Clutter.Color interpolate (Clutter.Color final, double progress);
++		public Clutter.Color lighten ();
++		public bool parse_string (string str);
++		public Clutter.Color shade (double factor);
++		public Clutter.Color subtract (Clutter.Color b);
++		public void to_hls (out float hue, out float luminance, out float saturation);
++		public uint32 to_pixel ();
++		[Version (since = "0.2")]
++		public string to_string ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_knot_get_type ()")]
++	[Version (since = "0.2")]
++	public struct Knot {
++		public int x;
++		public int y;
++		public Clutter.Knot? copy ();
++		public bool equal (Clutter.Knot knot_b);
++		public void free ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_margin_get_type ()")]
++	[Version (since = "1.10")]
++	public struct Margin {
++		public float left;
++		public float right;
++		public float top;
++		public float bottom;
++		public Clutter.Margin? copy ();
++		public void free ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_paint_volume_get_type ()")]
++	[Version (since = "1.4")]
++	public struct PaintVolume {
++		[Version (since = "1.6")]
++		public Clutter.PaintVolume? copy ();
++		[Version (since = "1.6")]
++		public void free ();
++		[Version (since = "1.6")]
++		public float get_depth ();
++		[Version (since = "1.6")]
++		public float get_height ();
++		[Version (since = "1.6")]
++		public Graphene.Point3D get_origin ();
++		[Version (since = "1.6")]
++		public float get_width ();
++		[Version (since = "1.6")]
++		public void set_depth (float depth);
++		[Version (since = "1.6")]
++		public bool set_from_allocation (Clutter.Actor actor);
++		[Version (since = "1.6")]
++		public void set_height (float height);
++		[Version (since = "1.6")]
++		public void set_origin (Graphene.Point3D origin);
++		[Version (since = "1.6")]
++		public void set_width (float width);
++		[Version (since = "1.6")]
++		public void union (Clutter.PaintVolume another_pv);
++		[Version (since = "1.10")]
++		public void union_box (Clutter.ActorBox box);
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_path_node_get_type ()")]
++	[Version (since = "1.0")]
++	public struct PathNode {
++		public Clutter.PathNodeType type;
++		[CCode (array_length = false)]
++		public weak Clutter.Knot points[3];
++		public Clutter.PathNode? copy ();
++		public bool equal (Clutter.PathNode node_b);
++		public void free ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_perspective_get_type ()")]
++	[Version (since = "0.4")]
++	public struct Perspective {
++		public float fovy;
++		public float aspect;
++		public float z_near;
++		public float z_far;
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
++	public struct PointerA11ySettings {
++		public Clutter.PointerA11yFlags controls;
++		public Clutter.PointerA11yDwellClickType dwell_click_type;
++		public Clutter.PointerA11yDwellMode dwell_mode;
++		public Clutter.PointerA11yDwellDirection dwell_gesture_single;
++		public Clutter.PointerA11yDwellDirection dwell_gesture_double;
++		public Clutter.PointerA11yDwellDirection dwell_gesture_drag;
++		public Clutter.PointerA11yDwellDirection dwell_gesture_secondary;
++		public int secondary_click_delay;
++		public int dwell_delay;
++		public int dwell_threshold;
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_units_get_type ()")]
++	[Version (since = "1.0")]
++	public struct Units {
++		public Clutter.Units? copy ();
++		public void free ();
++		[CCode (cname = "clutter_units_from_cm")]
++		public Units.from_cm (float cm);
++		[CCode (cname = "clutter_units_from_em")]
++		public Units.from_em (float em);
++		[CCode (cname = "clutter_units_from_em_for_font")]
++		public Units.from_em_for_font (string font_name, float em);
++		[CCode (cname = "clutter_units_from_mm")]
++		public Units.from_mm (float mm);
++		[CCode (cname = "clutter_units_from_pixels")]
++		public Units.from_pixels (int px);
++		[CCode (cname = "clutter_units_from_pt")]
++		public Units.from_pt (float pt);
++		[CCode (cname = "clutter_units_from_string")]
++		public Units.from_string (string str);
++		public Clutter.UnitType get_unit_type ();
++		public float get_unit_value ();
++		public float to_pixels ();
++		public string to_string ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_ACTOR_ALIGN_", type_id = "clutter_actor_align_get_type ()")]
++	[Version (since = "1.10")]
++	public enum ActorAlign {
++		FILL,
++		START,
++		CENTER,
++		END
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_ACTOR_", type_id = "clutter_actor_flags_get_type ()")]
++	[Flags]
++	public enum ActorFlags {
++		MAPPED,
++		REALIZED,
++		REACTIVE,
++		VISIBLE,
++		NO_LAYOUT
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_ALIGN_", type_id = "clutter_align_axis_get_type ()")]
++	[Version (since = "1.4")]
++	public enum AlignAxis {
++		X_AXIS,
++		Y_AXIS,
++		BOTH
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_", type_id = "clutter_animation_mode_get_type ()")]
++	[Version (since = "1.0")]
++	public enum AnimationMode {
++		CUSTOM_MODE,
++		LINEAR,
++		EASE_IN_QUAD,
++		EASE_OUT_QUAD,
++		EASE_IN_OUT_QUAD,
++		EASE_IN_CUBIC,
++		EASE_OUT_CUBIC,
++		EASE_IN_OUT_CUBIC,
++		EASE_IN_QUART,
++		EASE_OUT_QUART,
++		EASE_IN_OUT_QUART,
++		EASE_IN_QUINT,
++		EASE_OUT_QUINT,
++		EASE_IN_OUT_QUINT,
++		EASE_IN_SINE,
++		EASE_OUT_SINE,
++		EASE_IN_OUT_SINE,
++		EASE_IN_EXPO,
++		EASE_OUT_EXPO,
++		EASE_IN_OUT_EXPO,
++		EASE_IN_CIRC,
++		EASE_OUT_CIRC,
++		EASE_IN_OUT_CIRC,
++		EASE_IN_ELASTIC,
++		EASE_OUT_ELASTIC,
++		EASE_IN_OUT_ELASTIC,
++		EASE_IN_BACK,
++		EASE_OUT_BACK,
++		EASE_IN_OUT_BACK,
++		EASE_IN_BOUNCE,
++		EASE_OUT_BOUNCE,
++		EASE_IN_OUT_BOUNCE,
++		STEPS,
++		STEP_START,
++		STEP_END,
++		CUBIC_BEZIER,
++		EASE,
++		EASE_IN,
++		EASE_OUT,
++		EASE_IN_OUT,
++		ANIMATION_LAST
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_BIN_ALIGNMENT_", type_id = "clutter_bin_alignment_get_type ()")]
++	[Version (since = "1.2")]
++	public enum BinAlignment {
++		[Version (deprecated = true)]
++		FIXED,
++		[Version (deprecated = true)]
++		FILL,
++		START,
++		[Version (deprecated = true)]
++		END,
++		[Version (deprecated = true)]
++		CENTER
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_BIND_", type_id = "clutter_bind_coordinate_get_type ()")]
++	[Version (since = "1.4")]
++	public enum BindCoordinate {
++		X,
++		Y,
++		WIDTH,
++		HEIGHT,
++		POSITION,
++		SIZE,
++		ALL
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_BOX_ALIGNMENT_", type_id = "clutter_box_alignment_get_type ()")]
++	[Version (since = "1.2")]
++	public enum BoxAlignment {
++		START,
++		END,
++		CENTER
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_BUTTON_STATE_", type_id = "clutter_button_state_get_type ()")]
++	public enum ButtonState {
++		RELEASED,
++		PRESSED
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_CONTENT_GRAVITY_", type_id = "clutter_content_gravity_get_type ()")]
++	[Version (since = "1.10")]
++	public enum ContentGravity {
++		TOP_LEFT,
++		TOP,
++		TOP_RIGHT,
++		LEFT,
++		CENTER,
++		RIGHT,
++		BOTTOM_LEFT,
++		BOTTOM,
++		BOTTOM_RIGHT,
++		RESIZE_FILL,
++		RESIZE_ASPECT
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_REPEAT_", type_id = "clutter_content_repeat_get_type ()")]
++	[Flags]
++	[Version (since = "1.12")]
++	public enum ContentRepeat {
++		NONE,
++		X_AXIS,
++		Y_AXIS,
++		BOTH
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_DEBUG_", type_id = "clutter_debug_flag_get_type ()")]
++	[Flags]
++	public enum DebugFlag {
++		MISC,
++		ACTOR,
++		TEXTURE,
++		EVENT,
++		PAINT,
++		PANGO,
++		BACKEND,
++		SCHEDULER,
++		SCRIPT,
++		SHADER,
++		MULTISTAGE,
++		ANIMATION,
++		LAYOUT,
++		PICK,
++		EVENTLOOP,
++		CLIPPING,
++		OOB_TRANSFORMS
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_DRAG_", type_id = "clutter_drag_axis_get_type ()")]
++	[Version (since = "1.4")]
++	public enum DragAxis {
++		AXIS_NONE,
++		X_AXIS,
++		Y_AXIS
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_DEBUG_", type_id = "clutter_draw_debug_flag_get_type ()")]
++	[Flags]
++	public enum DrawDebugFlag {
++		DISABLE_SWAP_EVENTS,
++		DISABLE_CLIPPED_REDRAWS,
++		REDRAWS,
++		PAINT_VOLUMES,
++		DISABLE_CULLING,
++		DISABLE_OFFSCREEN_REDIRECT,
++		CONTINUOUS_REDRAW,
++		PAINT_DEFORM_TILES,
++		PAINT_DAMAGE_REGION
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_EFFECT_PAINT_", type_id = "clutter_effect_paint_flags_get_type ()")]
++	[Flags]
++	public enum EffectPaintFlags {
++		ACTOR_DIRTY,
++		BYPASS_EFFECT
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_EVENT_", type_id = "clutter_event_flags_get_type ()")]
++	[Flags]
++	[Version (since = "0.6")]
++	public enum EventFlags {
++		NONE,
++		FLAG_SYNTHETIC,
++		FLAG_INPUT_METHOD,
++		FLAG_REPEATED,
++		FLAG_RELATIVE_MOTION
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_", type_id = "clutter_event_type_get_type ()")]
++	[Version (since = "0.4")]
++	public enum EventType {
++		NOTHING,
++		KEY_PRESS,
++		KEY_RELEASE,
++		MOTION,
++		ENTER,
++		LEAVE,
++		BUTTON_PRESS,
++		BUTTON_RELEASE,
++		SCROLL,
++		TOUCH_BEGIN,
++		TOUCH_UPDATE,
++		TOUCH_END,
++		TOUCH_CANCEL,
++		TOUCHPAD_PINCH,
++		TOUCHPAD_SWIPE,
++		PROXIMITY_IN,
++		PROXIMITY_OUT,
++		PAD_BUTTON_PRESS,
++		PAD_BUTTON_RELEASE,
++		PAD_STRIP,
++		PAD_RING,
++		DEVICE_ADDED,
++		DEVICE_REMOVED,
++		IM_COMMIT,
++		IM_DELETE,
++		IM_PREEDIT,
++		EVENT_LAST
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_FEATURE_", type_id = "clutter_feature_flags_get_type ()")]
++	[Flags]
++	[Version (since = "0.4")]
++	public enum FeatureFlags {
++		STAGE_STATIC,
++		STAGE_CURSOR,
++		SHADERS_GLSL,
++		OFFSCREEN,
++		STAGE_MULTIPLE,
++		SWAP_EVENTS
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_FLOW_", type_id = "clutter_flow_orientation_get_type ()")]
++	[Version (since = "1.2")]
++	public enum FlowOrientation {
++		HORIZONTAL,
++		VERTICAL
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_FRAME_RESULT_", type_id = "clutter_frame_result_get_type ()")]
++	public enum FrameResult {
++		PENDING_PRESENTED,
++		IDLE
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_GESTURE_TRIGGER_EDGE_", type_id = "clutter_gesture_trigger_edge_get_type ()")]
++	[Version (since = "1.18")]
++	public enum GestureTriggerEdge {
++		NONE,
++		AFTER,
++		BEFORE
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_GRAVITY_", type_id = "clutter_gravity_get_type ()")]
++	[Version (deprecated = true, deprecated_since = "1.22", since = "0.2")]
++	public enum Gravity {
++		NONE,
++		NORTH,
++		NORTH_EAST,
++		EAST,
++		SOUTH_EAST,
++		SOUTH,
++		SOUTH_WEST,
++		WEST,
++		NORTH_WEST,
++		CENTER
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_GRID_POSITION_", type_id = "clutter_grid_position_get_type ()")]
++	[Version (since = "1.12")]
++	public enum GridPosition {
++		LEFT,
++		RIGHT,
++		TOP,
++		BOTTOM
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_INIT_", type_id = "clutter_init_error_get_type ()")]
++	[Version (since = "0.2")]
++	public enum InitError {
++		SUCCESS,
++		ERROR_UNKNOWN,
++		ERROR_THREADS,
++		ERROR_BACKEND,
++		ERROR_INTERNAL;
++		public static GLib.Quark quark ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_INPUT_AXIS_", type_id = "clutter_input_axis_get_type ()")]
++	[Version (since = "1.6")]
++	public enum InputAxis {
++		IGNORE,
++		X,
++		Y,
++		PRESSURE,
++		XTILT,
++		YTILT,
++		WHEEL,
++		DISTANCE,
++		ROTATION,
++		SLIDER,
++		LAST
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_INPUT_AXIS_FLAG_", type_id = "clutter_input_axis_flags_get_type ()")]
++	[Flags]
++	public enum InputAxisFlags {
++		NONE,
++		X,
++		Y,
++		PRESSURE,
++		XTILT,
++		YTILT,
++		WHEEL,
++		DISTANCE,
++		ROTATION,
++		SLIDER
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_INPUT_CONTENT_HINT_", type_id = "clutter_input_content_hint_flags_get_type ()")]
++	[Flags]
++	public enum InputContentHintFlags {
++		COMPLETION,
++		SPELLCHECK,
++		AUTO_CAPITALIZATION,
++		LOWERCASE,
++		UPPERCASE,
++		TITLECASE,
++		HIDDEN_TEXT,
++		SENSITIVE_DATA,
++		LATIN,
++		MULTILINE
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_INPUT_CONTENT_PURPOSE_", type_id = "clutter_input_content_purpose_get_type ()")]
++	public enum InputContentPurpose {
++		NORMAL,
++		ALPHA,
++		DIGITS,
++		NUMBER,
++		PHONE,
++		URL,
++		EMAIL,
++		NAME,
++		PASSWORD,
++		DATE,
++		TIME,
++		DATETIME,
++		TERMINAL
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_PAD_FEATURE_", type_id = "clutter_input_device_pad_feature_get_type ()")]
++	public enum InputDevicePadFeature {
++		BUTTON,
++		RING,
++		STRIP
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_INPUT_DEVICE_PAD_SOURCE_", type_id = "clutter_input_device_pad_source_get_type ()")]
++	public enum InputDevicePadSource {
++		UNKNOWN,
++		FINGER
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_INPUT_DEVICE_TOOL_", type_id = "clutter_input_device_tool_type_get_type ()")]
++	[Version (since = "1.28")]
++	public enum InputDeviceToolType {
++		NONE,
++		PEN,
++		ERASER,
++		BRUSH,
++		PENCIL,
++		AIRBRUSH,
++		MOUSE,
++		LENS
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_", type_id = "clutter_input_device_type_get_type ()")]
++	[Version (since = "1.0")]
++	public enum InputDeviceType {
++		POINTER_DEVICE,
++		KEYBOARD_DEVICE,
++		EXTENSION_DEVICE,
++		JOYSTICK_DEVICE,
++		TABLET_DEVICE,
++		TOUCHPAD_DEVICE,
++		TOUCHSCREEN_DEVICE,
++		PEN_DEVICE,
++		ERASER_DEVICE,
++		CURSOR_DEVICE,
++		PAD_DEVICE,
++		N_DEVICE_TYPES
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_INPUT_MODE_", type_id = "clutter_input_mode_get_type ()")]
++	[Version (since = "1.6")]
++	public enum InputMode {
++		LOGICAL,
++		PHYSICAL,
++		FLOATING
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_INPUT_PANEL_STATE_", type_id = "clutter_input_panel_state_get_type ()")]
++	public enum InputPanelState {
++		OFF,
++		ON,
++		TOGGLE
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_INTERPOLATION_", type_id = "clutter_interpolation_get_type ()")]
++	[Version (deprecated = true, deprecated_since = "1.22", since = "1.2")]
++	public enum Interpolation {
++		LINEAR,
++		CUBIC
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_KEY_STATE_", type_id = "clutter_key_state_get_type ()")]
++	public enum KeyState {
++		RELEASED,
++		PRESSED
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_LONG_PRESS_", type_id = "clutter_long_press_state_get_type ()")]
++	[Version (since = "1.8")]
++	public enum LongPressState {
++		QUERY,
++		ACTIVATE,
++		CANCEL
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_", type_id = "clutter_modifier_type_get_type ()")]
++	[Flags]
++	[Version (since = "0.4")]
++	public enum ModifierType {
++		SHIFT_MASK,
++		LOCK_MASK,
++		CONTROL_MASK,
++		MOD1_MASK,
++		MOD2_MASK,
++		MOD3_MASK,
++		MOD4_MASK,
++		MOD5_MASK,
++		BUTTON1_MASK,
++		BUTTON2_MASK,
++		BUTTON3_MASK,
++		BUTTON4_MASK,
++		BUTTON5_MASK,
++		MODIFIER_RESERVED_13_MASK,
++		MODIFIER_RESERVED_14_MASK,
++		MODIFIER_RESERVED_15_MASK,
++		MODIFIER_RESERVED_16_MASK,
++		MODIFIER_RESERVED_17_MASK,
++		MODIFIER_RESERVED_18_MASK,
++		MODIFIER_RESERVED_19_MASK,
++		MODIFIER_RESERVED_20_MASK,
++		MODIFIER_RESERVED_21_MASK,
++		MODIFIER_RESERVED_22_MASK,
++		MODIFIER_RESERVED_23_MASK,
++		MODIFIER_RESERVED_24_MASK,
++		MODIFIER_RESERVED_25_MASK,
++		SUPER_MASK,
++		HYPER_MASK,
++		META_MASK,
++		MODIFIER_RESERVED_29_MASK,
++		RELEASE_MASK,
++		MODIFIER_MASK
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_OFFSCREEN_REDIRECT_", type_id = "clutter_offscreen_redirect_get_type ()")]
++	[Flags]
++	[Version (since = "1.8")]
++	public enum OffscreenRedirect {
++		AUTOMATIC_FOR_OPACITY,
++		ALWAYS,
++		ON_IDLE
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_ORIENTATION_", type_id = "clutter_orientation_get_type ()")]
++	[Version (since = "1.12")]
++	public enum Orientation {
++		HORIZONTAL,
++		VERTICAL
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_PAINT_FLAG_", type_id = "clutter_paint_flag_get_type ()")]
++	[Flags]
++	public enum PaintFlag {
++		NONE,
++		NO_CURSORS,
++		FORCE_CURSORS,
++		CLEAR
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_PAN_", type_id = "clutter_pan_axis_get_type ()")]
++	[Version (since = "1.12")]
++	public enum PanAxis {
++		AXIS_NONE,
++		X_AXIS,
++		Y_AXIS,
++		AXIS_AUTO
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_PATH_", type_id = "clutter_path_node_type_get_type ()")]
++	[Version (since = "1.0")]
++	public enum PathNodeType {
++		MOVE_TO,
++		LINE_TO,
++		CURVE_TO,
++		CLOSE,
++		REL_MOVE_TO,
++		REL_LINE_TO,
++		REL_CURVE_TO
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_DEBUG_NOP_", type_id = "clutter_pick_debug_flag_get_type ()")]
++	[Flags]
++	public enum PickDebugFlag {
++		PICKING
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_PICK_", type_id = "clutter_pick_mode_get_type ()")]
++	[Version (since = "1.0")]
++	public enum PickMode {
++		NONE,
++		REACTIVE,
++		ALL
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_A11Y_DWELL_CLICK_TYPE_", type_id = "clutter_pointer_a11y_dwell_click_type_get_type ()")]
++	public enum PointerA11yDwellClickType {
++		NONE,
++		PRIMARY,
++		SECONDARY,
++		MIDDLE,
++		DOUBLE,
++		DRAG
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_A11Y_DWELL_DIRECTION_", type_id = "clutter_pointer_a11y_dwell_direction_get_type ()")]
++	public enum PointerA11yDwellDirection {
++		NONE,
++		LEFT,
++		RIGHT,
++		UP,
++		DOWN
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_A11Y_DWELL_MODE_", type_id = "clutter_pointer_a11y_dwell_mode_get_type ()")]
++	public enum PointerA11yDwellMode {
++		WINDOW,
++		GESTURE
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_A11Y_", type_id = "clutter_pointer_a11y_flags_get_type ()")]
++	[Flags]
++	public enum PointerA11yFlags {
++		SECONDARY_CLICK_ENABLED,
++		DWELL_ENABLED
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_A11Y_TIMEOUT_TYPE_", type_id = "clutter_pointer_a11y_timeout_type_get_type ()")]
++	public enum PointerA11yTimeoutType {
++		SECONDARY_CLICK,
++		DWELL,
++		GESTURE
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_REPAINT_FLAGS_", type_id = "clutter_repaint_flags_get_type ()")]
++	[Flags]
++	[Version (since = "1.10")]
++	public enum RepaintFlags {
++		PRE_PAINT,
++		POST_PAINT
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_REQUEST_", type_id = "clutter_request_mode_get_type ()")]
++	[Version (since = "0.8")]
++	public enum RequestMode {
++		HEIGHT_FOR_WIDTH,
++		WIDTH_FOR_HEIGHT,
++		CONTENT_SIZE
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_", type_id = "clutter_rotate_axis_get_type ()")]
++	[Version (since = "0.4")]
++	public enum RotateAxis {
++		X_AXIS,
++		Y_AXIS,
++		Z_AXIS
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_ROTATE_", type_id = "clutter_rotate_direction_get_type ()")]
++	[Version (deprecated = true, deprecated_since = "1.22", since = "0.4")]
++	public enum RotateDirection {
++		CW,
++		CCW
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_SCALING_FILTER_", type_id = "clutter_scaling_filter_get_type ()")]
++	[Version (since = "1.10")]
++	public enum ScalingFilter {
++		LINEAR,
++		NEAREST,
++		TRILINEAR
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_SCROLL_", type_id = "clutter_scroll_direction_get_type ()")]
++	[Version (since = "0.4")]
++	public enum ScrollDirection {
++		UP,
++		DOWN,
++		LEFT,
++		RIGHT,
++		SMOOTH
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_SCROLL_FINISHED_", type_id = "clutter_scroll_finish_flags_get_type ()")]
++	[Flags]
++	[Version (since = "1.26")]
++	public enum ScrollFinishFlags {
++		NONE,
++		HORIZONTAL,
++		VERTICAL
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_SCROLL_", type_id = "clutter_scroll_mode_get_type ()")]
++	[Flags]
++	[Version (since = "1.12")]
++	public enum ScrollMode {
++		NONE,
++		HORIZONTALLY,
++		VERTICALLY,
++		BOTH
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_SCROLL_SOURCE_", type_id = "clutter_scroll_source_get_type ()")]
++	[Version (since = "1.26")]
++	public enum ScrollSource {
++		UNKNOWN,
++		WHEEL,
++		FINGER,
++		CONTINUOUS
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_", type_id = "clutter_shader_type_get_type ()")]
++	[Version (since = "1.4")]
++	public enum ShaderType {
++		VERTEX_SHADER,
++		FRAGMENT_SHADER
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_SNAP_EDGE_", type_id = "clutter_snap_edge_get_type ()")]
++	[Version (since = "1.6")]
++	public enum SnapEdge {
++		TOP,
++		RIGHT,
++		BOTTOM,
++		LEFT
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_COLOR_", type_id = "clutter_static_color_get_type ()")]
++	[Version (since = "1.6")]
++	public enum StaticColor {
++		WHITE,
++		BLACK,
++		RED,
++		DARK_RED,
++		GREEN,
++		DARK_GREEN,
++		BLUE,
++		DARK_BLUE,
++		CYAN,
++		DARK_CYAN,
++		MAGENTA,
++		DARK_MAGENTA,
++		YELLOW,
++		DARK_YELLOW,
++		GRAY,
++		DARK_GRAY,
++		LIGHT_GRAY,
++		BUTTER,
++		BUTTER_LIGHT,
++		BUTTER_DARK,
++		ORANGE,
++		ORANGE_LIGHT,
++		ORANGE_DARK,
++		CHOCOLATE,
++		CHOCOLATE_LIGHT,
++		CHOCOLATE_DARK,
++		CHAMELEON,
++		CHAMELEON_LIGHT,
++		CHAMELEON_DARK,
++		SKY_BLUE,
++		SKY_BLUE_LIGHT,
++		SKY_BLUE_DARK,
++		PLUM,
++		PLUM_LIGHT,
++		PLUM_DARK,
++		SCARLET_RED,
++		SCARLET_RED_LIGHT,
++		SCARLET_RED_DARK,
++		ALUMINIUM_1,
++		ALUMINIUM_2,
++		ALUMINIUM_3,
++		ALUMINIUM_4,
++		ALUMINIUM_5,
++		ALUMINIUM_6,
++		TRANSPARENT
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_STEP_MODE_", type_id = "clutter_step_mode_get_type ()")]
++	[Version (since = "1.12")]
++	public enum StepMode {
++		START,
++		END
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_SWIPE_DIRECTION_", type_id = "clutter_swipe_direction_get_type ()")]
++	[Flags]
++	[Version (since = "1.8")]
++	public enum SwipeDirection {
++		UP,
++		DOWN,
++		LEFT,
++		RIGHT
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_TEXT_DIRECTION_", type_id = "clutter_text_direction_get_type ()")]
++	[Version (since = "1.2")]
++	public enum TextDirection {
++		DEFAULT,
++		LTR,
++		RTL
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_TEXTURE_", type_id = "clutter_texture_flags_get_type ()")]
++	[Flags]
++	[Version (deprecated = true, deprecated_since = "1.22", since = "0.4")]
++	public enum TextureFlags {
++		NONE,
++		RGB_FLAG_BGR,
++		RGB_FLAG_PREMULT,
++		YUV_FLAG_YUV2
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_TEXTURE_QUALITY_", type_id = "clutter_texture_quality_get_type ()")]
++	[Version (deprecated = true, deprecated_since = "1.22", since = "0.8")]
++	public enum TextureQuality {
++		LOW,
++		MEDIUM,
++		HIGH
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_TIMELINE_", type_id = "clutter_timeline_direction_get_type ()")]
++	[Version (since = "0.6")]
++	public enum TimelineDirection {
++		FORWARD,
++		BACKWARD
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_TOUCHPAD_GESTURE_PHASE_", type_id = "clutter_touchpad_gesture_phase_get_type ()")]
++	[Version (since = "1.24")]
++	public enum TouchpadGesturePhase {
++		BEGIN,
++		UPDATE,
++		END,
++		CANCEL
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_UNIT_", type_id = "clutter_unit_type_get_type ()")]
++	[Version (since = "1.0")]
++	public enum UnitType {
++		PIXEL,
++		EM,
++		MM,
++		POINT,
++		CM
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_VIRTUAL_DEVICE_TYPE_", type_id = "clutter_virtual_device_type_get_type ()")]
++	[Flags]
++	public enum VirtualDeviceType {
++		NONE,
++		KEYBOARD,
++		POINTER,
++		TOUCHSCREEN
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_ZOOM_", type_id = "clutter_zoom_axis_get_type ()")]
++	[Version (since = "1.12")]
++	public enum ZoomAxis {
++		X_AXIS,
++		Y_AXIS,
++		BOTH
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_IMAGE_ERROR_INVALID_")]
++	[Version (since = "1.10")]
++	public errordomain ImageError {
++		DATA;
++		public static GLib.Quark quark ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_SCRIPT_ERROR_INVALID_")]
++	[Version (since = "0.6")]
++	public errordomain ScriptError {
++		TYPE_FUNCTION,
++		PROPERTY,
++		VALUE;
++		public static GLib.Quark quark ();
++	}
++	[CCode (cheader_filename = "clutter/clutter.h", instance_pos = 1.9)]
++	[Version (since = "1.24")]
++	public delegate Clutter.Actor ActorCreateChildFunc (GLib.Object item);
++	[CCode (cheader_filename = "clutter/clutter.h", instance_pos = 4.9)]
++	[Version (since = "1.0")]
++	public delegate bool BindingActionFunc (GLib.Object gobject, string action_name, uint key_val, Clutter.ModifierType modifiers);
++	[CCode (cheader_filename = "clutter/clutter.h", instance_pos = 1.9)]
++	public delegate void Callback (Clutter.Actor actor);
++	[CCode (cheader_filename = "clutter/clutter.h", instance_pos = 1.9)]
++	[Version (since = "1.18")]
++	public delegate bool EventFilterFunc (Clutter.Event event);
++	[CCode (cheader_filename = "clutter/clutter.h", instance_pos = 1.9)]
++	[Version (since = "1.0")]
++	public delegate void PathCallback (Clutter.PathNode node);
++	[CCode (cheader_filename = "clutter/clutter.h", has_target = false)]
++	[Version (since = "1.0")]
++	public delegate bool ProgressFunc (GLib.Value a, GLib.Value b, double progress, GLib.Value retval);
++	[CCode (cheader_filename = "clutter/clutter.h", instance_pos = 6.9)]
++	[Version (since = "0.6")]
++	public delegate void ScriptConnectFunc (Clutter.Script script, GLib.Object object, string signal_name, string handler_name, GLib.Object connect_object, GLib.ConnectFlags flags);
++	[CCode (cheader_filename = "clutter/clutter.h", instance_pos = 3.9)]
++	[Version (since = "1.10")]
++	public delegate double TimelineProgressFunc (Clutter.Timeline timeline, double elapsed, double total);
++	[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_COGL")]
++	[Version (deprecated = true, deprecated_since = "1.10", since = "0.4")]
++	public const string COGL;
++	[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_CURRENT_TIME")]
++	[Version (since = "0.4")]
++	public const int CURRENT_TIME;
++	[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_FLAVOUR")]
++	[Version (deprecated = true, deprecated_since = "1.10", since = "0.4")]
++	public const string FLAVOUR;
++	[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_PATH_RELATIVE")]
++	public const int PATH_RELATIVE;
++	[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_PRIORITY_REDRAW")]
++	[Version (since = "0.8")]
++	public const int PRIORITY_REDRAW;
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	public static void base_init ();
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	[Version (since = "1.12")]
++	public static void cairo_clear (Cairo.Context cr);
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	[Version (since = "1.0")]
++	public static void cairo_set_source_color (Cairo.Context cr, Clutter.Color color);
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	[Version (since = "1.6")]
++	public static unowned Clutter.Color? color_get_static (Clutter.StaticColor color);
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	[Version (since = "1.14")]
++	public static void disable_accessibility ();
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	[Version (since = "0.4")]
++	public static void do_event (Clutter.Event event);
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	[Version (since = "0.4")]
++	public static bool events_pending ();
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	[Version (since = "1.4")]
++	public static bool get_accessibility_enabled ();
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	[Version (since = "1.2")]
++	public static unowned Clutter.Event get_current_event ();
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	[Version (since = "1.0")]
++	public static uint32 get_current_event_time ();
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	[Version (since = "0.4")]
++	public static unowned Clutter.Backend get_default_backend ();
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	[Version (since = "0.6")]
++	public static uint get_default_frame_rate ();
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	[Version (since = "1.2")]
++	public static Clutter.TextDirection get_default_text_direction ();
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	[Version (since = "1.0")]
++	public static unowned Pango.FontMap get_font_map ();
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	[Version (since = "0.2")]
++	public static GLib.OptionGroup get_option_group ();
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	[Version (since = "0.8")]
++	public static GLib.OptionGroup get_option_group_without_init ();
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	[Version (since = "0.6")]
++	public static unowned string get_script_id (GLib.Object gobject);
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	public static Clutter.InitError init ([CCode (array_length_cname = "argc", array_length_pos = 0.5)] ref unowned string[]? argv);
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	[Version (since = "0.2")]
++	public static Clutter.InitError init_with_args ([CCode (array_length_cname = "argc", array_length_pos = 0.5)] ref unowned string[]? argv, string? parameter_string, [CCode (array_length = false)] GLib.OptionEntry[]? entries, string? translation_domain) throws GLib.Error;
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	public static uint32 keysym_to_unicode (uint keyval);
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	public static void set_custom_backend_func (void* func);
++	[CCode (cheader_filename = "clutter/clutter.h")]
++	[Version (since = "1.10")]
++	public static uint unicode_to_keysym (uint32 wc);
++}
+diff --git vapi/mutter-cogl-7.vapi vapi/mutter-cogl-7.vapi
+index 620c2317..1aae97d5 100644
+--- vapi/mutter-cogl-7.vapi
++++ vapi/mutter-cogl-7.vapi
+@@ -32,7 +32,9 @@ namespace Cogl {
+ 	public class Context : Cogl.Object {
+ 		[CCode (has_construct_function = false)]
+ 		protected Context ();
++		public unowned Cogl.Pipeline get_named_pipeline (Cogl.PipelineKey key);
+ 		public bool is_hardware_accelerated ();
++		public void set_named_pipeline (Cogl.PipelineKey key, Cogl.Pipeline? pipeline);
+ 	}
+ 	[CCode (cheader_filename = "cogl/cogl.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "cogl_frame_closure_get_gtype ()")]
+ 	[Compact]
+@@ -270,6 +272,10 @@ namespace Cogl {
+ 		[Version (since = "2.0")]
+ 		public void set_user_program (Cogl.Handle program);
+ 	}
++	[CCode (cheader_filename = "cogl/cogl.h", type_id = "G_TYPE_STRING")]
++	[Compact]
++	public class PipelineKey : string {
++	}
+ 	[CCode (cheader_filename = "cogl/cogl.h")]
+ 	[Compact]
+ 	public class PixelBuffer : Cogl.Handle {
+diff --git vapi/mutter-cogl-8-custom.vala vapi/mutter-cogl-8-custom.vala
+new file mode 100644
+index 00000000..c4d4b93a
+--- /dev/null
++++ vapi/mutter-cogl-8-custom.vala
+@@ -0,0 +1,119 @@
++namespace Cogl {
++	[Compact]
++	[CCode (cname = "CoglHandle")]
++	public class Buffer: Handle {
++		public uint get_size ();
++		public bool set_data (size_t offset, [CCode (array_length_type = "size_t")] uint8[] data);
++		public void unmap ();
++	}
++
++	[CCode (has_type_id = false)]
++	public struct Color {
++		public Color.from_4f (float red, float green, float blue, float alpha);
++		public Color.from_4ub (uint8 red, uint8 green, uint8 blue, uint8 alpha);
++	}
++
++	[Compact]
++	[CCode (ref_function = "cogl_handle_ref", unref_function = "cogl_handle_unref")]
++	public class Handle {
++		[CCode (cname = "cogl_is_bitmap")]
++		public bool is_bitmap ();
++		[CCode (cname = "cogl_is_buffer")]
++		public bool is_buffer ();
++		[CCode (cname = "cogl_is_material")]
++		public bool is_material ();
++		[CCode (cname = "cogl_is_offscreen")]
++		public bool is_offscreen ();
++		[CCode (cname = "cogl_is_pixel_buffer")]
++		public bool is_pixel_buffer ();
++		[CCode (cname = "cogl_is_program")]
++		public bool is_program ();
++		[CCode (cname = "cogl_is_shader")]
++		public bool is_shader ();
++		[CCode (cname = "cogl_is_texture")]
++		public bool is_texture ();
++		[CCode (cname = "cogl_is_vertex_buffer")]
++		public bool is_vertex_buffer ();
++	}
++
++	[CCode (cheader_filename = "cogl/cogl.h", copy_function = "cogl_path_copy")]
++	[Compact]
++	public class Path {
++		public static void @new ();
++	}
++
++	[Compact]
++	public class PixelBuffer: Handle {
++		public PixelBuffer (uint size);
++		public PixelBuffer.for_size (uint width, uint height, Cogl.PixelFormat format, uint stride);
++	}
++
++	[Compact]
++	[CCode (cname = "CoglHandle", ref_function = "cogl_program_ref", unref_function = "cogl_program_unref")]
++	public class Program: Handle {
++		[CCode (cname = "cogl_create_program", type = "CoglHandle*", has_construct_function = false)]
++		public Program ();
++		public void attach_shader (Cogl.Shader shader_handle);
++		public int get_uniform_location (string uniform_name);
++		public void link ();
++		public static void uniform_1f (int uniform_no, float value);
++		public static void uniform_1i (int uniform_no, int value);
++		public static void uniform_float (int uniform_no, int size, [CCode (array_length_pos = 2.9)] float[] value);
++		public static void uniform_int (int uniform_no, int size, [CCode (array_length_pos = 2.9)] int[] value);
++		public static void uniform_matrix (int uniform_no, int size, bool transpose, [CCode (array_length_pos = 2.9)] float[] value);
++		public void use ();
++	}
++
++	[Compact]
++	[CCode (cname = "CoglHandle", ref_function = "cogl_shader_ref", unref_function = "cogl_shader_unref")]
++	public class Shader: Handle {
++		[CCode (cname = "cogl_create_shader", type = "CoglHandle*", has_construct_function = false)]
++		public Shader (Cogl.ShaderType shader_type);
++		public void compile ();
++		public string get_info_log ();
++		public Cogl.ShaderType get_type ();
++		public bool is_compiled ();
++		public void source (string source);
++	}
++
++	[Compact]
++	[CCode (cname = "CoglHandle", ref_function = "cogl_vertex_buffer_ref", unref_function = "cogl_vertex_buffer_unref")]
++	public class VertexBuffer: Handle {
++		[CCode (type = "CoglHandle*", has_construct_function = false)]
++		public VertexBuffer (uint n_vertices);
++		public void add (string attribute_name, uchar n_components, Cogl.AttributeType type, bool normalized, uint16 stride, void* pointer);
++		public void delete (string attribute_name);
++		public void disable (string attribute_name);
++		public void draw (Cogl.VerticesMode mode, int first, int count);
++		public void draw_elements (Cogl.VerticesMode mode, VertexBufferIndices indices, int min_index, int max_index, int indices_offset, int count);
++		public void enable (string attribute_name);
++		public uint get_n_vertices ();
++		public void submit ();
++	}
++
++	[Compact]
++	[CCode (cname = "CoglHandle")]
++	public class VertexBufferIndices: Handle {
++		public VertexBufferIndices (Cogl.IndicesType indices_type, void* indices_array, int indices_len);
++		public static unowned Cogl.VertexBufferIndices get_for_quads (uint n_indices);
++		public Cogl.IndicesType get_type ();
++	}
++
++	[CCode (type_id = "COGL_TYPE_MATRIX", cheader_filename = "cogl/cogl.h")]
++	public struct Matrix {
++		[CCode (cname = "cogl_matrix_init_from_array", array_length = false, array_null_terminated = false)]
++		public Matrix.from_array ([CCode (array_length = false)] float[] array);
++		[CCode (cname = "cogl_matrix_init_identity")]
++		public Matrix.identity ();
++		[CCode (cname = "cogl_matrix_multiply")]
++		public Matrix.multiply (Cogl.Matrix a, Cogl.Matrix b);
++	}
++
++	[SimpleType]
++	[GIR (name = "Bool")]
++	[BooleanType]
++	public struct Bool : bool {
++	}
++
++	public static GLib.Callback get_proc_address(string s);
++}
+diff --git vapi/mutter-cogl-8.deps vapi/mutter-cogl-8.deps
+new file mode 100644
+index 00000000..98ccac5b
+--- /dev/null
++++ vapi/mutter-cogl-8.deps
+@@ -0,0 +1 @@
++pango
+diff --git vapi/mutter-cogl-8.vapi vapi/mutter-cogl-8.vapi
+new file mode 100644
+index 00000000..c17c124e
+--- /dev/null
++++ vapi/mutter-cogl-8.vapi
+@@ -0,0 +1,1091 @@
++/* mutter-cogl-8.vapi generated by vapigen, do not modify. */
++
++[CCode (cprefix = "Cogl", gir_namespace = "Cogl", gir_version = "8", lower_case_cprefix = "cogl_")]
++namespace Cogl {
++	[CCode (cheader_filename = "cogl/cogl.h", type_id = "cogl_bitmap_get_gtype ()")]
++	public class Bitmap : Cogl.Object {
++		[CCode (has_construct_function = false)]
++		protected Bitmap ();
++		public static uint32 error_quark ();
++		[CCode (has_construct_function = false)]
++		[Version (since = "1.0")]
++		public Bitmap.from_file (string filename) throws GLib.Error;
++		[Version (since = "1.10")]
++		public Cogl.PixelFormat get_format ();
++		[Version (since = "1.10")]
++		public int get_height ();
++		[Version (since = "1.10")]
++		public int get_rowstride ();
++		[Version (since = "1.0")]
++		public static bool get_size_from_file (string filename, out int width, out int height);
++		[Version (since = "1.10")]
++		public int get_width ();
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cname = "CoglHandle")]
++	[Compact]
++	public class Buffer : Cogl.Handle {
++		public uint get_size ();
++		public bool set_data (size_t offset, [CCode (array_length_type = "size_t")] uint8[] data);
++		public void unmap ();
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", type_id = "cogl_context_get_gtype ()")]
++	public class Context : Cogl.Object {
++		[CCode (has_construct_function = false)]
++		protected Context ();
++		public unowned Cogl.Pipeline get_named_pipeline (Cogl.PipelineKey key);
++		public bool is_hardware_accelerated ();
++		public void set_named_pipeline (Cogl.PipelineKey key, Cogl.Pipeline? pipeline);
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "cogl_frame_closure_get_gtype ()")]
++	[Compact]
++	[Version (since = "1.14")]
++	public class FrameClosure {
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", type_id = "cogl_frame_info_get_gtype ()")]
++	public class FrameInfo : Cogl.Object {
++		[CCode (has_construct_function = false)]
++		protected FrameInfo ();
++		[Version (since = "1.14")]
++		public int64 get_frame_counter ();
++		public bool get_is_symbolic ();
++		[Version (since = "1.14")]
++		public int64 get_presentation_time ();
++		[Version (since = "1.14")]
++		public float get_refresh_rate ();
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", type_id = "cogl_framebuffer_get_type ()")]
++	public abstract class Framebuffer : GLib.Object {
++		[CCode (has_construct_function = false)]
++		protected Framebuffer ();
++		[Version (since = "1.8")]
++		public virtual bool allocate () throws GLib.Error;
++		[Version (since = "1.8")]
++		public void clear (ulong buffers, Cogl.Color color);
++		[Version (since = "1.8")]
++		public void clear4f (ulong buffers, float red, float green, float blue, float alpha);
++		[Version (since = "1.8")]
++		public void discard_buffers (ulong buffers);
++		[Version (since = "1.10")]
++		public void draw_multitextured_rectangle (Cogl.Pipeline pipeline, float x_1, float y_1, float x_2, float y_2, [CCode (array_length = false)] float[] tex_coords, int tex_coords_len);
++		[Version (since = "1.10")]
++		public void draw_rectangle (Cogl.Pipeline pipeline, float x_1, float y_1, float x_2, float y_2);
++		[Version (since = "1.10")]
++		public void draw_rectangles (Cogl.Pipeline pipeline, [CCode (array_length = false)] float[] coordinates, uint n_rectangles);
++		[Version (since = "1.10")]
++		public void draw_textured_rectangle (Cogl.Pipeline pipeline, float x_1, float y_1, float x_2, float y_2, float s_1, float t_1, float s_2, float t_2);
++		[Version (since = "1.10")]
++		public void draw_textured_rectangles (Cogl.Pipeline pipeline, [CCode (array_length = false)] float[] coordinates, uint n_rectangles);
++		public static uint32 error_quark ();
++		[Version (since = "1.10")]
++		public void finish ();
++		public void flush ();
++		[Version (since = "1.10")]
++		public void frustum (float left, float right, float bottom, float top, float z_near, float z_far);
++		[Version (since = "1.8")]
++		public int get_alpha_bits ();
++		[Version (since = "1.8")]
++		public int get_blue_bits ();
++		[Version (since = "1.8")]
++		public unowned Cogl.Context get_context ();
++		[Version (since = "2.0")]
++		public int get_depth_bits ();
++		[Version (since = "1.18")]
++		public bool get_depth_write_enabled ();
++		[Version (since = "1.8")]
++		public bool get_dither_enabled ();
++		[Version (since = "1.8")]
++		public int get_green_bits ();
++		[Version (since = "1.8")]
++		public int get_height ();
++		public bool get_is_stereo ();
++		[Version (since = "1.10")]
++		public void get_modelview_matrix (out unowned Graphene.Matrix matrix);
++		[Version (since = "1.10")]
++		public void get_projection_matrix (out unowned Graphene.Matrix matrix);
++		[Version (since = "1.8")]
++		public int get_red_bits ();
++		[Version (since = "1.10")]
++		public int get_samples_per_pixel ();
++		[Version (since = "1.20")]
++		public Cogl.StereoMode get_stereo_mode ();
++		[Version (since = "1.8")]
++		public void get_viewport4fv ([CCode (array_length = false)] out unowned float viewport[4]);
++		[Version (since = "1.8")]
++		public float get_viewport_height ();
++		[Version (since = "1.8")]
++		public float get_viewport_width ();
++		[Version (since = "1.8")]
++		public float get_viewport_x ();
++		[Version (since = "1.8")]
++		public float get_viewport_y ();
++		[Version (since = "1.8")]
++		public int get_width ();
++		[Version (since = "1.10")]
++		public void identity_matrix ();
++		[NoWrapper]
++		public virtual bool is_y_flipped ();
++		[Version (since = "1.10")]
++		public void orthographic (float x_1, float y_1, float x_2, float y_2, float near, float far);
++		[Version (since = "1.10")]
++		public void perspective (float fov_y, float aspect, float z_near, float z_far);
++		[Version (since = "1.10")]
++		public void pop_clip ();
++		[Version (since = "1.10")]
++		public void pop_matrix ();
++		[Version (since = "1.10")]
++		public void push_matrix ();
++		[Version (since = "1.10")]
++		public void push_rectangle_clip (float x_1, float y_1, float x_2, float y_2);
++		public void push_region_clip (Cairo.Region region);
++		[Version (since = "1.10")]
++		public void push_scissor_clip (int x, int y, int width, int height);
++		[Version (since = "1.10")]
++		public bool read_pixels (int x, int y, int width, int height, Cogl.PixelFormat format, uint8 pixels);
++		[Version (since = "1.10")]
++		public bool read_pixels_into_bitmap (int x, int y, Cogl.ReadPixelsFlags source, Cogl.Bitmap bitmap);
++		[Version (since = "1.8")]
++		public void resolve_samples ();
++		[Version (since = "1.8")]
++		public void resolve_samples_region (int x, int y, int width, int height);
++		[Version (since = "1.10")]
++		public void rotate (float angle, float x, float y, float z);
++		[Version (since = "2.0")]
++		public void rotate_euler (Graphene.Euler euler);
++		[Version (since = "1.10")]
++		public void scale (float x, float y, float z);
++		[Version (since = "1.18")]
++		public void set_depth_write_enabled (bool depth_write_enabled);
++		[Version (since = "1.8")]
++		public void set_dither_enabled (bool dither_enabled);
++		[Version (since = "1.10")]
++		public void set_modelview_matrix (Graphene.Matrix matrix);
++		[Version (since = "1.10")]
++		public void set_projection_matrix (Graphene.Matrix matrix);
++		[Version (since = "1.8")]
++		public void set_samples_per_pixel (int samples_per_pixel);
++		[Version (since = "1.20")]
++		public void set_stereo_mode (Cogl.StereoMode stereo_mode);
++		[Version (since = "1.8")]
++		public void set_viewport (float x, float y, float width, float height);
++		[Version (since = "1.10")]
++		public void transform (Graphene.Matrix matrix);
++		[Version (since = "1.10")]
++		public void translate (float x, float y, float z);
++		[NoAccessorMethod]
++		public void* driver_config { get; construct; }
++		[NoAccessorMethod]
++		public int height { get; set construct; }
++		[NoAccessorMethod]
++		public int width { get; set construct; }
++		public signal void destroy ();
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", has_type_id = false)]
++	[Compact]
++	public class FramebufferDriverConfig {
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", ref_function = "cogl_handle_ref", unref_function = "cogl_handle_unref")]
++	[Compact]
++	public class Handle {
++		[CCode (cname = "cogl_is_bitmap")]
++		public bool is_bitmap ();
++		[CCode (cname = "cogl_is_buffer")]
++		public bool is_buffer ();
++		[CCode (cname = "cogl_is_material")]
++		public bool is_material ();
++		[CCode (cname = "cogl_is_offscreen")]
++		public bool is_offscreen ();
++		[CCode (cname = "cogl_is_pixel_buffer")]
++		public bool is_pixel_buffer ();
++		[CCode (cname = "cogl_is_program")]
++		public bool is_program ();
++		[CCode (cname = "cogl_is_shader")]
++		public bool is_shader ();
++		[CCode (cname = "cogl_is_texture")]
++		public bool is_texture ();
++		[CCode (cname = "cogl_is_vertex_buffer")]
++		public bool is_vertex_buffer ();
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "cogl_material_get_type ()")]
++	[Compact]
++	public class Material {
++		[CCode (has_construct_function = false)]
++		[Version (deprecated = true, deprecated_since = "1.16")]
++		public Material ();
++		[Version (deprecated = true, deprecated_since = "1.16", since = "1.0")]
++		public void set_alpha_test_function (Cogl.MaterialAlphaFunc alpha_func, float alpha_reference);
++		[Version (deprecated = true, deprecated_since = "1.16", since = "1.0")]
++		public bool set_blend (string blend_string) throws GLib.Error;
++		[Version (deprecated = true, deprecated_since = "1.16", since = "1.0")]
++		public void set_blend_constant (Cogl.Color constant_color);
++		[Version (deprecated = true, deprecated_since = "1.16", since = "1.0")]
++		public void set_color (Cogl.Color color);
++		[Version (deprecated = true, deprecated_since = "1.16", since = "1.0")]
++		public void set_color4ub (uint8 red, uint8 green, uint8 blue, uint8 alpha);
++		[Version (deprecated = true, deprecated_since = "1.16", since = "1.0")]
++		public void set_layer (int layer_index, Cogl.Handle texture);
++		[Version (deprecated = true, deprecated_since = "1.16", since = "1.0")]
++		public bool set_layer_combine (int layer_index, string blend_string) throws GLib.Error;
++		[Version (deprecated = true, deprecated_since = "1.16", since = "1.0")]
++		public void set_layer_combine_constant (int layer_index, Cogl.Color constant);
++		[Version (deprecated = true, deprecated_since = "1.16")]
++		public void set_layer_filters (int layer_index, Cogl.MaterialFilter min_filter, Cogl.MaterialFilter mag_filter);
++		[Version (deprecated = true, deprecated_since = "1.16")]
++		public void set_layer_matrix (int layer_index, Graphene.Matrix matrix);
++		[Version (deprecated = true, deprecated_since = "1.16", since = "1.4")]
++		public bool set_layer_point_sprite_coords_enabled (int layer_index, bool enable) throws GLib.Error;
++		[Version (deprecated = true, deprecated_since = "1.16", since = "1.4")]
++		public void set_point_size (float point_size);
++		[Version (deprecated = true, deprecated_since = "1.16", since = "1.4")]
++		public void set_user_program (Cogl.Handle program);
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", has_type_id = false)]
++	[Compact]
++	public class MaterialLayer {
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", type_id = "cogl_object_get_gtype ()")]
++	public abstract class Object {
++		[CCode (has_construct_function = false)]
++		protected Object ();
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", type_id = "cogl_offscreen_get_type ()")]
++	public class Offscreen : Cogl.Framebuffer {
++		[CCode (has_construct_function = false)]
++		protected Offscreen ();
++		[CCode (has_construct_function = false)]
++		public Offscreen.with_texture (Cogl.Texture texture);
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", type_id = "cogl_onscreen_get_type ()")]
++	public class Onscreen : Cogl.Framebuffer {
++		[CCode (has_construct_function = false)]
++		protected Onscreen ();
++		[Version (since = "1.16")]
++		public Cogl.OnscreenDirtyClosure add_dirty_callback ([CCode (delegate_target_pos = 1.5)] Cogl.OnscreenDirtyCallback callback, Cogl.UserDataDestroyCallback? destroy);
++		[Version (since = "1.14")]
++		public Cogl.FrameClosure add_frame_callback ([CCode (delegate_target_pos = 1.5)] Cogl.FrameCallback callback, Cogl.UserDataDestroyCallback? destroy);
++		[NoWrapper]
++		public virtual void bind ();
++		[Version (since = "1.14")]
++		public virtual int get_buffer_age ();
++		[Version (since = "1.14")]
++		public int64 get_frame_counter ();
++		[Version (since = "2.0")]
++		public void hide ();
++		[Version (since = "1.16")]
++		public void remove_dirty_callback (Cogl.OnscreenDirtyClosure closure);
++		[Version (since = "1.14")]
++		public void remove_frame_callback (Cogl.FrameClosure closure);
++		[Version (since = "2.0")]
++		public void show ();
++		[Version (since = "1.10")]
++		public void swap_buffers (Cogl.FrameInfo frame_info, void* user_data);
++		[Version (since = "1.16")]
++		public virtual void swap_buffers_with_damage (int rectangles, int n_rectangles, Cogl.FrameInfo info);
++		[Version (since = "1.10")]
++		public virtual void swap_region (int rectangles, int n_rectangles, Cogl.FrameInfo info);
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "cogl_onscreen_dirty_closure_get_gtype ()")]
++	[Compact]
++	[Version (since = "1.16")]
++	public class OnscreenDirtyClosure {
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", copy_function = "cogl_path_copy")]
++	[Compact]
++	public class Path {
++		public static void @new ();
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", type_id = "cogl_pipeline_get_gtype ()")]
++	public class Pipeline : Cogl.Object {
++		[CCode (has_construct_function = false)]
++		[Version (since = "2.0")]
++		public Pipeline (Cogl.Context context);
++		[Version (since = "2.0")]
++		public Cogl.Pipeline copy ();
++		[Version (since = "2.0")]
++		public void foreach_layer (Cogl.PipelineLayerCallback callback);
++		[Version (since = "2.0")]
++		public Cogl.PipelineAlphaFunc get_alpha_test_function ();
++		[Version (since = "2.0")]
++		public float get_alpha_test_reference ();
++		[Version (since = "2.0")]
++		public Cogl.Color get_color ();
++		[Version (since = "2.0")]
++		public Cogl.PipelineCullFaceMode get_cull_face_mode ();
++		[Version (since = "2.0")]
++		public Cogl.Winding get_front_face_winding ();
++		[Version (since = "1.10")]
++		public Cogl.PipelineFilter get_layer_mag_filter (int layer_index);
++		[Version (since = "1.10")]
++		public Cogl.PipelineFilter get_layer_min_filter (int layer_index);
++		[Version (since = "2.0")]
++		public bool get_layer_point_sprite_coords_enabled (int layer_index);
++		[Version (since = "1.10")]
++		public unowned Cogl.Texture get_layer_texture (int layer_index);
++		[Version (since = "1.6")]
++		public Cogl.PipelineWrapMode get_layer_wrap_mode_s (int layer_index);
++		[Version (since = "1.6")]
++		public Cogl.PipelineWrapMode get_layer_wrap_mode_t (int layer_index);
++		[Version (since = "2.0")]
++		public int get_n_layers ();
++		[Version (since = "2.0")]
++		public bool get_per_vertex_point_size ();
++		[Version (since = "2.0")]
++		public float get_point_size ();
++		[Version (since = "2.0")]
++		public int get_uniform_location (string uniform_name);
++		[Version (since = "2.0")]
++		public unowned Cogl.Handle get_user_program ();
++		[Version (since = "1.10")]
++		public void remove_layer (int layer_index);
++		[Version (since = "2.0")]
++		public void set_alpha_test_function (Cogl.PipelineAlphaFunc alpha_func, float alpha_reference);
++		[Version (since = "2.0")]
++		public bool set_blend (string blend_string) throws GLib.Error;
++		[Version (since = "2.0")]
++		public void set_blend_constant (Cogl.Color constant_color);
++		[Version (since = "2.0")]
++		public void set_color (Cogl.Color color);
++		[Version (since = "2.0")]
++		public void set_color4f (float red, float green, float blue, float alpha);
++		[Version (since = "2.0")]
++		public void set_color4ub (uint8 red, uint8 green, uint8 blue, uint8 alpha);
++		[Version (since = "2.0")]
++		public void set_cull_face_mode (Cogl.PipelineCullFaceMode cull_face_mode);
++		[Version (since = "2.0")]
++		public void set_front_face_winding (Cogl.Winding front_winding);
++		[Version (since = "2.0")]
++		public bool set_layer_combine (int layer_index, string blend_string) throws GLib.Error;
++		[Version (since = "2.0")]
++		public void set_layer_combine_constant (int layer_index, Cogl.Color constant);
++		[Version (since = "1.10")]
++		public void set_layer_filters (int layer_index, Cogl.PipelineFilter min_filter, Cogl.PipelineFilter mag_filter);
++		[Version (since = "1.10")]
++		public void set_layer_matrix (int layer_index, Graphene.Matrix matrix);
++		public void set_layer_max_mipmap_level (int layer, int max_level);
++		[Version (since = "1.10")]
++		public void set_layer_null_texture (int layer_index);
++		[Version (since = "2.0")]
++		public bool set_layer_point_sprite_coords_enabled (int layer_index, bool enable) throws GLib.Error;
++		public void set_layer_texture (int layer_index, Cogl.Texture texture);
++		[Version (since = "2.0")]
++		public void set_layer_wrap_mode (int layer_index, Cogl.PipelineWrapMode mode);
++		[Version (since = "2.0")]
++		public void set_layer_wrap_mode_s (int layer_index, Cogl.PipelineWrapMode mode);
++		[Version (since = "2.0")]
++		public void set_layer_wrap_mode_t (int layer_index, Cogl.PipelineWrapMode mode);
++		[Version (since = "2.0")]
++		public bool set_per_vertex_point_size (bool enable) throws GLib.Error;
++		[Version (since = "2.0")]
++		public void set_point_size (float point_size);
++		[Version (since = "2.0")]
++		public void set_uniform_1f (int uniform_location, float value);
++		[Version (since = "2.0")]
++		public void set_uniform_1i (int uniform_location, int value);
++		[Version (since = "2.0")]
++		public void set_uniform_float (int uniform_location, int n_components, int count, float value);
++		[Version (since = "2.0")]
++		public void set_uniform_int (int uniform_location, int n_components, int count, int value);
++		[Version (since = "2.0")]
++		public void set_uniform_matrix (int uniform_location, int dimensions, int count, bool transpose, float value);
++		[Version (since = "2.0")]
++		public void set_user_program (Cogl.Handle program);
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", type_id = "G_TYPE_STRING")]
++	[Compact]
++	public class PipelineKey : string {
++	}
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Compact]
++	public class PixelBuffer : Cogl.Handle {
++		public PixelBuffer (uint size);
++		public PixelBuffer.for_size (uint width, uint height, Cogl.PixelFormat format, uint stride);
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cname = "CoglHandle", ref_function = "cogl_program_ref", unref_function = "cogl_program_unref")]
++	[Compact]
++	public class Program : Cogl.Handle {
++		[CCode (cname = "cogl_create_program", has_construct_function = false, type = "CoglHandle*")]
++		public Program ();
++		public void attach_shader (Cogl.Shader shader_handle);
++		public int get_uniform_location (string uniform_name);
++		public void link ();
++		public static void uniform_1f (int uniform_no, float value);
++		public static void uniform_1i (int uniform_no, int value);
++		public static void uniform_float (int uniform_no, int size, [CCode (array_length_pos = 2.9)] float[] value);
++		public static void uniform_int (int uniform_no, int size, [CCode (array_length_pos = 2.9)] int[] value);
++		public static void uniform_matrix (int uniform_no, int size, bool transpose, [CCode (array_length_pos = 2.9)] float[] value);
++		public void use ();
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", has_type_id = false)]
++	[Compact]
++	public class Scanout {
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cname = "CoglHandle", ref_function = "cogl_shader_ref", unref_function = "cogl_shader_unref")]
++	[Compact]
++	public class Shader : Cogl.Handle {
++		[CCode (cname = "cogl_create_shader", has_construct_function = false, type = "CoglHandle*")]
++		public Shader (Cogl.ShaderType shader_type);
++		public void compile ();
++		public string get_info_log ();
++		public Cogl.ShaderType get_type ();
++		public bool is_compiled ();
++		public void source (string source);
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", lower_case_csuffix = "texture_2d", type_id = "cogl_texture_2d_get_gtype ()")]
++	public class Texture2D : Cogl.Object, Cogl.Texture {
++		[CCode (has_construct_function = false)]
++		protected Texture2D ();
++		public void egl_image_external_alloc_finish (void* user_data, GLib.DestroyNotify destroy);
++		public void egl_image_external_bind ();
++		[CCode (has_construct_function = false)]
++		[Version (since = "2.0")]
++		public Texture2D.from_bitmap (Cogl.Bitmap bitmap);
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", lower_case_csuffix = "texture_2d_sliced", type_id = "cogl_texture_2d_sliced_get_gtype ()")]
++	public class Texture2DSliced : Cogl.Object, Cogl.Texture {
++		[CCode (has_construct_function = false)]
++		protected Texture2DSliced ();
++		[CCode (has_construct_function = false)]
++		[Version (since = "1.16")]
++		public Texture2DSliced.from_bitmap (Cogl.Bitmap bmp, int max_waste);
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cname = "CoglHandle", ref_function = "cogl_vertex_buffer_ref", unref_function = "cogl_vertex_buffer_unref")]
++	[Compact]
++	public class VertexBuffer : Cogl.Handle {
++		[CCode (has_construct_function = false, type = "CoglHandle*")]
++		public VertexBuffer (uint n_vertices);
++		public void add (string attribute_name, uchar n_components, Cogl.AttributeType type, bool normalized, uint16 stride, void* pointer);
++		public void @delete (string attribute_name);
++		public void disable (string attribute_name);
++		public void draw (Cogl.VerticesMode mode, int first, int count);
++		public void draw_elements (Cogl.VerticesMode mode, Cogl.VertexBufferIndices indices, int min_index, int max_index, int indices_offset, int count);
++		public void enable (string attribute_name);
++		public uint get_n_vertices ();
++		public void submit ();
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cname = "CoglHandle")]
++	[Compact]
++	public class VertexBufferIndices : Cogl.Handle {
++		public VertexBufferIndices (Cogl.IndicesType indices_type, void* indices_array, int indices_len);
++		public static unowned Cogl.VertexBufferIndices get_for_quads (uint n_indices);
++		public Cogl.IndicesType get_type ();
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", type_id = "cogl_texture_get_gtype ()")]
++	public interface Texture : Cogl.Object {
++		public bool allocate () throws GLib.Error;
++		public static uint32 error_quark ();
++		[Version (since = "1.18")]
++		public Cogl.TextureComponents get_components ();
++		public int get_data (Cogl.PixelFormat format, uint rowstride, [CCode (array_length = false)] uint8[]? data);
++		public bool get_gl_texture (out uint out_gl_handle, out uint out_gl_target);
++		public uint get_height ();
++		public int get_max_waste ();
++		[Version (since = "1.18")]
++		public bool get_premultiplied ();
++		public uint get_width ();
++		public bool is_sliced ();
++		[Version (deprecated = true, deprecated_since = "1.18", since = "1.0")]
++		public static Cogl.Texture new_from_bitmap (Cogl.Bitmap bitmap, Cogl.TextureFlags flags, Cogl.PixelFormat internal_format);
++		[Version (deprecated = true, deprecated_since = "1.18", since = "0.8")]
++		public static Cogl.Texture new_from_data (int width, int height, Cogl.TextureFlags flags, Cogl.PixelFormat format, Cogl.PixelFormat internal_format, int rowstride, [CCode (array_length = false)] uint8[] data);
++		[Version (deprecated = true, deprecated_since = "1.18", since = "0.8")]
++		public static Cogl.Texture new_from_file (string filename, Cogl.TextureFlags flags, Cogl.PixelFormat internal_format) throws GLib.Error;
++		[Version (deprecated = true, deprecated_since = "1.18", since = "1.2")]
++		public Cogl.Texture new_from_sub_texture (int sub_x, int sub_y, int sub_width, int sub_height);
++		[Version (deprecated = true, deprecated_since = "1.18", since = "0.8")]
++		public static Cogl.Texture new_with_size (uint width, uint height, Cogl.TextureFlags flags, Cogl.PixelFormat internal_format);
++		[Version (since = "1.18")]
++		public void set_components (Cogl.TextureComponents components);
++		public bool set_data (Cogl.PixelFormat format, int rowstride, [CCode (array_length = false)] uint8[] data, int level) throws GLib.Error;
++		[Version (since = "1.18")]
++		public void set_premultiplied (bool premultiplied);
++		public bool set_region (int src_x, int src_y, int dst_x, int dst_y, uint dst_width, uint dst_height, int width, int height, Cogl.PixelFormat format, uint rowstride, [CCode (array_length = false)] uint8[] data);
++		[Version (since = "1.8")]
++		public bool set_region_from_bitmap (int src_x, int src_y, int dst_x, int dst_y, uint dst_width, uint dst_height, Cogl.Bitmap bitmap);
++	}
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[SimpleType]
++	public struct Angle : int32 {
++	}
++	[BooleanType]
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[GIR (name = "Bool")]
++	[SimpleType]
++	public struct Bool : bool {
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", has_type_id = false)]
++	[Version (since = "1.0")]
++	public struct Color {
++		[CCode (has_construct_function = false, type = "CoglColor*")]
++		public Color ();
++		public Cogl.Color? copy ();
++		public void free ();
++		public Color.from_4f (float red, float green, float blue, float alpha);
++		public Color.from_4ub (uint8 red, uint8 green, uint8 blue, uint8 alpha);
++		public float get_alpha ();
++		public uint8 get_alpha_byte ();
++		public float get_alpha_float ();
++		public float get_blue ();
++		public uint8 get_blue_byte ();
++		public float get_blue_float ();
++		public float get_green ();
++		public uint8 get_green_byte ();
++		public float get_green_float ();
++		public float get_red ();
++		public uint8 get_red_byte ();
++		public float get_red_float ();
++		[Version (since = "1.4")]
++		public void init_from_4f (float red, float green, float blue, float alpha);
++		[Version (since = "1.4")]
++		public void init_from_4fv (float color_array);
++		[Version (since = "1.4")]
++		public void init_from_4ub (uint8 red, uint8 green, uint8 blue, uint8 alpha);
++		public void premultiply ();
++		[Version (since = "1.4")]
++		public void set_alpha (float alpha);
++		[Version (since = "1.4")]
++		public void set_alpha_byte (uint8 alpha);
++		[Version (since = "1.4")]
++		public void set_alpha_float (float alpha);
++		[Version (since = "1.4")]
++		public void set_blue (float blue);
++		[Version (since = "1.4")]
++		public void set_blue_byte (uint8 blue);
++		[Version (since = "1.4")]
++		public void set_blue_float (float blue);
++		[Version (since = "1.4")]
++		public void set_green (float green);
++		[Version (since = "1.4")]
++		public void set_green_byte (uint8 green);
++		[Version (since = "1.4")]
++		public void set_green_float (float green);
++		[Version (since = "1.4")]
++		public void set_red (float red);
++		[Version (since = "1.4")]
++		public void set_red_byte (uint8 red);
++		[Version (since = "1.4")]
++		public void set_red_float (float red);
++		[Version (since = "1.16")]
++		public void to_hsl (out float hue, out float saturation, out float luminance);
++		[Version (since = "1.4")]
++		public void unpremultiply ();
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", has_type_id = false)]
++	[Version (since = "1.8")]
++	public struct DebugObjectTypeInfo {
++		public weak string name;
++		public ulong instance_count;
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", type_id = "COGL_TYPE_MATRIX")]
++	public struct Matrix {
++		[CCode (array_length = false, array_null_terminated = false, cname = "cogl_matrix_init_from_array")]
++		public Matrix.from_array ([CCode (array_length = false)] float[] array);
++		[CCode (cname = "cogl_matrix_init_identity")]
++		public Matrix.identity ();
++		[CCode (cname = "cogl_matrix_multiply")]
++		public Matrix.multiply (Cogl.Matrix a, Cogl.Matrix b);
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", has_type_id = false)]
++	[Version (since = "1.16")]
++	public struct OnscreenDirtyInfo {
++		public int x;
++		public int y;
++		public int width;
++		public int height;
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", has_type_id = false)]
++	public struct TextureVertex {
++		public float x;
++		public float y;
++		public float z;
++		public float tx;
++		public float ty;
++		public Cogl.Color color;
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", has_type_id = false)]
++	[Version (since = "1.4")]
++	public struct UserDataKey {
++		public int unused;
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cname = "_CoglColorSizeCheck", has_type_id = false)]
++	public struct _ColorSizeCheck {
++		[CCode (array_length = false)]
++		public weak char[] compile_time_assert_CoglColor_size;
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cname = "_CoglTextureVertexSizeCheck", has_type_id = false)]
++	public struct _TextureVertexSizeCheck {
++		[CCode (array_length = false)]
++		public weak char[] compile_time_assert_CoglTextureVertex_size;
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_ATTRIBUTE_TYPE_", has_type_id = false)]
++	[Version (since = "1.0")]
++	public enum AttributeType {
++		BYTE,
++		UNSIGNED_BYTE,
++		SHORT,
++		UNSIGNED_SHORT,
++		FLOAT
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_BITMAP_ERROR_", has_type_id = false)]
++	[Version (since = "1.4")]
++	public enum BitmapError {
++		FAILED,
++		UNKNOWN_TYPE,
++		CORRUPT_IMAGE
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_BLEND_STRING_ERROR_", has_type_id = false)]
++	[Version (since = "1.0")]
++	public enum BlendStringError {
++		PARSE_ERROR,
++		ARGUMENT_PARSE_ERROR,
++		INVALID_ERROR,
++		GPU_UNSUPPORTED_ERROR;
++		public static uint32 quark ();
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_BUFFER_BIT_", has_type_id = false)]
++	[Flags]
++	[Version (since = "1.0")]
++	public enum BufferBit {
++		COLOR,
++		DEPTH,
++		STENCIL
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_", has_type_id = false)]
++	[Flags]
++	[Version (since = "0.8")]
++	public enum BufferTarget {
++		WINDOW_BUFFER,
++		OFFSCREEN_BUFFER
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_DEPTH_TEST_FUNCTION_", has_type_id = false)]
++	public enum DepthTestFunction {
++		NEVER,
++		LESS,
++		EQUAL,
++		LEQUAL,
++		GREATER,
++		NOTEQUAL,
++		GEQUAL,
++		ALWAYS
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_EGL_IMAGE_FLAG_", has_type_id = false)]
++	[Flags]
++	public enum EglImageFlags {
++		NONE,
++		NO_GET_DATA
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_FEATURE_ID_", has_type_id = false)]
++	[Version (since = "1.10")]
++	public enum FeatureID {
++		[CCode (cname = "COGL_FEATURE_ID_UNSIGNED_INT_INDICES")]
++		OGL_FEATURE_ID_UNSIGNED_INT_INDICES,
++		[CCode (cname = "COGL_FEATURE_ID_MAP_BUFFER_FOR_READ")]
++		OGL_FEATURE_ID_MAP_BUFFER_FOR_READ,
++		[CCode (cname = "COGL_FEATURE_ID_MAP_BUFFER_FOR_WRITE")]
++		OGL_FEATURE_ID_MAP_BUFFER_FOR_WRITE,
++		[CCode (cname = "COGL_FEATURE_ID_FENCE")]
++		OGL_FEATURE_ID_FENCE,
++		[CCode (cname = "COGL_FEATURE_ID_TEXTURE_RG")]
++		OGL_FEATURE_ID_TEXTURE_RG,
++		[CCode (cname = "COGL_FEATURE_ID_BUFFER_AGE")]
++		OGL_FEATURE_ID_BUFFER_AGE,
++		[CCode (cname = "COGL_FEATURE_ID_TEXTURE_EGL_IMAGE_EXTERNAL")]
++		OGL_FEATURE_ID_TEXTURE_EGL_IMAGE_EXTERNAL,
++		[CCode (cname = "COGL_FEATURE_ID_BLIT_FRAMEBUFFER")]
++		OGL_FEATURE_ID_BLIT_FRAMEBUFFER
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_FILTER_", has_type_id = false)]
++	public enum FilterReturn {
++		CONTINUE,
++		REMOVE
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_FRAME_EVENT_", has_type_id = false)]
++	[Version (since = "1.14")]
++	public enum FrameEvent {
++		SYNC,
++		COMPLETE
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_FRAMEBUFFER_ERROR_", has_type_id = false)]
++	public enum FramebufferError {
++		[CCode (cname = "COGL_FRAMEBUFFER_ERROR_ALLOCATE")]
++		FRAMEBUFFER_ERROR_ALLOCATE
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_GRAPHICS_RESET_STATUS_", has_type_id = false)]
++	public enum GraphicsResetStatus {
++		NO_ERROR,
++		GUILTY_CONTEXT_RESET,
++		INNOCENT_CONTEXT_RESET,
++		UNKNOWN_CONTEXT_RESET,
++		PURGED_CONTEXT_RESET
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_INDICES_TYPE_UNSIGNED_", has_type_id = false)]
++	public enum IndicesType {
++		BYTE,
++		SHORT,
++		INT
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_MATERIAL_ALPHA_FUNC_", has_type_id = false)]
++	public enum MaterialAlphaFunc {
++		NEVER,
++		LESS,
++		EQUAL,
++		LEQUAL,
++		GREATER,
++		NOTEQUAL,
++		GEQUAL,
++		ALWAYS
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_MATERIAL_FILTER_", has_type_id = false)]
++	public enum MaterialFilter {
++		NEAREST,
++		LINEAR,
++		NEAREST_MIPMAP_NEAREST,
++		LINEAR_MIPMAP_NEAREST,
++		NEAREST_MIPMAP_LINEAR,
++		LINEAR_MIPMAP_LINEAR
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_MATERIAL_WRAP_MODE_", has_type_id = false)]
++	[Version (since = "1.4")]
++	public enum MaterialWrapMode {
++		REPEAT,
++		CLAMP_TO_EDGE,
++		AUTOMATIC
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_PIPELINE_ALPHA_FUNC_", has_type_id = false)]
++	public enum PipelineAlphaFunc {
++		NEVER,
++		LESS,
++		EQUAL,
++		LEQUAL,
++		GREATER,
++		NOTEQUAL,
++		GEQUAL,
++		ALWAYS
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_PIPELINE_CULL_FACE_MODE_", has_type_id = false)]
++	public enum PipelineCullFaceMode {
++		NONE,
++		FRONT,
++		BACK,
++		BOTH
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_PIPELINE_FILTER_", has_type_id = false)]
++	public enum PipelineFilter {
++		NEAREST,
++		LINEAR,
++		NEAREST_MIPMAP_NEAREST,
++		LINEAR_MIPMAP_NEAREST,
++		NEAREST_MIPMAP_LINEAR,
++		LINEAR_MIPMAP_LINEAR
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_PIPELINE_WRAP_MODE_", has_type_id = false)]
++	[Version (since = "2.0")]
++	public enum PipelineWrapMode {
++		REPEAT,
++		MIRRORED_REPEAT,
++		CLAMP_TO_EDGE,
++		AUTOMATIC
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_PIXEL_FORMAT_", has_type_id = false)]
++	[Flags]
++	[Version (since = "0.8")]
++	public enum PixelFormat {
++		ANY,
++		A_8,
++		RGB_565,
++		RGBA_4444,
++		RGBA_5551,
++		YUV,
++		G_8,
++		RG_88,
++		RGB_888,
++		BGR_888,
++		RGBA_8888,
++		BGRA_8888,
++		ARGB_8888,
++		ABGR_8888,
++		RGBA_1010102,
++		BGRA_1010102,
++		ARGB_2101010,
++		ABGR_2101010,
++		RGBA_FP_16161616,
++		BGRA_FP_16161616,
++		ARGB_FP_16161616,
++		ABGR_FP_16161616,
++		RGBA_8888_PRE,
++		BGRA_8888_PRE,
++		ARGB_8888_PRE,
++		ABGR_8888_PRE,
++		RGBA_4444_PRE,
++		RGBA_5551_PRE,
++		RGBA_1010102_PRE,
++		BGRA_1010102_PRE,
++		ARGB_2101010_PRE,
++		ABGR_2101010_PRE,
++		RGBA_FP_16161616_PRE,
++		BGRA_FP_16161616_PRE,
++		ARGB_FP_16161616_PRE,
++		ABGR_FP_16161616_PRE,
++		DEPTH_16,
++		DEPTH_32,
++		DEPTH_24_STENCIL_8;
++		public int get_bytes_per_pixel (int plane);
++		public int get_n_planes ();
++		public unowned string to_string ();
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_READ_PIXELS_COLOR_", has_type_id = false)]
++	[Flags]
++	[Version (since = "1.0")]
++	public enum ReadPixelsFlags {
++		[CCode (cname = "COGL_READ_PIXELS_COLOR_BUFFER")]
++		READ_PIXELS_COLOR_BUFFER
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_RENDERER_ERROR_", has_type_id = false)]
++	public enum RendererError {
++		XLIB_DISPLAY_OPEN,
++		BAD_CONSTRAINT
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_SHADER_TYPE_", has_type_id = false)]
++	[Version (since = "1.0")]
++	public enum ShaderType {
++		VERTEX,
++		FRAGMENT
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_STEREO_", has_type_id = false)]
++	public enum StereoMode {
++		BOTH,
++		LEFT,
++		RIGHT
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_SYSTEM_ERROR_", has_type_id = false)]
++	[Version (since = "1.4")]
++	public enum SystemError {
++		UNSUPPORTED,
++		NO_MEMORY
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_TEXTURE_COMPONENTS_", has_type_id = false)]
++	[Version (since = "1.18")]
++	public enum TextureComponents {
++		A,
++		RG,
++		RGB,
++		RGBA,
++		DEPTH
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_TEXTURE_ERROR_", has_type_id = false)]
++	[Version (since = "1.8")]
++	public enum TextureError {
++		SIZE,
++		FORMAT,
++		BAD_PARAMETER,
++		TYPE;
++		public static uint32 quark ();
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_TEXTURE_", has_type_id = false)]
++	[Flags]
++	[Version (since = "1.0")]
++	public enum TextureFlags {
++		NONE,
++		NO_AUTO_MIPMAP,
++		NO_SLICING,
++		NO_ATLAS
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_VERTICES_MODE_", has_type_id = false)]
++	[Version (since = "1.0")]
++	public enum VerticesMode {
++		POINTS,
++		LINES,
++		LINE_LOOP,
++		LINE_STRIP,
++		TRIANGLES,
++		TRIANGLE_STRIP,
++		TRIANGLE_FAN
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_WINDING_", has_type_id = false)]
++	public enum Winding {
++		CLOCKWISE,
++		COUNTER_CLOCKWISE
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_WINSYS_FEATURE_", has_type_id = false)]
++	public enum WinsysFeature {
++		MULTIPLE_ONSCREEN,
++		VBLANK_COUNTER,
++		VBLANK_WAIT,
++		TEXTURE_FROM_PIXMAP,
++		SWAP_BUFFERS_EVENT,
++		SWAP_REGION,
++		SWAP_REGION_THROTTLE,
++		SWAP_REGION_SYNCHRONIZED,
++		BUFFER_AGE,
++		SYNC_AND_COMPLETE_EVENT,
++		N_FEATURES
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_SCANOUT_ERROR_")]
++	public errordomain ScanoutError {
++		[CCode (cname = "COGL_SCANOUT_ERROR_INHIBITED")]
++		SCANOUT_ERROR_INHIBITED;
++		public static GLib.Quark quark ();
++	}
++	[CCode (cheader_filename = "cogl/cogl.h", instance_pos = 1.9)]
++	[Version (since = "1.8")]
++	public delegate void DebugObjectForeachTypeCallback (Cogl.DebugObjectTypeInfo info);
++	[CCode (cheader_filename = "cogl/cogl.h", instance_pos = 1.9)]
++	[Version (since = "0.10")]
++	public delegate void FeatureCallback (Cogl.FeatureID feature);
++	[CCode (cheader_filename = "cogl/cogl.h", instance_pos = 3.9)]
++	[Version (since = "1.14")]
++	public delegate void FrameCallback (Cogl.Onscreen onscreen, Cogl.FrameEvent event, Cogl.FrameInfo info);
++	[CCode (cheader_filename = "cogl/cogl.h", instance_pos = 2.9)]
++	[Version (since = "1.16")]
++	public delegate void OnscreenDirtyCallback (Cogl.Onscreen onscreen, Cogl.OnscreenDirtyInfo info);
++	[CCode (cheader_filename = "cogl/cogl.h", instance_pos = 2.9)]
++	[Version (since = "2.0")]
++	public delegate bool PipelineLayerCallback (Cogl.Pipeline pipeline, int layer_index);
++	[CCode (cheader_filename = "cogl/cogl.h", instance_pos = 1.9)]
++	public delegate bool Texture2DEGLImageExternalAlloc (Cogl.Texture2D tex_2d) throws GLib.Error;
++	[CCode (cheader_filename = "cogl/cogl.h", has_target = false)]
++	public delegate void UserDataDestroyCallback (void* data);
++	[CCode (cheader_filename = "cogl/cogl.h", cname = "COGL_AFIRST_BIT")]
++	public const int AFIRST_BIT;
++	[CCode (cheader_filename = "cogl/cogl.h", cname = "COGL_A_BIT")]
++	public const int A_BIT;
++	[CCode (cheader_filename = "cogl/cogl.h", cname = "COGL_BGR_BIT")]
++	public const int BGR_BIT;
++	[CCode (cheader_filename = "cogl/cogl.h", cname = "COGL_DEPTH_BIT")]
++	public const int DEPTH_BIT;
++	[CCode (cheader_filename = "cogl/cogl.h", cname = "COGL_PIXEL_FORMAT_MAX_PLANES")]
++	public const int PIXEL_FORMAT_MAX_PLANES;
++	[CCode (cheader_filename = "cogl/cogl.h", cname = "COGL_PREMULT_BIT")]
++	public const int PREMULT_BIT;
++	[CCode (cheader_filename = "cogl/cogl.h", cname = "COGL_STENCIL_BIT")]
++	public const int STENCIL_BIT;
++	[CCode (cheader_filename = "cogl/cogl.h", cname = "COGL_TEXTURE_MAX_WASTE")]
++	public const int TEXTURE_MAX_WASTE;
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	public static bool blit_framebuffer (Cogl.Framebuffer framebuffer, Cogl.Framebuffer dst, int src_x, int src_y, int dst_x, int dst_y, int width, int height) throws GLib.Error;
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	public static bool clutter_winsys_has_feature_CLUTTER (Cogl.WinsysFeature feature);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (since = "1.0")]
++	public static bool color_equal (void* v1, void* v2);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (since = "1.16")]
++	public static void color_init_from_hsl (out Cogl.Color color, float hue, float saturation, float luminance);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.16")]
++	public static unowned Cogl.Handle create_program ();
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.16")]
++	public static unowned Cogl.Handle create_shader (Cogl.ShaderType shader_type);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (since = "1.8")]
++	public static void debug_object_foreach_type (Cogl.DebugObjectForeachTypeCallback func);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (since = "1.8")]
++	public static void debug_object_print_instances ();
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (since = "1.0")]
++	public static void flush ();
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (since = "1.10")]
++	public static void foreach_feature (Cogl.Context context, Cogl.FeatureCallback callback);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.16")]
++	public static bool get_backface_culling_enabled ();
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (since = "1.14")]
++	public static int64 get_clock_time (Cogl.Context context);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.16")]
++	public static bool get_depth_test_enabled ();
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	public static Cogl.GraphicsResetStatus get_graphics_reset_status (Cogl.Context context);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.16", since = "1.0")]
++	public static GLib.OptionGroup get_option_group ();
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	public static GLib.Callback get_proc_address (string s);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (since = "1.10")]
++	public static bool has_feature (Cogl.Context context, Cogl.FeatureID feature);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (since = "1.0")]
++	public static bool is_bitmap (void* object);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (since = "1.10")]
++	public static bool is_context (void* object);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (since = "2.0")]
++	public static bool is_frame_info (void* object);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (since = "1.10")]
++	public static bool is_framebuffer (void* object);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (since = "2.0")]
++	public static bool is_pipeline (void* object);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.16")]
++	public static bool is_program (Cogl.Handle handle);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.16")]
++	public static bool is_shader (Cogl.Handle handle);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	public static bool is_texture (void* object);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	public static bool is_texture_2d (void* object);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (since = "1.10")]
++	public static bool is_texture_2d_sliced (void* object);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.16")]
++	public static void program_attach_shader (Cogl.Handle program_handle, Cogl.Handle shader_handle);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.16")]
++	public static int program_get_uniform_location (Cogl.Handle handle, string uniform_name);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.16")]
++	public static void program_link (Cogl.Handle handle);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.16", since = "1.4")]
++	public static void program_set_uniform_1f (Cogl.Handle program, int uniform_location, float value);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.16", since = "1.4")]
++	public static void program_set_uniform_1i (Cogl.Handle program, int uniform_location, int value);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.16", since = "1.4")]
++	public static void program_set_uniform_float (Cogl.Handle program, int uniform_location, int n_components, [CCode (array_length_cname = "count", array_length_pos = 3.5)] float[] value);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.16", since = "1.4")]
++	public static void program_set_uniform_int (Cogl.Handle program, int uniform_location, int n_components, [CCode (array_length_cname = "count", array_length_pos = 3.5)] int[] value);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.16", since = "1.4")]
++	public static void program_set_uniform_matrix (Cogl.Handle program, int uniform_location, int dimensions, bool transpose, [CCode (array_length_cname = "count", array_length_pos = 3.5)] float[] value);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.16")]
++	public static void set_backface_culling_enabled (bool setting);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.16")]
++	public static void set_depth_test_enabled (bool setting);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	public static void set_tracing_disabled_on_thread (void* data);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	public static void set_tracing_enabled_on_thread (void* data, string group, string filename);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	public static void set_tracing_enabled_on_thread_with_fd (void* data, string group, int fd);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.16")]
++	public static Cogl.ShaderType shader_get_type (Cogl.Handle handle);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.16")]
++	public static void shader_source (Cogl.Handle shader, string source);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.18", since = "1.0")]
++	public static Cogl.Texture texture_new_from_bitmap (Cogl.Bitmap bitmap, Cogl.TextureFlags flags, Cogl.PixelFormat internal_format);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.18", since = "0.8")]
++	public static Cogl.Texture texture_new_from_data (int width, int height, Cogl.TextureFlags flags, Cogl.PixelFormat format, Cogl.PixelFormat internal_format, int rowstride, [CCode (array_length = false)] uint8[] data);
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.18", since = "0.8")]
++	public static Cogl.Texture texture_new_from_file (string filename, Cogl.TextureFlags flags, Cogl.PixelFormat internal_format) throws GLib.Error;
++	[CCode (cheader_filename = "cogl/cogl.h")]
++	[Version (deprecated = true, deprecated_since = "1.18", since = "0.8")]
++	public static Cogl.Texture texture_new_with_size (uint width, uint height, Cogl.TextureFlags flags, Cogl.PixelFormat internal_format);
++}
diff --git a/srcpkgs/budgie-desktop/template b/srcpkgs/budgie-desktop/template
index 5f9833ca9cbf..e989feaea31e 100644
--- a/srcpkgs/budgie-desktop/template
+++ b/srcpkgs/budgie-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'budgie-desktop'
 pkgname=budgie-desktop
 version=10.5.2
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
 configure_args="-Dwith-gtk-doc=false"

From 44804c4436bc934cb41c97d271f91c1e11e5b7b9 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 9 Apr 2021 22:46:46 +0200
Subject: [PATCH 0806/2024] linux*: don't use front LED as hdd LED on
 apple/ppc32 + refresh

Closes https://github.com/void-ppc/void-packages/pull/48
---
 srcpkgs/linux4.14/files/ppc-dotconfig |  4 ++--
 srcpkgs/linux4.19/files/ppc-dotconfig |  7 +++----
 srcpkgs/linux4.4/files/ppc-dotconfig  |  3 ++-
 srcpkgs/linux4.9/files/ppc-dotconfig  |  2 +-
 srcpkgs/linux5.10/files/ppc-dotconfig | 12 +++---------
 srcpkgs/linux5.11/files/ppc-dotconfig | 12 +++---------
 srcpkgs/linux5.4/files/ppc-dotconfig  | 13 +++----------
 7 files changed, 17 insertions(+), 36 deletions(-)

diff --git a/srcpkgs/linux4.14/files/ppc-dotconfig b/srcpkgs/linux4.14/files/ppc-dotconfig
index 9e68df353c07..69ea5d411540 100644
--- a/srcpkgs/linux4.14/files/ppc-dotconfig
+++ b/srcpkgs/linux4.14/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.14.217 Kernel Configuration
+# Linux/powerpc 4.14.225 Kernel Configuration
 #
 # CONFIG_PPC64 is not set
 
@@ -2082,7 +2082,7 @@ CONFIG_ADB=y
 CONFIG_ADB_CUDA=y
 CONFIG_ADB_PMU=y
 CONFIG_ADB_PMU_LED=y
-CONFIG_ADB_PMU_LED_DISK=y
+# CONFIG_ADB_PMU_LED_DISK is not set
 CONFIG_PMAC_APM_EMU=m
 CONFIG_PMAC_MEDIABAY=y
 CONFIG_PMAC_BACKLIGHT=y
diff --git a/srcpkgs/linux4.19/files/ppc-dotconfig b/srcpkgs/linux4.19/files/ppc-dotconfig
index a84d0bbe95c0..489d1fbb5b32 100644
--- a/srcpkgs/linux4.19/files/ppc-dotconfig
+++ b/srcpkgs/linux4.19/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.19.169 Kernel Configuration
+# Linux/powerpc 4.19.185 Kernel Configuration
 #
 
 #
@@ -540,9 +540,8 @@ CONFIG_ARCH_HAS_PHYS_TO_DMA=y
 #
 # CONFIG_GCOV_KERNEL is not set
 CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
-CONFIG_PLUGIN_HOSTCC="g++"
+CONFIG_PLUGIN_HOSTCC=""
 CONFIG_HAVE_GCC_PLUGINS=y
-# CONFIG_GCC_PLUGINS is not set
 CONFIG_RT_MUTEXES=y
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
@@ -2099,7 +2098,7 @@ CONFIG_ADB=y
 CONFIG_ADB_CUDA=y
 CONFIG_ADB_PMU=y
 CONFIG_ADB_PMU_LED=y
-CONFIG_ADB_PMU_LED_DISK=y
+# CONFIG_ADB_PMU_LED_DISK is not set
 CONFIG_PMAC_APM_EMU=m
 CONFIG_PMAC_MEDIABAY=y
 CONFIG_PMAC_BACKLIGHT=y
diff --git a/srcpkgs/linux4.4/files/ppc-dotconfig b/srcpkgs/linux4.4/files/ppc-dotconfig
index 396b70bc042b..28549f49431f 100644
--- a/srcpkgs/linux4.4/files/ppc-dotconfig
+++ b/srcpkgs/linux4.4/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.4.253 Kernel Configuration
+# Linux/powerpc 4.4.261 Kernel Configuration
 #
 # CONFIG_PPC64 is not set
 
@@ -441,6 +441,7 @@ CONFIG_SCHED_HRTICK=y
 CONFIG_PREEMPT_VOLUNTARY=y
 # CONFIG_PREEMPT is not set
 CONFIG_BINFMT_ELF=y
+CONFIG_ELFCORE=y
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_BINFMT_SCRIPT=y
 # CONFIG_HAVE_AOUT is not set
diff --git a/srcpkgs/linux4.9/files/ppc-dotconfig b/srcpkgs/linux4.9/files/ppc-dotconfig
index 9039011c89a2..7a95057509e2 100644
--- a/srcpkgs/linux4.9/files/ppc-dotconfig
+++ b/srcpkgs/linux4.9/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.9.253 Kernel Configuration
+# Linux/powerpc 4.9.261 Kernel Configuration
 #
 # CONFIG_PPC64 is not set
 
diff --git a/srcpkgs/linux5.10/files/ppc-dotconfig b/srcpkgs/linux5.10/files/ppc-dotconfig
index 49cfd6e6f5d1..32cef8a304dc 100644
--- a/srcpkgs/linux5.10/files/ppc-dotconfig
+++ b/srcpkgs/linux5.10/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.10.10 Kernel Configuration
+# Linux/powerpc 5.10.28 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -8,8 +8,6 @@ CONFIG_GCC_VERSION=100201
 CONFIG_LD_VERSION=235010000
 CONFIG_CLANG_VERSION=0
 CONFIG_LLD_VERSION=0
-CONFIG_CC_CAN_LINK=y
-CONFIG_CC_CAN_LINK_STATIC=y
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_IRQ_WORK=y
@@ -207,6 +205,7 @@ CONFIG_BPF_SYSCALL=y
 CONFIG_USERFAULTFD=y
 CONFIG_ARCH_HAS_MEMBARRIER_CALLBACKS=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
@@ -532,7 +531,6 @@ CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
 # end of GCOV-based kernel profiling
 
 CONFIG_HAVE_GCC_PLUGINS=y
-# CONFIG_GCC_PLUGINS is not set
 # end of General architecture-dependent options
 
 CONFIG_RT_MUTEXES=y
@@ -1654,7 +1652,6 @@ CONFIG_PCIEASPM_DEFAULT=y
 CONFIG_PCIE_PME=y
 CONFIG_PCIE_DPC=y
 CONFIG_PCIE_PTM=y
-CONFIG_PCIE_BW=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_MSI_IRQ_DOMAIN=y
 CONFIG_PCI_MSI_ARCH_FALLBACKS=y
@@ -2255,7 +2252,7 @@ CONFIG_ADB=y
 CONFIG_ADB_CUDA=y
 CONFIG_ADB_PMU=y
 CONFIG_ADB_PMU_LED=y
-CONFIG_ADB_PMU_LED_DISK=y
+# CONFIG_ADB_PMU_LED_DISK is not set
 CONFIG_PMAC_APM_EMU=m
 CONFIG_PMAC_MEDIABAY=y
 CONFIG_PMAC_BACKLIGHT=y
@@ -3858,7 +3855,6 @@ CONFIG_BATTERY_BQ27XXX_HDQ=m
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
 # CONFIG_BATTERY_MAX1721X is not set
-CONFIG_CHARGER_ISP1704=m
 # CONFIG_CHARGER_MAX8903 is not set
 # CONFIG_CHARGER_LP8727 is not set
 # CONFIG_CHARGER_GPIO is not set
@@ -5937,7 +5933,6 @@ CONFIG_USB_XUSBATM=m
 #
 # USB Physical Layer drivers
 #
-CONFIG_USB_PHY=y
 # CONFIG_NOP_USB_XCEIV is not set
 # CONFIG_USB_GPIO_VBUS is not set
 # CONFIG_USB_ISP1301 is not set
@@ -7009,7 +7004,6 @@ CONFIG_IRQCHIP=y
 #
 CONFIG_GENERIC_PHY=y
 CONFIG_GENERIC_PHY_MIPI_DPHY=y
-CONFIG_USB_LGM_PHY=m
 # CONFIG_BCM_KONA_USB2_PHY is not set
 # CONFIG_PHY_CADENCE_TORRENT is not set
 CONFIG_PHY_CADENCE_DPHY=m
diff --git a/srcpkgs/linux5.11/files/ppc-dotconfig b/srcpkgs/linux5.11/files/ppc-dotconfig
index a15dc18fb3f6..9d3e11bd0511 100644
--- a/srcpkgs/linux5.11/files/ppc-dotconfig
+++ b/srcpkgs/linux5.11/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.11.2 Kernel Configuration
+# Linux/powerpc 5.11.12 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -8,8 +8,6 @@ CONFIG_GCC_VERSION=100201
 CONFIG_LD_VERSION=235010000
 CONFIG_CLANG_VERSION=0
 CONFIG_LLD_VERSION=0
-CONFIG_CC_CAN_LINK=y
-CONFIG_CC_CAN_LINK_STATIC=y
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_IRQ_WORK=y
@@ -207,6 +205,7 @@ CONFIG_BPF_SYSCALL=y
 CONFIG_USERFAULTFD=y
 CONFIG_ARCH_HAS_MEMBARRIER_CALLBACKS=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
@@ -1656,7 +1655,6 @@ CONFIG_PCIEASPM_DEFAULT=y
 CONFIG_PCIE_PME=y
 CONFIG_PCIE_DPC=y
 CONFIG_PCIE_PTM=y
-CONFIG_PCIE_BW=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_MSI_IRQ_DOMAIN=y
 CONFIG_PCI_MSI_ARCH_FALLBACKS=y
@@ -2260,7 +2258,7 @@ CONFIG_ADB=y
 CONFIG_ADB_CUDA=y
 CONFIG_ADB_PMU=y
 CONFIG_ADB_PMU_LED=y
-CONFIG_ADB_PMU_LED_DISK=y
+# CONFIG_ADB_PMU_LED_DISK is not set
 CONFIG_PMAC_APM_EMU=m
 CONFIG_PMAC_MEDIABAY=y
 CONFIG_PMAC_BACKLIGHT=y
@@ -3861,7 +3859,6 @@ CONFIG_BATTERY_BQ27XXX_HDQ=m
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
 # CONFIG_BATTERY_MAX1721X is not set
-CONFIG_CHARGER_ISP1704=m
 # CONFIG_CHARGER_MAX8903 is not set
 # CONFIG_CHARGER_LP8727 is not set
 # CONFIG_CHARGER_GPIO is not set
@@ -5950,7 +5947,6 @@ CONFIG_USB_XUSBATM=m
 #
 # USB Physical Layer drivers
 #
-CONFIG_USB_PHY=y
 # CONFIG_NOP_USB_XCEIV is not set
 # CONFIG_USB_GPIO_VBUS is not set
 # CONFIG_USB_ISP1301 is not set
@@ -7034,7 +7030,6 @@ CONFIG_IRQCHIP=y
 #
 CONFIG_GENERIC_PHY=y
 CONFIG_GENERIC_PHY_MIPI_DPHY=y
-CONFIG_USB_LGM_PHY=m
 # CONFIG_BCM_KONA_USB2_PHY is not set
 # CONFIG_PHY_CADENCE_TORRENT is not set
 CONFIG_PHY_CADENCE_DPHY=m
@@ -7857,7 +7852,6 @@ CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_INFO_SPLIT is not set
 # CONFIG_DEBUG_INFO_DWARF4 is not set
 # CONFIG_DEBUG_INFO_BTF is not set
-CONFIG_PAHOLE_HAS_SPLIT_BTF=y
 # CONFIG_GDB_SCRIPTS is not set
 CONFIG_FRAME_WARN=1024
 CONFIG_STRIP_ASM_SYMS=y
diff --git a/srcpkgs/linux5.4/files/ppc-dotconfig b/srcpkgs/linux5.4/files/ppc-dotconfig
index 857125d15a5d..f16d80306325 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.108 Kernel Configuration
+# Linux/powerpc 5.4.110 Kernel Configuration
 #
 
 #
@@ -522,12 +522,8 @@ CONFIG_ARCH_HAS_PHYS_TO_DMA=y
 CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
 # end of GCOV-based kernel profiling
 
-CONFIG_PLUGIN_HOSTCC="g++"
+CONFIG_PLUGIN_HOSTCC=""
 CONFIG_HAVE_GCC_PLUGINS=y
-CONFIG_GCC_PLUGINS=y
-# CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set
-# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
-# CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
 # end of General architecture-dependent options
 
 CONFIG_RT_MUTEXES=y
@@ -2214,7 +2210,7 @@ CONFIG_ADB=y
 CONFIG_ADB_CUDA=y
 CONFIG_ADB_PMU=y
 CONFIG_ADB_PMU_LED=y
-CONFIG_ADB_PMU_LED_DISK=y
+# CONFIG_ADB_PMU_LED_DISK is not set
 CONFIG_PMAC_APM_EMU=m
 CONFIG_PMAC_MEDIABAY=y
 CONFIG_PMAC_BACKLIGHT=y
@@ -6959,9 +6955,6 @@ CONFIG_LSM="yama,loadpin,safesetid,integrity,apparmor,selinux,smack,tomoyo"
 # Memory initialization
 #
 CONFIG_INIT_STACK_NONE=y
-# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set
-# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set
-# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL is not set
 CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
 # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
 # end of Memory initialization

From 449e142c2e6f1aa3ac78a9e8b0660cca2d1c8932 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sat, 10 Apr 2021 02:07:01 +0200
Subject: [PATCH 0807/2024] libguestfs: update to 1.44.1.

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

diff --git a/srcpkgs/libguestfs/template b/srcpkgs/libguestfs/template
index 8fd4f17921af..b3df393d76e0 100644
--- a/srcpkgs/libguestfs/template
+++ b/srcpkgs/libguestfs/template
@@ -1,6 +1,6 @@
 # Template file for 'libguestfs'
 pkgname=libguestfs
-version=1.44.0
+version=1.44.1
 revision=1
 _version_short=${version%.*}
 build_style=gnu-configure
@@ -22,7 +22,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license=" GPL-2.0-or-later"
 homepage="http://libguestfs.org"
 distfiles="http://libguestfs.org/download/${_version_short}-stable/${pkgname}-${version}.tar.gz"
-checksum=0ec7b44a4c50e928583c56099da31ceb9680766043bd7d468f3ca7b741c55d21
+checksum=72b7dcdd32da1c17c932cf5a0a70b3bd68bc93e94828ad66a539f2e616adb025
 
 conf_files="etc/libguestfs-tools.conf
  etc/xdg/virt-builder/repos.d/libguestfs.conf

From 6724683a0c6108e1a4aeb206bed3eb401a4e8fc5 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sat, 10 Apr 2021 02:15:23 +0200
Subject: [PATCH 0808/2024] vagrant: update to 2.2.15.

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

diff --git a/srcpkgs/vagrant/template b/srcpkgs/vagrant/template
index 77b3ae8889ac..c7f3cdcd2de9 100644
--- a/srcpkgs/vagrant/template
+++ b/srcpkgs/vagrant/template
@@ -1,6 +1,6 @@
 # Template file for 'vagrant'
 pkgname=vagrant
-version=2.2.10
+version=2.2.15
 revision=1
 archs="i686 x86_64*"
 hostmakedepends="ruby"
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="https://www.vagrantup.com/"
 distfiles="https://github.com/mitchellh/${pkgname}/archive/v${version}.tar.gz"
-checksum=722db22b431c68030e046c7c6c90629763d86a2473caa0fe8834d5742a91941f
+checksum=98c9c726d5cb7e46793b4505f3d907b2a0673e0f6e43997c218a0be5330cc83f
 nocross=yes
 
 post_extract() {

From 18eafde136874d476ad1bd011deff92d685f59e7 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sat, 10 Apr 2021 02:17:11 +0200
Subject: [PATCH 0809/2024] pinktrace: update to 0.9.6.

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

diff --git a/srcpkgs/pinktrace/template b/srcpkgs/pinktrace/template
index 0759732f55aa..235d2f97454a 100644
--- a/srcpkgs/pinktrace/template
+++ b/srcpkgs/pinktrace/template
@@ -1,6 +1,6 @@
 # Template file for 'pinktrace'
 pkgname=pinktrace
-version=0.9.3
+version=0.9.6
 revision=1
 wrksrc="$pkgname-1-$version"
 build_style=gnu-configure
@@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="http://dev.exherbo.org/~alip/pinktrace/"
 distfiles="http://git.exherbo.org/$pkgname-1.git/snapshot/$pkgname-1-$version.tar.gz"
-checksum=260fba87c3c1d8a296295bab9ddaf9ff393f5c961ee7567f86fb5751d9f7a125
+checksum=5d2670607f70da397c6da06fbb1844020b44b63c8aea8a725771aac02235b27a
 
 pre_configure() {
 	./autogen.sh

From 18b19d7a38d1b2d9f155c3cdb774bcea7bc2c2b2 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sat, 10 Apr 2021 02:17:33 +0200
Subject: [PATCH 0810/2024] sydbox: update to 1.1.0.

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

diff --git a/srcpkgs/sydbox/template b/srcpkgs/sydbox/template
index e9f043c0678f..ffaabf73d2de 100644
--- a/srcpkgs/sydbox/template
+++ b/srcpkgs/sydbox/template
@@ -1,6 +1,6 @@
 # Template file for 'sydbox'
 pkgname=sydbox
-version=1.0.8
+version=1.1.0
 revision=1
 wrksrc="$pkgname-1-$version"
 build_style=gnu-configure
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="http://dev.exherbo.org/~alip/sydbox/sydbox.html"
 distfiles="http://git.exherbo.org/$pkgname-1.git/snapshot/$pkgname-1-$version.tar.gz"
-checksum=237dd9765ba869698e8d2c3a170857081a0569a042e3f0f581c28f0abd0f4b2b
+checksum=765fd5ce4b3a48270c7ea7b8b3d0dbf43f103ce0214c1ae7126579310f571bd2
 python_version=2 #unverified
 
 # seccomp only implemented on x86

From f550283a4fc1acf30972951ce7566ae88a1f9abb Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 9 Apr 2021 19:27:46 +0300
Subject: [PATCH 0811/2024] libmatroska: update to 1.6.3, - project uses github
 for the official git repos, changing distfiles to github to take advantage, -
 change homepage, - adjust wrksrc.

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

diff --git a/srcpkgs/libmatroska/template b/srcpkgs/libmatroska/template
index b569bbd4dd01..5385183627d2 100644
--- a/srcpkgs/libmatroska/template
+++ b/srcpkgs/libmatroska/template
@@ -1,16 +1,17 @@
 # Template file for 'libmatroska'
 pkgname=libmatroska
-version=1.6.2
+version=1.6.3
 revision=1
+wrksrc="${pkgname}-release-${version}"
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
 makedepends="libebml-devel"
 short_desc="Extensible open standard Audio/Video container format"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
-homepage="https://dl.matroska.org/downloads/libmatroska/"
-distfiles="https://dl.matroska.org/downloads/libmatroska/libmatroska-${version}.tar.xz"
-checksum=bc4479aa8422ab07643df6a1fa5a19e4bed4badfd41ca77e081628620d1e1990
+homepage="https://www.matroska.org/downloads/libraries.html"
+distfiles="https://github.com/Matroska-Org/libmatroska/archive/refs/tags/release-${version}.tar.gz"
+checksum=0c8c875ae26ac69a722f7fd0f4a4fecb4fdff681f2a165f09c06a40cbf1d0de6
 
 libmatroska-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From 0af4f719cd79700c9cc1798f9daba8862d439a83 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 9 Apr 2021 13:22:10 +0300
Subject: [PATCH 0812/2024] mk-configure: update to 0.37.0.

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

diff --git a/srcpkgs/mk-configure/template b/srcpkgs/mk-configure/template
index dad5f0e0e21f..b7c019b828d3 100644
--- a/srcpkgs/mk-configure/template
+++ b/srcpkgs/mk-configure/template
@@ -1,6 +1,6 @@
 # Template file for 'mk-configure'
 pkgname=mk-configure
-version=0.36.0
+version=0.37.0
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-makefile
@@ -10,20 +10,28 @@ make_install_args="${make_build_args} MANDIR=/usr/share/man"
 make_check_target="test"
 hostmakedepends="bmake bmkdep tar texinfo"
 depends="bmake bmkdep"
-checkdepends="automake glib-devel groff pkg-config bison flex"
+checkdepends="automake glib-devel groff pkg-config bison flex libbsd-devel"
 short_desc="Lightweight replacement for GNU autotools"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause, BSD-3-Clause"
 homepage="https://github.com/cheusov/mk-configure/"
 distfiles="https://github.com/cheusov/${pkgname}/archive/${pkgname}-${version}.tar.gz"
-checksum=48188e9305b7b1e2f81d3a70e0af1112affa8a7871b01335b86829ffed746177
+checksum=7aff2a94b66c5b0d622665af561d3474e321d7c42f8c1e4a274e290b43da26ea
 disable_parallel_build=yes
 
+case "$XBPS_TARGET_MACHINE" in
+	*-musl)
+		checkdepends+=" musl-fts-devel"
+esac
+
+
 post_extract() {
 	rm -r tests/pkg_config_2  # different wording
 	rm -r tests/*lua*
 	rm -r examples/*lua*
 	rm -r examples/*lex*
+	rm -r tests/test_subprj_dash
+	rm -r tests/test_mkc_vs_*
 	vsed -i -e 's/-Wabi//g' mk/mkc_imp.platform.sys.mk
 }
 pre_build() {
@@ -31,10 +39,6 @@ pre_build() {
 }
 pre_check() {
 	unset CC CFLAGS CXXFLAGS
-	case "$XBPS_TARGET_MACHINE" in
-		*-musl)
-			sed -i 's|Cannot allocate|Out of|g' examples/hello_errwarn/expect.out ;;
-	esac
 }
 post_install() {
 	vlicense doc/LICENSE

From 47d3c641ab400c1b396776b6c6a83afde425e9d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 9 Apr 2021 23:58:28 -0300
Subject: [PATCH 0813/2024] pinktrace: restrict arch list to supported
 platforms.

This has the side effect of disabling the build for aarch64, which was
previously not restricted in the template but wasn't available in repos
anyway (builder scheduling issues led to it not being noticed).
---
 srcpkgs/pinktrace/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/pinktrace/template b/srcpkgs/pinktrace/template
index 235d2f97454a..3fbb5a48a58a 100644
--- a/srcpkgs/pinktrace/template
+++ b/srcpkgs/pinktrace/template
@@ -2,6 +2,8 @@
 pkgname=pinktrace
 version=0.9.6
 revision=1
+# arch list taken from https://dev.exherbo.org/~alip/pinktrace/#supported_platforms
+archs="x86_64* i686* ppc* arm*"
 wrksrc="$pkgname-1-$version"
 build_style=gnu-configure
 configure_args="--enable-python"

From 63a65f131168fe05b46619789795ff6224b22da4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sat, 10 Apr 2021 00:09:29 -0300
Subject: [PATCH 0814/2024] libguestfs: mark broken on musl.

Our musl-legacy-compat package should provide static inline versions of
error(3), but it's erroring out during linking:

/usr/bin/ld: ../lib/.libs/libguestfs.so: undefined reference to `error'
collect2: error: ld returned 1 exit status
---
 srcpkgs/libguestfs/template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/srcpkgs/libguestfs/template b/srcpkgs/libguestfs/template
index b3df393d76e0..81afe313d203 100644
--- a/srcpkgs/libguestfs/template
+++ b/srcpkgs/libguestfs/template
@@ -30,6 +30,9 @@ conf_files="etc/libguestfs-tools.conf
 
 nocross=yes
 archs="i686* x86_64* ppc64le*"
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	broken="https://build.voidlinux.org/builders/x86_64-musl_builder/builds/35666/steps/shell_3/logs/stdio"
+fi
 
 build_options="ruby python go php lua fuse"
 build_options_default="ruby fuse"

From d4130563292524e765f217b62fc77c900fb90347 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 10 Apr 2021 08:19:44 +0200
Subject: [PATCH 0815/2024] evolution: provide libevolution-mail-formatter.so

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

diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index f3b3656921bb..4ccbb8149d14 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -1,7 +1,7 @@
 # Template file for 'evolution'
 pkgname=evolution
 version=3.40.0
-revision=1
+revision=2
 build_style=cmake
 build_helper="qemu"
 configure_args="-DCMAKE_BUILD_TYPE=None -DSYSCONF_INSTALL_DIR=/etc
@@ -21,7 +21,7 @@ changelog="https://raw.githubusercontent.com/GNOME/evolution/gnome-3-38/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=030a27b46c971835821c1b04d9023f9ff8f4113e1a411633dee403112033d51b
 shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so
- libevolution-mail.so libevolution-shell.so"
+ libevolution-mail.so libevolution-shell.so libevolution-mail-formatter.so"
 
 evolution-devel_package() {
 	depends="webkit2gtk-devel gtk+3-devel libglib-devel evolution-data-server-devel

From 67f57c10bfee3299689b1a92820593c538b686d1 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 10 Apr 2021 08:38:48 +0200
Subject: [PATCH 0816/2024] gwenhywfar: update to 5.6.0.

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

diff --git a/srcpkgs/gwenhywfar/template b/srcpkgs/gwenhywfar/template
index 89adfe051249..c6e01f4bea86 100644
--- a/srcpkgs/gwenhywfar/template
+++ b/srcpkgs/gwenhywfar/template
@@ -1,9 +1,9 @@
 # Template file for 'gwenhywfar'
 pkgname=gwenhywfar
-version=5.4.0
-revision=2
+version=5.6.0
+revision=1
 build_style=gnu-configure
-configure_args="--enable-visibility --disable-binreloc
+configure_args="--disable-binreloc
  --with-qt5-moc=/usr/lib/qt5/bin/moc --with-qt5-uic=/usr/lib/qt5/bin/uic"
 hostmakedepends="automake pkg-config libgcrypt-devel libtool which"
 makedepends="libgcrypt-devel gnutls-devel gtk+-devel qt5-devel gtk+3-devel"
@@ -12,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/aqbanking/gwenhywfar"
 distfiles="https://github.com/aqbanking/gwenhywfar/archive/${version}.tar.gz"
-checksum=e46c3450d610b36f51b46ab97640ae340e8b68850f03b23b98c4ab682a5027c0
+checksum=9f2876770824a283d02fd730bb1f7a98970fa6f20121f4af433d6698831c3a84
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel"

From 73b37e089eb72568430342e4ad433cc2ec8ef664 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 10 Apr 2021 08:51:18 +0200
Subject: [PATCH 0817/2024] aqbanking: update to 6.2.10.

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

diff --git a/srcpkgs/aqbanking/template b/srcpkgs/aqbanking/template
index 3d2289d73684..cf453189601c 100644
--- a/srcpkgs/aqbanking/template
+++ b/srcpkgs/aqbanking/template
@@ -1,6 +1,6 @@
 # Template file for 'aqbanking'
 pkgname=aqbanking
-version=6.2.5
+version=6.2.10
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config gwenhywfar tar"
@@ -9,8 +9,8 @@ short_desc="Library for online banking and financial applications"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only, GPL-3.0-only"
 homepage="http://www.aquamaniac.de/aqbanking"
-distfiles="https://www.aquamaniac.de/rdm/attachments/download/342/${pkgname}-${version}.tar.gz"
-checksum=cf5b060e3ec7e3fc925687caf044d4df3dbf9595f23c4fe8ffad78f44af0d6df
+distfiles="https://www.aquamaniac.de/rdm/attachments/download/368/${pkgname}-${version}.tar.gz"
+checksum=78435ff3211353e24791e2f96943c82949c48aef3704f5b57d09f08a4abcab8d
 disable_parallel_build=yes
 
 if [ "$CROSS_BUILD" ]; then

From f7bd144d3da1b49a7e01516e67d82e1a7a50327d Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 10 Apr 2021 10:59:30 +0200
Subject: [PATCH 0818/2024] wesnoth: update to 1.14.16.

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

diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index 7b9b5bd64a0b..e79d37bf6b34 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,7 +1,7 @@
 # Template file for 'wesnoth'
 pkgname=wesnoth
-version=1.14.13
-revision=3
+version=1.14.16
+revision=1
 build_style=cmake
 configure_args="-DENABLE_OMP=1"
 hostmakedepends="pkg-config gettext"
@@ -14,7 +14,7 @@ maintainer="Philipp Hirsch <itself@hanspolo.net>"
 license="GPL-2.0-or-later"
 homepage="https://wesnoth.org"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=3824a6c2828a866ede7caab81287382d5e95969e240d9e22364500a83291b8de
+checksum=0f52d427e2fb58f4d1961847be4e3564a3c4ad78190042b6d04f83cedac030b5
 replaces="wesnoth-data>=0"
 
 post_install() {

From a01ba95b4fe659f9445aa7d551c716bc4c9c403f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 10 Apr 2021 14:58:48 +0200
Subject: [PATCH 0819/2024] linux5.10: update to 5.10.29.

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

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index e283aa86771c..1159ae5b9639 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.28
+version=5.10.29
 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=4dfc3aea719556e63e90b8692e9d4b779ad1cb2a9a4823bf721e30004e7ac354
+checksum=158c6746c11a90645b4d40bdb5c049d9fac7e4c9ed381c9b7aa94db1a8e7e9ec
 python_version=3
 patch_args="-Np1"
 

From ef7787c754e4e198aa9b6421624ca5c562b67842 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 10 Apr 2021 15:40:30 +0200
Subject: [PATCH 0820/2024] New package: vala-language-server-0.48.1

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

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

From 357ea2dc29db96ba70db9de706204cbea6bd3a5d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Wed, 31 Mar 2021 11:32:03 +0200
Subject: [PATCH 0821/2024] =?UTF-8?q?srcpkgs:=20remove=20pullmoll=20from?=
 =?UTF-8?q?=20maintainers=20field.=20=F0=9F=98=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Set them to Orphaned for now.

If you'd like to pick up a package, feel free.
---
 srcpkgs/CoinMP/template                      | 2 +-
 srcpkgs/Maelstrom/template                   | 2 +-
 srcpkgs/MonkeysAudio/template                | 2 +-
 srcpkgs/SDL2_net/template                    | 2 +-
 srcpkgs/SMC/template                         | 2 +-
 srcpkgs/TSC/template                         | 2 +-
 srcpkgs/WiringPi/template                    | 2 +-
 srcpkgs/Z80Explorer/template                 | 2 +-
 srcpkgs/actiona/template                     | 2 +-
 srcpkgs/aisleriot/template                   | 2 +-
 srcpkgs/apulse/template                      | 2 +-
 srcpkgs/assimp/template                      | 2 +-
 srcpkgs/assimp_qt_viewer/template            | 2 +-
 srcpkgs/astromenace/template                 | 2 +-
 srcpkgs/atomix/template                      | 2 +-
 srcpkgs/avidemux/template                    | 2 +-
 srcpkgs/axel/template                        | 2 +-
 srcpkgs/bcal/template                        | 2 +-
 srcpkgs/bcunit/template                      | 2 +-
 srcpkgs/boinc/template                       | 2 +-
 srcpkgs/botan/template                       | 2 +-
 srcpkgs/broadcom-bt-firmware/template        | 2 +-
 srcpkgs/cbang/template                       | 2 +-
 srcpkgs/cegui/template                       | 2 +-
 srcpkgs/cegui07/template                     | 2 +-
 srcpkgs/choqok/template                      | 2 +-
 srcpkgs/ckmame/template                      | 2 +-
 srcpkgs/clamav/template                      | 2 +-
 srcpkgs/cld2/template                        | 2 +-
 srcpkgs/codeblocks/template                  | 2 +-
 srcpkgs/cpp-hocon/template                   | 2 +-
 srcpkgs/cross-i686-linux-musl/template       | 2 +-
 srcpkgs/cross-i686-pc-linux-gnu/template     | 2 +-
 srcpkgs/cross-powerpc64-linux-gnu/template   | 2 +-
 srcpkgs/cubietruck-base/template             | 2 +-
 srcpkgs/devil/template                       | 2 +-
 srcpkgs/dialogbox/template                   | 2 +-
 srcpkgs/dm-zoned-tools/template              | 2 +-
 srcpkgs/enigma/template                      | 2 +-
 srcpkgs/ent/template                         | 2 +-
 srcpkgs/fah/template                         | 2 +-
 srcpkgs/fbida/template                       | 2 +-
 srcpkgs/ffmpegthumbnailer/template           | 2 +-
 srcpkgs/firebird3/template                   | 2 +-
 srcpkgs/firefox-esr-i18n/template            | 2 +-
 srcpkgs/firefox-esr/template                 | 2 +-
 srcpkgs/five-or-more/template                | 2 +-
 srcpkgs/flexprop/template                    | 2 +-
 srcpkgs/flightgear/template                  | 2 +-
 srcpkgs/four-in-a-row/template               | 2 +-
 srcpkgs/freedroidRPG/template                | 2 +-
 srcpkgs/freeimage/template                   | 2 +-
 srcpkgs/freerouting/template                 | 2 +-
 srcpkgs/gconfmm/template                     | 2 +-
 srcpkgs/gdash/template                       | 2 +-
 srcpkgs/geda/template                        | 2 +-
 srcpkgs/gifsicle/template                    | 2 +-
 srcpkgs/glyphy/template                      | 2 +-
 srcpkgs/gnome-chess/template                 | 2 +-
 srcpkgs/gnome-icon-theme-xfce/template       | 2 +-
 srcpkgs/gnome-klotski/template               | 2 +-
 srcpkgs/gnome-mahjongg/template              | 2 +-
 srcpkgs/gnome-mines/template                 | 2 +-
 srcpkgs/gnome-nibbles/template               | 2 +-
 srcpkgs/gnome-robots/template                | 2 +-
 srcpkgs/gnome-sudoku/template                | 2 +-
 srcpkgs/gnome-tetravex/template              | 2 +-
 srcpkgs/gnurobbo/template                    | 2 +-
 srcpkgs/grub-customizer/template             | 2 +-
 srcpkgs/grub-terminus/template               | 2 +-
 srcpkgs/hitori/template                      | 2 +-
 srcpkgs/iagno/template                       | 2 +-
 srcpkgs/icu4lua/template                     | 2 +-
 srcpkgs/iniparser/template                   | 2 +-
 srcpkgs/injeqt/template                      | 2 +-
 srcpkgs/iselect/template                     | 2 +-
 srcpkgs/javahelp2/template                   | 2 +-
 srcpkgs/json-c++/template                    | 2 +-
 srcpkgs/kea/template                         | 2 +-
 srcpkgs/kobodeluxe/template                  | 2 +-
 srcpkgs/leatherman/template                  | 2 +-
 srcpkgs/leptonica/template                   | 2 +-
 srcpkgs/libclc/template                      | 2 +-
 srcpkgs/libe-book/template                   | 2 +-
 srcpkgs/libepubgen/template                  | 2 +-
 srcpkgs/libfreehand/template                 | 2 +-
 srcpkgs/libgadu/template                     | 2 +-
 srcpkgs/libgdal/template                     | 2 +-
 srcpkgs/libgnome-games-support/template      | 2 +-
 srcpkgs/libgta/template                      | 2 +-
 srcpkgs/libixion/template                    | 2 +-
 srcpkgs/libnumbertext/template               | 2 +-
 srcpkgs/libomxil-bellagio/template           | 2 +-
 srcpkgs/libopenraw/template                  | 2 +-
 srcpkgs/liborcus/template                    | 2 +-
 srcpkgs/libqxp/template                      | 2 +-
 srcpkgs/libreoffice/template                 | 2 +-
 srcpkgs/libsidplayfp/template                | 2 +-
 srcpkgs/libsoxr/template                     | 2 +-
 srcpkgs/libtorrent-rasterbar-python/template | 2 +-
 srcpkgs/libtorrent-rasterbar/template        | 2 +-
 srcpkgs/libucontext/template                 | 2 +-
 srcpkgs/lightsoff/template                   | 2 +-
 srcpkgs/lightzone/template                   | 2 +-
 srcpkgs/linux-firmware-dvb/template          | 2 +-
 srcpkgs/loadp2/template                      | 2 +-
 srcpkgs/log4cplus/template                   | 2 +-
 srcpkgs/lollypop/template                    | 2 +-
 srcpkgs/lzf/template                         | 2 +-
 srcpkgs/mame/template                        | 2 +-
 srcpkgs/mmv/template                         | 2 +-
 srcpkgs/mog/template                         | 2 +-
 srcpkgs/mruby/template                       | 2 +-
 srcpkgs/musl-fts/template                    | 2 +-
 srcpkgs/musl-obstack/template                | 2 +-
 srcpkgs/musl-rpmatch/template                | 2 +-
 srcpkgs/mxml/template                        | 2 +-
 srcpkgs/nasm-doc/template                    | 2 +-
 srcpkgs/nasm/template                        | 2 +-
 srcpkgs/netbsd-rumpkernel/template           | 2 +-
 srcpkgs/notepadqq/template                   | 2 +-
 srcpkgs/nrg2iso/template                     | 2 +-
 srcpkgs/nyx/template                         | 2 +-
 srcpkgs/ois/template                         | 2 +-
 srcpkgs/opencollada/template                 | 2 +-
 srcpkgs/openlierox/template                  | 2 +-
 srcpkgs/openttd/template                     | 2 +-
 srcpkgs/opentyrian/template                  | 2 +-
 srcpkgs/osg/template                         | 2 +-
 srcpkgs/osmid/template                       | 2 +-
 srcpkgs/paprefs/template                     | 2 +-
 srcpkgs/parole/template                      | 2 +-
 srcpkgs/pcb/template                         | 2 +-
 srcpkgs/pcsc-ccid/template                   | 2 +-
 srcpkgs/pdmenu/template                      | 2 +-
 srcpkgs/perl-File-Rename/template            | 2 +-
 srcpkgs/pilot-link/template                  | 2 +-
 srcpkgs/pipenightdreams/template             | 2 +-
 srcpkgs/python3-pylast/template              | 2 +-
 srcpkgs/qbittorrent/template                 | 2 +-
 srcpkgs/qmmp/template                        | 2 +-
 srcpkgs/qoauth-qt5/template                  | 2 +-
 srcpkgs/qqwing/template                      | 2 +-
 srcpkgs/qrcodegen/template                   | 2 +-
 srcpkgs/qt5-styleplugins/template            | 2 +-
 srcpkgs/quadrapassel/template                | 2 +-
 srcpkgs/quake4/template                      | 2 +-
 srcpkgs/qupzilla/template                    | 2 +-
 srcpkgs/qxmpp/template                       | 2 +-
 srcpkgs/rocksndiamonds/template              | 2 +-
 srcpkgs/seabios/template                     | 2 +-
 srcpkgs/silly/template                       | 2 +-
 srcpkgs/simgear/template                     | 2 +-
 srcpkgs/spin2cpp/template                    | 2 +-
 srcpkgs/stk/template                         | 2 +-
 srcpkgs/swell-foop/template                  | 2 +-
 srcpkgs/tali/template                        | 2 +-
 srcpkgs/tesseract-ocr/template               | 2 +-
 srcpkgs/tinyclipboard/template               | 2 +-
 srcpkgs/toluapp/template                     | 2 +-
 srcpkgs/tracebox/template                    | 2 +-
 srcpkgs/tslib/template                       | 2 +-
 srcpkgs/ttyqr/template                       | 2 +-
 srcpkgs/twaindsm/template                    | 2 +-
 srcpkgs/ucpp/template                        | 2 +-
 srcpkgs/ufoai/template                       | 2 +-
 srcpkgs/vgmplay/template                     | 2 +-
 srcpkgs/vino/template                        | 2 +-
 srcpkgs/virtuoso/template                    | 2 +-
 srcpkgs/widelands-maps/template              | 2 +-
 srcpkgs/widelands/template                   | 2 +-
 srcpkgs/wildmidi/template                    | 2 +-
 srcpkgs/xerces-c/template                    | 2 +-
 srcpkgs/xf86-video-mga/template              | 2 +-
 srcpkgs/xfce4-plugins/template               | 2 +-
 srcpkgs/xnec2c/template                      | 2 +-
 srcpkgs/xsane/template                       | 2 +-
 srcpkgs/ytnef/template                       | 2 +-
 srcpkgs/zbar/template                        | 2 +-
 srcpkgs/zynaddsubfx/template                 | 2 +-
 180 files changed, 180 insertions(+), 180 deletions(-)

diff --git a/srcpkgs/CoinMP/template b/srcpkgs/CoinMP/template
index 43d8cb3fa3b5..995353eee428 100644
--- a/srcpkgs/CoinMP/template
+++ b/srcpkgs/CoinMP/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 hostmakedepends="doxygen graphviz pkg-config"
 short_desc="Library that supports most of Coin CLP, CBC and CGL"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="CPL-1.0"
 homepage="https://projects.coin-or.org/CoinMP"
 distfiles="http://www.coin-or.org/download/source/${pkgname}/${pkgname}-${version}.tgz"
diff --git a/srcpkgs/Maelstrom/template b/srcpkgs/Maelstrom/template
index 4cb1f301b4ec..7c4be8c13b2a 100644
--- a/srcpkgs/Maelstrom/template
+++ b/srcpkgs/Maelstrom/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 hostmakedepends="automake libtool SDL2_net-devel"
 makedepends="SDL2_net-devel"
 short_desc="Guide your ship through the Maelstrom asteroid belt"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.libsdl.org/projects/Maelstrom/"
 distfiles="${homepage}/src/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/MonkeysAudio/template b/srcpkgs/MonkeysAudio/template
index 44bcf5ceaa7c..6b9f47eda5e6 100644
--- a/srcpkgs/MonkeysAudio/template
+++ b/srcpkgs/MonkeysAudio/template
@@ -6,7 +6,7 @@ create_wrksrc=yes
 build_style="gnu-makefile"
 depends="libMAC>=${version}_${revision}"
 short_desc="Fast and powerful lossless audio (de)compressor"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="custom:MIT-like"
 homepage="https://monkeysaudio.com/"
 distfiles="https://monkeysaudio.com/files/MAC_SDK_${version//./}.zip
diff --git a/srcpkgs/SDL2_net/template b/srcpkgs/SDL2_net/template
index 206372e2bb66..71d1b17af693 100644
--- a/srcpkgs/SDL2_net/template
+++ b/srcpkgs/SDL2_net/template
@@ -7,7 +7,7 @@ configure_args="--disable-static"
 hostmakedepends="pkg-config"
 makedepends="SDL2-devel"
 short_desc="SDL2 networking module"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://www.libsdl.org/projects/SDL_net/"
 distfiles="https://www.libsdl.org/projects/SDL_net/release/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/SMC/template b/srcpkgs/SMC/template
index 6484c332d53f..d67469fc18a8 100644
--- a/srcpkgs/SMC/template
+++ b/srcpkgs/SMC/template
@@ -8,7 +8,7 @@ hostmakedepends="automake libtool gettext-devel pkg-config unzip"
 makedepends="MesaLib-devel boost-devel cegui07-devel gettext-devel
  SDL_image-devel SDL_mixer-devel SDL_ttf-devel"
 short_desc="Two-dimensional platform game similar to Super Mario"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.secretmaryo.org/"
 distfiles="
diff --git a/srcpkgs/TSC/template b/srcpkgs/TSC/template
index d4d636dabd56..71534315cf7c 100644
--- a/srcpkgs/TSC/template
+++ b/srcpkgs/TSC/template
@@ -13,7 +13,7 @@ makedepends="SFML-devel boost-devel cegui-devel devil-devel gettext-devel
  mruby"
 depends="mruby>=0"
 short_desc="OSS 2D platform game"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.secretchronicles.org/"
 distfiles="https://ftp.secretchronicles.org/releases/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/WiringPi/template b/srcpkgs/WiringPi/template
index 243956c2bca0..be844c979a43 100644
--- a/srcpkgs/WiringPi/template
+++ b/srcpkgs/WiringPi/template
@@ -12,7 +12,7 @@ depends="libwiringPi-${version}_${revision}
  WiringPi-gpio-${version}_${revision}
  WiringPi-examples-${version}_${revision}"
 short_desc="GPIO Interface library for the Raspberry Pi"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-3.0-or-later"
 homepage="http://wiringpi.com/"
 distfiles="https://github.com/WiringPi/WiringPi/archive/${_githash}.tar.gz"
diff --git a/srcpkgs/Z80Explorer/template b/srcpkgs/Z80Explorer/template
index f11a0e970695..7e5be704ade7 100644
--- a/srcpkgs/Z80Explorer/template
+++ b/srcpkgs/Z80Explorer/template
@@ -7,7 +7,7 @@ build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools p7zip"
 makedepends="qt5-devel qt5-script-devel"
 short_desc="Visual Zilog Z-80 netlist-level simulator"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/gdevic/Z80Explorer"
 distfiles="https://github.com/gdevic/Z80Explorer/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz
diff --git a/srcpkgs/actiona/template b/srcpkgs/actiona/template
index e520d1eac996..6ce3ccdc6b41 100644
--- a/srcpkgs/actiona/template
+++ b/srcpkgs/actiona/template
@@ -9,7 +9,7 @@ makedepends="boost-devel libnotify-devel libopencv-devel pulseaudio-devel
  qt5-x11extras-devel qt5-xmlpatterns-devel"
 depends="qt5-plugin-mysql"
 short_desc="Cross platform automation tool"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://actiona.tools/"
 distfiles="https://github.com/Jmgr/${pkgname}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/aisleriot/template b/srcpkgs/aisleriot/template
index a26d8c2f0cf0..e31845d7fe61 100644
--- a/srcpkgs/aisleriot/template
+++ b/srcpkgs/aisleriot/template
@@ -11,7 +11,7 @@ hostmakedepends="desktop-file-utils glib-devel guile intltool itstool pkg-config
 makedepends="guile-devel libcanberra-devel librsvg-devel libatomic_ops-devel"
 depends="guile yelp"
 short_desc="GNOME solitaire card game"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Aisleriot"
 distfiles="https://gitlab.gnome.org/GNOME/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/apulse/template b/srcpkgs/apulse/template
index 154ec778969e..160bd9aebaa2 100644
--- a/srcpkgs/apulse/template
+++ b/srcpkgs/apulse/template
@@ -6,7 +6,7 @@ build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="alsa-lib-devel glib-devel"
 short_desc="PulseAudio emulation for ALSA"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://github.com/i-rinat/apulse"
 distfiles="https://codeload.github.com/i-rinat/${pkgname}/tar.gz/v${version}>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/assimp/template b/srcpkgs/assimp/template
index f521d3922e05..7d45161ede5d 100644
--- a/srcpkgs/assimp/template
+++ b/srcpkgs/assimp/template
@@ -8,7 +8,7 @@ hostmakedepends="pkg-config"
 makedepends="boost-devel libgomp-devel devil-devel minizip-devel zziplib-devel"
 depends="libassimp>=${version}_${revision}"
 short_desc="Import library for various well-known 3D model formats"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://assimp.sourceforge.net/"
 distfiles="https://github.com/assimp/assimp/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/assimp_qt_viewer/template b/srcpkgs/assimp_qt_viewer/template
index 11838e028ae0..6caa2b4c7f0e 100644
--- a/srcpkgs/assimp_qt_viewer/template
+++ b/srcpkgs/assimp_qt_viewer/template
@@ -9,7 +9,7 @@ build_wrksrc="${pkgname}"
 hostmakedepends="qt5-host-tools qt5-devel"
 makedepends="qt5-devel libassimp-devel"
 short_desc="Qt-Widget-based viewer for assimp"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/assimp/assimp_qt_viewer"
 distfiles="https://github.com/assimp/${pkgname}/archive/${_gitrev}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/astromenace/template b/srcpkgs/astromenace/template
index 5008426e40b2..b3217129293c 100644
--- a/srcpkgs/astromenace/template
+++ b/srcpkgs/astromenace/template
@@ -8,7 +8,7 @@ hostmakedepends="pkg-config"
 makedepends="SDL2-devel glu-devel libopenal-devel freealut-devel libvorbis-devel
  fontconfig-devel freetype-devel libXinerama-devel"
 short_desc="Hardcore 3D space shooter"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later, OFL-1.1, CC-BY-SA-3.0"
 homepage="http://www.viewizard.com/"
 distfiles="https://github.com/viewizard/astromenace/archive/v${version}.tar.gz"
diff --git a/srcpkgs/atomix/template b/srcpkgs/atomix/template
index 392b68f995e6..a59e134ebd91 100644
--- a/srcpkgs/atomix/template
+++ b/srcpkgs/atomix/template
@@ -6,7 +6,7 @@ build_style=meson
 hostmakedepends="glib-devel itstool pkg-config"
 makedepends="libgnome-games-support-devel"
 short_desc="GNOME puzzle game where you build molecules"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Atomix"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template
index 25747b767a8a..e62a3bc2c436 100644
--- a/srcpkgs/avidemux/template
+++ b/srcpkgs/avidemux/template
@@ -13,7 +13,7 @@ makedepends="alsa-lib-devel faac-devel faad2-devel gettext-devel jack-devel glu-
  liba52-devel libmad-devel x264-devel x265-devel xvidcore-devel"
 depends="python"
 short_desc="Video editing and processing application"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://avidemux.sourceforge.net/"
 changelog="http://avidemux.sourceforge.net/news.html"
diff --git a/srcpkgs/axel/template b/srcpkgs/axel/template
index 9fbfb8237b69..c8469ee809cc 100644
--- a/srcpkgs/axel/template
+++ b/srcpkgs/axel/template
@@ -7,7 +7,7 @@ conf_files="/etc/axelrc"
 hostmakedepends="gettext-devel pkg-config"
 makedepends="openssl-devel"
 short_desc="Download accelerator for FTP and HTTP"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/axel-download-accelerator/axel"
 changelog="https://raw.githubusercontent.com/axel-download-accelerator/axel/master/ChangeLog"
diff --git a/srcpkgs/bcal/template b/srcpkgs/bcal/template
index 3fbf97ccaf61..c2c34e650984 100644
--- a/srcpkgs/bcal/template
+++ b/srcpkgs/bcal/template
@@ -6,7 +6,7 @@ build_style=gnu-makefile
 makedepends="readline-devel"
 depends="bc"
 short_desc="Byte CALculator for storage conversions and calculations"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/jarun/bcal"
 distfiles="https://github.com/jarun/bcal/archive/v${version}.tar.gz"
diff --git a/srcpkgs/bcunit/template b/srcpkgs/bcunit/template
index 29a8171ae65d..445ae1a092a6 100644
--- a/srcpkgs/bcunit/template
+++ b/srcpkgs/bcunit/template
@@ -5,7 +5,7 @@ revision=2
 build_style=cmake
 configure_args="-DENABLE_DOC=ON"
 short_desc="Lightweight unit tests in C"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/BelledonneCommunications/bcunit"
 distfiles="${homepage}/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/boinc/template b/srcpkgs/boinc/template
index d3fde8b73b6b..1eba13495c2a 100644
--- a/srcpkgs/boinc/template
+++ b/srcpkgs/boinc/template
@@ -12,7 +12,7 @@ makedepends="glu-devel libfreeglut-devel libcurl-devel
 depends="curl ca-certificates"
 conf_files="/etc/default/boinc-client"
 short_desc="Berkely Infrastructure for Network Computing"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-3.0-or-later"
 homepage="https://boinc.berkeley.edu/"
 distfiles="https://github.com/BOINC/boinc/archive/client_release/${_majorver}/${version}.tar.gz>boinc-${version}.tar.gz"
diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index ee196bbe4eec..d2e6ffb9ccda 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -8,7 +8,7 @@ pycompile_module="botan.py"
 hostmakedepends="doxygen python3"
 makedepends="openssl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
 short_desc="Crypto library written in C++"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://botan.randombit.net/"
 distfiles="https://botan.randombit.net/releases/Botan-${version}.tar.xz"
diff --git a/srcpkgs/broadcom-bt-firmware/template b/srcpkgs/broadcom-bt-firmware/template
index 93314460c88b..fe83eb64d3c5 100644
--- a/srcpkgs/broadcom-bt-firmware/template
+++ b/srcpkgs/broadcom-bt-firmware/template
@@ -6,7 +6,7 @@ _patch=_p1
 wrksrc="${pkgname}-${version}${_patch}"
 hostmakedepends="perl"
 short_desc="Broadcom Bluetooth firmware for Linux kernel"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="custom:Broadcom"
 homepage="https://github.com/winterheart/broadcom-bt-firmware"
 distfiles="https://github.com/winterheart/broadcom-bt-firmware/archive/v${version}${_patch}.tar.gz"
diff --git a/srcpkgs/cbang/template b/srcpkgs/cbang/template
index c4b45f44f2e6..63388b2aa828 100644
--- a/srcpkgs/cbang/template
+++ b/srcpkgs/cbang/template
@@ -9,7 +9,7 @@ hostmakedepends="pkg-config"
 makedepends="boost-devel bzip2-devel expat-devel leveldb-devel libevent-devel
 openssl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
 short_desc="C! (a.k.a. C-Bang) collection of C++ utility libraries"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
 homepage="https://github.com/CauldronDevelopmentLLC/cbang"
 distfiles="https://github.com/CauldronDevelopmentLLC/cbang/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/cegui/template b/srcpkgs/cegui/template
index e2a4be0f9a49..070fa66aff81 100644
--- a/srcpkgs/cegui/template
+++ b/srcpkgs/cegui/template
@@ -17,7 +17,7 @@ makedepends="libglvnd-devel SDL2-devel SDL2_image-devel libxml2-devel boost-deve
  $(vopt_if python python-devel)
  $(vopt_if gtk gtk+-devel)"
 short_desc="Crazy Eddie's Graphical User Interface"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://cegui.org.uk/"
 distfiles="https://github.com/cegui/cegui/archive/${_githash}.tar.gz"
diff --git a/srcpkgs/cegui07/template b/srcpkgs/cegui07/template
index 24b148e75070..3fa7f80a2ea7 100644
--- a/srcpkgs/cegui07/template
+++ b/srcpkgs/cegui07/template
@@ -15,7 +15,7 @@ makedepends="boost-devel devil-devel freeimage-devel freetype-devel
  $(vopt_if python 'python-devel')"
 depends="cegui07-data"
 short_desc="Crazy Eddie's Graphical User Interface (0.7.x)"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://cegui.org.uk/"
 distfiles="${SOURCEFORGE_SITE}/crayzedsgui/CEGUI%20Mk-2/${version}/CEGUI-${version}.tar.gz"
diff --git a/srcpkgs/choqok/template b/srcpkgs/choqok/template
index 080e1d589e2d..75a2c16f63e0 100644
--- a/srcpkgs/choqok/template
+++ b/srcpkgs/choqok/template
@@ -7,7 +7,7 @@ hostmakedepends="extra-cmake-modules gettext pkg-config"
 makedepends="kcmutils-devel kdewebkit-devel kemoticons-devel knotifyconfig-devel
  kparts-devel qca-qt5-devel qt5-networkauth-devel qt5-devel purpose-devel telepathy-qt5-devel"
 short_desc="Twitter, Pump.io, GNU social client for KDE"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://choqok.kde.org/"
 distfiles="${KDE_SITE}/${pkgname}/${version%.*}/src/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/ckmame/template b/srcpkgs/ckmame/template
index 7140737d051e..1b88f6a965cb 100644
--- a/srcpkgs/ckmame/template
+++ b/srcpkgs/ckmame/template
@@ -9,7 +9,7 @@ hostmakedepends="pkg-config"
 makedepends="libxml2-devel libzip-devel sqlite-devel"
 checkdepends="perl"
 short_desc="Program to check ROM sets for MAME"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-clause"
 homepage="https://nih.at/ckmame/"
 distfiles="https://github.com/nih-at/ckmame/archive/rel-${version//./-}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index e65ed2c9ed8e..2dcc86015d9f 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -15,7 +15,7 @@ hostmakedepends="flex pkg-config zip"
 makedepends="json-c-devel libcurl-devel libmspack-devel libxml2-devel
  ncurses-devel pcre-devel tcl-devel"
 short_desc="Clam Anti-Virus scanner"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="http://www.clamav.net/"
 distfiles="http://www.clamav.net/downloads/production/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/cld2/template b/srcpkgs/cld2/template
index 5c7b638f29fe..85999552be41 100644
--- a/srcpkgs/cld2/template
+++ b/srcpkgs/cld2/template
@@ -5,7 +5,7 @@ revision=1
 _gitrev=b56fa78a2fe44ac2851bae5bf4f4693a0644da7b
 wrksrc="${pkgname}-${_gitrev}"
 short_desc="Compact Language Detector 2"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/CLD2Owners/cld2"
 distfiles="https://github.com/CLD2Owners/cld2/archive/${_gitrev}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/codeblocks/template b/srcpkgs/codeblocks/template
index 43c9e4127a56..33b9b9a77853 100644
--- a/srcpkgs/codeblocks/template
+++ b/srcpkgs/codeblocks/template
@@ -9,7 +9,7 @@ hostmakedepends="automake libtool pkg-config zip"
 makedepends="gtk+3-devel wxWidgets-gtk3-devel tinyxml-devel hunspell-devel
  gamin-devel boost-devel boost-build"
 short_desc="Free C, C++ and Fortran IDE"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="http://www.codeblocks.org"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/Sources/${version}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/cpp-hocon/template b/srcpkgs/cpp-hocon/template
index 181463376996..1e050aeb41aa 100644
--- a/srcpkgs/cpp-hocon/template
+++ b/srcpkgs/cpp-hocon/template
@@ -7,7 +7,7 @@ hostmakedepends="pkg-config"
 makedepends="boost-devel leatherman-devel libcurl-devel"
 depends="leatherman"
 short_desc="C++ port of the Typesafe Config library"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/puppetlabs/cpp-hocon/"
 distfiles="https://github.com/puppetlabs/cpp-hocon/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template
index 6864371d1c83..4561bc7ff8b6 100644
--- a/srcpkgs/cross-i686-linux-musl/template
+++ b/srcpkgs/cross-i686-linux-musl/template
@@ -12,7 +12,7 @@ hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${pkgname/cross-}"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 homepage="https://www.voidlinux.org/"
 license="GPL-2.0-or-later, GPL-3.0-or-later, MIT"
 distfiles="
diff --git a/srcpkgs/cross-i686-pc-linux-gnu/template b/srcpkgs/cross-i686-pc-linux-gnu/template
index d63680b65726..263a43f7a7b8 100644
--- a/srcpkgs/cross-i686-pc-linux-gnu/template
+++ b/srcpkgs/cross-i686-pc-linux-gnu/template
@@ -11,7 +11,7 @@ hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${pkgname/cross-}"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.voidlinux.org/"
 distfiles="
diff --git a/srcpkgs/cross-powerpc64-linux-gnu/template b/srcpkgs/cross-powerpc64-linux-gnu/template
index c99c7dd1e97a..35cfcaa6f02e 100644
--- a/srcpkgs/cross-powerpc64-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64-linux-gnu/template
@@ -13,7 +13,7 @@ hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel gmp-devel mpfr-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 short_desc="Void cross toolchain for ${pkgname/cross-}"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.voidlinux.org/"
 distfiles="
diff --git a/srcpkgs/cubietruck-base/template b/srcpkgs/cubietruck-base/template
index fa80bb39bbc0..93dc21d8db3c 100644
--- a/srcpkgs/cubietruck-base/template
+++ b/srcpkgs/cubietruck-base/template
@@ -5,7 +5,7 @@ revision=2
 build_style=meta
 homepage="http://www.voidlinux.org"
 short_desc="Void Linux Cubietruck (Cubieboard 3) platform package"
-maintainer="Jürgen Buchmüller <pullmoll@t-online>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Public Domain"
 
 archs="armv7l"
diff --git a/srcpkgs/devil/template b/srcpkgs/devil/template
index 95bc542c6d6e..1dffc7bdd52c 100644
--- a/srcpkgs/devil/template
+++ b/srcpkgs/devil/template
@@ -9,7 +9,7 @@ hostmakedepends="pkg-config"
 makedepends="lcms-devel libpng-devel libmng-devel jasper-devel
  glew-devel libfreeglut-devel libopenexr-devel SDL_image-devel"
 short_desc="Developer's Image Library"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1"
 homepage="http://openil.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/openil/DevIL-${version}.tar.gz"
diff --git a/srcpkgs/dialogbox/template b/srcpkgs/dialogbox/template
index bdf95c2ad451..31d985e61769 100644
--- a/srcpkgs/dialogbox/template
+++ b/srcpkgs/dialogbox/template
@@ -6,7 +6,7 @@ build_style=qmake
 hostmakedepends="qt5-host-tools qt5-qmake"
 makedepends="qt5-devel"
 short_desc="Scriptable engine with customizable GUI for shell scripts"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/martynets/dialogbox"
 distfiles="https://github.com/martynets/dialogbox/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/dm-zoned-tools/template b/srcpkgs/dm-zoned-tools/template
index 2df918003a4f..d76e4cbe1834 100644
--- a/srcpkgs/dm-zoned-tools/template
+++ b/srcpkgs/dm-zoned-tools/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="automake libtool"
 makedepends="device-mapper-devel libblkid-devel libkmod-devel"
 short_desc="Userspace tool for the dm-zoned device mapper"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/hgst/dm-zoned-tools/"
 distfiles="https://github.com/hgst/${pkgname}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/enigma/template b/srcpkgs/enigma/template
index b913c6f514c6..d04fa5112492 100644
--- a/srcpkgs/enigma/template
+++ b/srcpkgs/enigma/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="ImageMagick automake libtool gettext-devel SDL-devel pkg-config"
 makedepends="libcurl-devel libxerces-c-devel SDL_mixer-devel SDL_image-devel SDL_ttf-devel"
 short_desc="Puzzle game inspired by Oxyd on the Atari ST"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.nongnu.org/enigma/"
 distfiles="${SOURCEFORGE_SITE}/enigma-game/Release%20${version}/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/ent/template b/srcpkgs/ent/template
index 0505ecfbfa97..e8c50ee0681c 100644
--- a/srcpkgs/ent/template
+++ b/srcpkgs/ent/template
@@ -6,7 +6,7 @@ create_wrksrc=yes
 build_style=gnu-makefile
 hostmakedepends="unzip"
 short_desc="Evaluate pseudo random number generators"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Public Domain"
 homepage="http://www.fourmilab.ch/random/"
 distfiles="${homepage}/random.zip"
diff --git a/srcpkgs/fah/template b/srcpkgs/fah/template
index ad717b51f862..8fb277fef313 100644
--- a/srcpkgs/fah/template
+++ b/srcpkgs/fah/template
@@ -6,7 +6,7 @@ archs="x86_64"
 hostmakedepends="python"
 depends="python desktop-file-utils hicolor-icon-theme"
 short_desc="Folding@home distributed computation power for research"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="custom:Proprietary, GPL-2.0-only"
 homepage="https://foldingathome.org"
 distfiles="https://download.foldingathome.org/releases/public/release/fahclient/debian-stable-64bit/v${version%.*}/fahclient_${version}_amd64.deb
diff --git a/srcpkgs/fbida/template b/srcpkgs/fbida/template
index 170baf031b71..347632343733 100644
--- a/srcpkgs/fbida/template
+++ b/srcpkgs/fbida/template
@@ -10,7 +10,7 @@ freetype-devel libcurl-devel libdrm-devel libepoxy-devel libglib-devel libXpm-de
 libXt-devel pixman-devel cairo-devel poppler-glib-devel libwebp-devel tiff-devel
 libwebp-devel sane-devel"
 short_desc="Display and elementary edit images using fbdev"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.kraxel.org/blog/linux/fbida/"
 distfiles="https://www.kraxel.org/releases/${pkgname}/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/ffmpegthumbnailer/template b/srcpkgs/ffmpegthumbnailer/template
index ab627032c2e2..039eea7622b3 100644
--- a/srcpkgs/ffmpegthumbnailer/template
+++ b/srcpkgs/ffmpegthumbnailer/template
@@ -7,7 +7,7 @@ hostmakedepends="pkg-config"
 makedepends="libpng-devel libjpeg-turbo-devel ffmpeg-devel"
 depends="ffmpeg"
 short_desc="Lightweight video thumbnailer"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/dirkvdb/${pkgname}"
 distfiles="${homepage}/releases/download/${version}/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/firebird3/template b/srcpkgs/firebird3/template
index df02ac1379c7..a84cc7ef9234 100644
--- a/srcpkgs/firebird3/template
+++ b/srcpkgs/firebird3/template
@@ -30,7 +30,7 @@ hostmakedepends="automake libtool pkg-config icu"
 makedepends="boost-devel libedit-devel icu-devel ncurses-devel libatomic_ops-devel
  libtommath-devel zlib-devel"
 short_desc="Relational database offering many ANSI SQL standard features (V3)"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="custom"
 homepage="https://www.firebirdsql.org/en/start/"
 distfiles="https://github.com/FirebirdSQL/firebird/releases/download/R${_uver%_*}/Firebird-${version}-${_build}.tar.bz2"
diff --git a/srcpkgs/firefox-esr-i18n/template b/srcpkgs/firefox-esr-i18n/template
index 32724397ee39..5d62a9f8a99a 100644
--- a/srcpkgs/firefox-esr-i18n/template
+++ b/srcpkgs/firefox-esr-i18n/template
@@ -4,7 +4,7 @@ version=78.8.0
 revision=1
 build_style=meta
 short_desc="Firefox ESR language packs"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.mozilla.org/firefox/"
 
diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index 56c0ae7cb4bc..61f36d2058e8 100644
--- a/srcpkgs/firefox-esr/template
+++ b/srcpkgs/firefox-esr/template
@@ -18,7 +18,7 @@ makedepends="nss-devel libjpeg-turbo-devel gtk+-devel gtk+3-devel icu-devel
  $(vopt_if sndio sndio-devel) $(vopt_if jack jack-devel)"
 depends="nss>=3.53 desktop-file-utils hicolor-icon-theme"
 short_desc="Firefox browser - Extended Support Release"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/organizations/"
 distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
diff --git a/srcpkgs/five-or-more/template b/srcpkgs/five-or-more/template
index eadab37b26af..bb137c32d42c 100644
--- a/srcpkgs/five-or-more/template
+++ b/srcpkgs/five-or-more/template
@@ -6,7 +6,7 @@ build_style=meson
 hostmakedepends="gettext glib-devel itstool pkg-config vala"
 makedepends="gtk+3-devel librsvg-devel libgee08-devel libgnome-games-support-devel"
 short_desc="GNOME align five or more objects game"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Five%20or%20more"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/flexprop/template b/srcpkgs/flexprop/template
index 3b8ce55d3c82..4529640916df 100644
--- a/srcpkgs/flexprop/template
+++ b/srcpkgs/flexprop/template
@@ -6,7 +6,7 @@ hostmakedepends="loadp2 which"
 makedepends="tk-devel"
 depends="loadp2 tk xterm"
 short_desc="Simple GUI for creating applications on the Parallax Propeller 2"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/totalspectrum/flexprop/"
 distfiles="https://github.com/totalspectrum/${pkgname}/archive/v${version}.tar.gz"
diff --git a/srcpkgs/flightgear/template b/srcpkgs/flightgear/template
index 5313f97d0c5e..e5528205b9e0 100644
--- a/srcpkgs/flightgear/template
+++ b/srcpkgs/flightgear/template
@@ -12,7 +12,7 @@ makedepends="MesaLib-devel boost-devel freealut-devel libevent-devel
  $(vopt_if qt 'qt5-devel qt5-tools-devel qt5-declarative-devel qt5-svg-devel')"
 depends="flightgear-data>=${version}"
 short_desc="Sophisticated flight simulator"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.flightgear.org/"
 distfiles="
diff --git a/srcpkgs/four-in-a-row/template b/srcpkgs/four-in-a-row/template
index b39ae1dc1850..cc6f458b44d4 100644
--- a/srcpkgs/four-in-a-row/template
+++ b/srcpkgs/four-in-a-row/template
@@ -6,7 +6,7 @@ build_style=meson
 hostmakedepends="gettext glib-devel itstool pkg-config vala"
 makedepends="gsound-devel gtk+3-devel libcanberra-devel librsvg-devel"
 short_desc="GNOME four in a row game"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Four-in-a-row"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/freedroidRPG/template b/srcpkgs/freedroidRPG/template
index e3e7a01fd33c..9ed80a8b1267 100644
--- a/srcpkgs/freedroidRPG/template
+++ b/srcpkgs/freedroidRPG/template
@@ -8,7 +8,7 @@ hostmakedepends="pkg-config python"
 makedepends="SDL_gfx-devel SDL_image-devel SDL_mixer-devel
  libjpeg-turbo-devel libvorbis-devel lua53-devel libpng-devel"
 short_desc="Role playing game featuring Tux and evil robots"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.freedroid.org/"
 distfiles="http://ftp.osuosl.org/pub/freedroid/${pkgname}-${version%.*}/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/freeimage/template b/srcpkgs/freeimage/template
index d06403bfd747..c45052a67b17 100644
--- a/srcpkgs/freeimage/template
+++ b/srcpkgs/freeimage/template
@@ -6,7 +6,7 @@ wrksrc=FreeImage
 build_style=gnu-makefile
 hostmakedepends="unzip"
 short_desc="Support library for popular graphics image formats"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, FreeImage"
 homepage="http://freeimage.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/freeimage/Source%20Distribution/FreeImage${version//./}.zip"
diff --git a/srcpkgs/freerouting/template b/srcpkgs/freerouting/template
index 6c7655a9ea72..123cb60b2daf 100644
--- a/srcpkgs/freerouting/template
+++ b/srcpkgs/freerouting/template
@@ -5,7 +5,7 @@ revision=2
 hostmakedepends="gradle openjdk11"
 depends="openjdk11"
 short_desc="Advanced PCB autorouter"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/freerouting/freerouting"
 distfiles="https://github.com/freerouting/${pkgname}/archive/v${version}.tar.gz"
diff --git a/srcpkgs/gconfmm/template b/srcpkgs/gconfmm/template
index 23995ac0bdaa..4411ea02ccae 100644
--- a/srcpkgs/gconfmm/template
+++ b/srcpkgs/gconfmm/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="pkg-config perl"
 makedepends="GConf-devel glibmm-devel"
 short_desc="C++ bindings for GConf"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://gconfmm.sourceforge.net"
 distfiles="${GNOME_SITE}/gconfmm/${version%.*}/gconfmm-${version}.tar.xz"
diff --git a/srcpkgs/gdash/template b/srcpkgs/gdash/template
index ba997f875fd8..04d55d085a66 100644
--- a/srcpkgs/gdash/template
+++ b/srcpkgs/gdash/template
@@ -9,7 +9,7 @@ makedepends="glu-devel gtk+-devel SDL2_image-devel SDL2_mixer-devel"
 configure_args="--with-sdl-prefix=${XBPS_CROSS_BASE}/usr"
 
 short_desc="Boulder Dash clone close to the original"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://bitbucket.org/czirkoszoltan/gdash"
 distfiles="https://bitbucket.org/czirkoszoltan/${pkgname}/downloads/${pkgname}-${version}unstable.tar.gz"
diff --git a/srcpkgs/geda/template b/srcpkgs/geda/template
index d3ee7d151d6f..6626bc91fd94 100644
--- a/srcpkgs/geda/template
+++ b/srcpkgs/geda/template
@@ -11,7 +11,7 @@ makedepends="gamin-devel gc-devel gtk+-devel guile-devel python-devel libatomic_
 depends="guile"
 checkdepends="perl"
 short_desc="Electronic Design Automation tool"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.geda-project.org/"
 distfiles="http://ftp.geda-project.org/geda-gaf/stable/v${version%.*}/${version}/geda-gaf-${version}.tar.gz"
diff --git a/srcpkgs/gifsicle/template b/srcpkgs/gifsicle/template
index 119c18fc4eb0..9844c5783405 100644
--- a/srcpkgs/gifsicle/template
+++ b/srcpkgs/gifsicle/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 short_desc="Command-line tool for information about GIF images"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.lcdf.org/gifsicle/"
 distfiles="https://github.com/kohler/gifsicle/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/glyphy/template b/srcpkgs/glyphy/template
index 15079905c59a..e2af47e04429 100644
--- a/srcpkgs/glyphy/template
+++ b/srcpkgs/glyphy/template
@@ -8,7 +8,7 @@ build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config which"
 makedepends="freetype-devel"
 short_desc="Signed-distance-field (SDF) text renderer using OpenGL"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/behdad/glyphy"
 distfiles="https://codeload.github.com/behdad/glyphy/tar.gz/${_gitrev}>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/gnome-chess/template b/srcpkgs/gnome-chess/template
index 2e3cfa721d4f..4ed9e8bc914e 100644
--- a/srcpkgs/gnome-chess/template
+++ b/srcpkgs/gnome-chess/template
@@ -7,7 +7,7 @@ hostmakedepends="gettext pkg-config vala glib-devel itstool librsvg-devel"
 makedepends="gtk+3-devel librsvg-devel"
 depends="gnuchess"
 short_desc="GNOME chess user interface"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Chess"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/gnome-icon-theme-xfce/template b/srcpkgs/gnome-icon-theme-xfce/template
index f8a78eb2027f..54efb083c544 100644
--- a/srcpkgs/gnome-icon-theme-xfce/template
+++ b/srcpkgs/gnome-icon-theme-xfce/template
@@ -4,7 +4,7 @@ version=0.6
 revision=3
 wrksrc="gnome-icon-theme-xfce"
 short_desc="Theme adding missing icons for Xfce"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://launchpad.net/gnome-icon-theme-xfce"
 distfiles="https://launchpad.net/gnome-icon-theme-xfce/trunk/${version}/+download/gnome-icon-theme-xfce-source-${version}.tar.gz"
diff --git a/srcpkgs/gnome-klotski/template b/srcpkgs/gnome-klotski/template
index c1ddd4a7d117..f07c1ea0105a 100644
--- a/srcpkgs/gnome-klotski/template
+++ b/srcpkgs/gnome-klotski/template
@@ -6,7 +6,7 @@ build_style=meson
 hostmakedepends="gettext glib-devel itstool pkg-config vala"
 makedepends="librsvg-devel libgnome-games-support-devel"
 short_desc="GNOME puzzle game where you move blocks"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Klotski"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/gnome-mahjongg/template b/srcpkgs/gnome-mahjongg/template
index 3c8f2e7039e6..9cf1ef18d634 100644
--- a/srcpkgs/gnome-mahjongg/template
+++ b/srcpkgs/gnome-mahjongg/template
@@ -7,7 +7,7 @@ configure_args="-Dcompile-schemas=disabled -Dupdate-icon-cache=disabled"
 hostmakedepends="gettext glib-devel itstool pkg-config vala"
 makedepends="librsvg-devel gtk+3-devel libglib-devel"
 short_desc="GNOME Mahjongg solitaire game"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Mahjongg"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/gnome-mines/template b/srcpkgs/gnome-mines/template
index 31813fef3648..bb3377650691 100644
--- a/srcpkgs/gnome-mines/template
+++ b/srcpkgs/gnome-mines/template
@@ -6,7 +6,7 @@ build_style=meson
 hostmakedepends="gettext glib-devel itstool pkg-config vala"
 makedepends="libgnome-games-support-devel librsvg-devel"
 short_desc="GNOME puzzle game where you locate mines in the ocean"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Mines"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/gnome-nibbles/template b/srcpkgs/gnome-nibbles/template
index 7a23c7e70ee9..e09a03a81ca2 100644
--- a/srcpkgs/gnome-nibbles/template
+++ b/srcpkgs/gnome-nibbles/template
@@ -7,7 +7,7 @@ hostmakedepends="gettext glib-devel intltool itstool pkg-config vala"
 makedepends="clutter-gtk-devel gsound-devel libcanberra-devel
  libgnome-games-support-devel librsvg-devel"
 short_desc="GNOME snake eats diamonds game"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 changelog="https://github.com/GNOME/gnome-nibbles/raw/gnome-3-24/NEWS"
 homepage="https://wiki.gnome.org/Apps/Nibbles"
diff --git a/srcpkgs/gnome-robots/template b/srcpkgs/gnome-robots/template
index 1c370caf5fa4..1d85efb012db 100644
--- a/srcpkgs/gnome-robots/template
+++ b/srcpkgs/gnome-robots/template
@@ -7,7 +7,7 @@ hostmakedepends="gettext glib-devel itstool pkg-config"
 makedepends="gsound-devel gtk+3-devel libcanberra-devel librsvg-devel
  libglib-devel libgnome-games-support-devel"
 short_desc="GNOME classic robots game"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Robots"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/gnome-sudoku/template b/srcpkgs/gnome-sudoku/template
index 2348ba05e49d..86c314e7f147 100644
--- a/srcpkgs/gnome-sudoku/template
+++ b/srcpkgs/gnome-sudoku/template
@@ -7,7 +7,7 @@ build_style=meson
 hostmakedepends="gettext glib-devel itstool pkg-config vala"
 makedepends="gtk+3-devel libgee08-devel json-glib-devel qqwing-devel"
 short_desc="GNOME Sudoku Japanese logic game"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Sudoku"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/gnome-tetravex/template b/srcpkgs/gnome-tetravex/template
index 78f0ef176f39..f9879dcdfcce 100644
--- a/srcpkgs/gnome-tetravex/template
+++ b/srcpkgs/gnome-tetravex/template
@@ -6,7 +6,7 @@ build_style=meson
 hostmakedepends="gettext itstool pkg-config vala glib-devel"
 makedepends="gtk+3-devel libglib-devel"
 short_desc="GNOME puzzle game where you align pieces with numbers"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Tetravex"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/gnurobbo/template b/srcpkgs/gnurobbo/template
index ea4d14790583..49d4b52577f2 100644
--- a/srcpkgs/gnurobbo/template
+++ b/srcpkgs/gnurobbo/template
@@ -7,7 +7,7 @@ build_style=gnu-makefile
 hostmakedepends="pkg-config"
 makedepends="SDL_mixer-devel SDL_image-devel SDL_ttf-devel"
 short_desc="Reimplementation of Janusz Pelc's Robbo for Atari XE/XL"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2"
 homepage="http://gnurobbo.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/gnurobbo/gnurobbo/gnurobbo%20${version}/gnurobbo-${version}-source.tar.gz"
diff --git a/srcpkgs/grub-customizer/template b/srcpkgs/grub-customizer/template
index 37a8467653f4..67f3cfb3e7ee 100644
--- a/srcpkgs/grub-customizer/template
+++ b/srcpkgs/grub-customizer/template
@@ -9,7 +9,7 @@ depends="hicolor-icon-theme grub-utils"
 conf_files="/etc/grub-customizer/grub.cfg"
 archs="i686* x86_64*"
 short_desc="Graphical grub2 settings manager"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://launchpad.net/grub-customizer/"
 distfiles="https://launchpad.net/${pkgname}/${version%.*}/${version}/+download/${pkgname}_${version}.tar.gz"
diff --git a/srcpkgs/grub-terminus/template b/srcpkgs/grub-terminus/template
index 7e4e8c2e2f7e..2275e5a6d224 100644
--- a/srcpkgs/grub-terminus/template
+++ b/srcpkgs/grub-terminus/template
@@ -4,7 +4,7 @@ version=0.3
 revision=1
 hostmakedepends="grub-utils terminus-font"
 short_desc="Terminus bold fonts for GRUB"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="OFL-1.1, GPL-2.0-or-later"
 homepage="https://voidlinux.org"
 
diff --git a/srcpkgs/hitori/template b/srcpkgs/hitori/template
index 10b7d2ac4951..061990af5058 100644
--- a/srcpkgs/hitori/template
+++ b/srcpkgs/hitori/template
@@ -6,7 +6,7 @@ build_style=meson
 hostmakedepends="gettext glib-devel intltool itstool pkg-config"
 makedepends="gtk+3-devel"
 short_desc="GNOME eponymous puzzle game"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2"
 homepage="https://wiki.gnome.org/Apps/Hitori"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/iagno/template b/srcpkgs/iagno/template
index 6867e5334510..c70fb8250785 100644
--- a/srcpkgs/iagno/template
+++ b/srcpkgs/iagno/template
@@ -6,7 +6,7 @@ build_style=meson
 hostmakedepends="gettext glib-devel gdk-pixbuf itstool pkg-config vala"
 makedepends="gsound-devel libcanberra-devel librsvg-devel"
 short_desc="GNOME Reversi (Othello) game"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Iagno"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/icu4lua/template b/srcpkgs/icu4lua/template
index 58a1800279d4..9adf55946651 100644
--- a/srcpkgs/icu4lua/template
+++ b/srcpkgs/icu4lua/template
@@ -7,7 +7,7 @@ build_style=gnu-makefile
 hostmakedepends="pkg-config unzip"
 makedepends="icu-devel lua51-devel"
 short_desc="Binary module for providing Unicode support to Lua"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT,X"
 homepage="http://luaforge.net/projects/icu-lua/"
 distfiles="
diff --git a/srcpkgs/iniparser/template b/srcpkgs/iniparser/template
index a780d47dbdd8..fb813c7d870d 100644
--- a/srcpkgs/iniparser/template
+++ b/srcpkgs/iniparser/template
@@ -5,7 +5,7 @@ revision=3
 build_style=gnu-makefile
 hostmakedepends="doxygen chrpath"
 short_desc="Free stand-alone ini file parsing library"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://ndevilla.free.fr/iniparser/"
 distfiles="https://github.com/ndevilla/iniparser/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/injeqt/template b/srcpkgs/injeqt/template
index 78eba09a0249..3efad365a492 100644
--- a/srcpkgs/injeqt/template
+++ b/srcpkgs/injeqt/template
@@ -7,7 +7,7 @@ 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>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/vogel/injeqt/"
 distfiles="https://github.com/vogel/${pkgname}/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/iselect/template b/srcpkgs/iselect/template
index 7b0737f37747..37318b036b7e 100644
--- a/srcpkgs/iselect/template
+++ b/srcpkgs/iselect/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="ncurses-devel"
 short_desc="Interactive line selection tool for textual files"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2"
 homepage="http://www.ossp.org/pkg/tool/iselect/"
 distfiles="${DEBIAN_SITE}/main/${pkgname:0:1}/${pkgname}/${pkgname}_${version}.orig.tar.gz"
diff --git a/srcpkgs/javahelp2/template b/srcpkgs/javahelp2/template
index 5418d08075af..8db0e13810b2 100644
--- a/srcpkgs/javahelp2/template
+++ b/srcpkgs/javahelp2/template
@@ -6,7 +6,7 @@ _gitver=3ca862d8626096770598a3a256886d205246f4a4
 wrksrc=javahelp-${_gitver}
 short_desc="Java based help system"
 hostmakedepends="openjdk8 apache-ant unzip which"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="CDDL-1.1, GPL-2.0-only"
 homepage="https://javahelp.java.net/"
 distfiles="https://github.com/javaee/javahelp/archive/${_gitver}.zip>${pkgname}-${version}.zip"
diff --git a/srcpkgs/json-c++/template b/srcpkgs/json-c++/template
index 23c0d56fc8e8..87d68e676c8d 100644
--- a/srcpkgs/json-c++/template
+++ b/srcpkgs/json-c++/template
@@ -7,7 +7,7 @@ build_style=cmake
 configure_args="-DJSON_MultipleHeaders=ON"
 checkdepends="git"
 short_desc="JSON for modern C++"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/nlohmann/json"
 distfiles="https://github.com/nlohmann/json/archive/v${version}.tar.gz"
diff --git a/srcpkgs/kea/template b/srcpkgs/kea/template
index aab6022e4957..dc0bcc5de3fc 100644
--- a/srcpkgs/kea/template
+++ b/srcpkgs/kea/template
@@ -16,7 +16,7 @@ depends="libkea>=0"
 checkdepends="procps-ng" #needs pgrep
 conf_files="/etc/kea/*.conf"
 short_desc="Next generation DHCPv4/v6 server"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0, Apache-2.0"
 homepage="https://kea.isc.org"
 distfiles="http://ftp.isc.org/isc/kea/${version/.P/-P}/kea-${version/.P/-P}.tar.gz"
diff --git a/srcpkgs/kobodeluxe/template b/srcpkgs/kobodeluxe/template
index 3de0311b8e52..94e3e8329728 100644
--- a/srcpkgs/kobodeluxe/template
+++ b/srcpkgs/kobodeluxe/template
@@ -8,7 +8,7 @@ configure_args="--sharedstatedir=/var/games"
 hostmakedepends="pkg-config"
 makedepends="SDL_image-devel"
 short_desc="Space shooter in 2D"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://olofson.net/kobodl"
 distfiles="${homepage}/download/KoboDeluxe-${version}.tar.bz2"
diff --git a/srcpkgs/leatherman/template b/srcpkgs/leatherman/template
index 5f28459fd73c..b61fcd5dc205 100644
--- a/srcpkgs/leatherman/template
+++ b/srcpkgs/leatherman/template
@@ -7,7 +7,7 @@ configure_args="-DLEATHERMAN_SHARED=ON"
 hostmakedepends="pkg-config python3"
 makedepends="boost-devel libcurl-devel"
 short_desc="Collection of C++ and CMake utility libraries"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/puppetlabs/leatherman/"
 distfiles="https://github.com/puppetlabs/leatherman/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/leptonica/template b/srcpkgs/leptonica/template
index 9461bb050d39..cc24df74e47d 100644
--- a/srcpkgs/leptonica/template
+++ b/srcpkgs/leptonica/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libopenjpeg2-devel libwebp-devel"
 short_desc="Image processing and analysis library"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="http://leptonica.org/"
 distfiles="http://leptonica.org/source/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/libclc/template b/srcpkgs/libclc/template
index a1ff860eacd2..b73aac741dc0 100644
--- a/srcpkgs/libclc/template
+++ b/srcpkgs/libclc/template
@@ -8,7 +8,7 @@ configure_args="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release"
 hostmakedepends="cmake clang llvm python3 libedit-devel libffi-devel
  ncurses-devel zlib-devel"
 short_desc="Open implementation of the OpenCL C programming language"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause, MIT"
 homepage="https://libclc.llvm.org"
 distfiles="https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/libclc-${version}.src.tar.xz"
diff --git a/srcpkgs/libe-book/template b/srcpkgs/libe-book/template
index 0ea778589437..2c9fb778531c 100644
--- a/srcpkgs/libe-book/template
+++ b/srcpkgs/libe-book/template
@@ -7,7 +7,7 @@ configure_args="--disable-werror"
 hostmakedepends="automake libtool gperf doxygen pkg-config"
 makedepends="boost-devel icu-devel libcppunit-devel libxml2-devel librevenge-devel liblangtag-devel"
 short_desc="Import reflowable e-book formats"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="http://sourceforge.net/projects/libebook/"
 distfiles="${SOURCEFORGE_SITE}/project/libebook/${pkgname}-${version}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/libepubgen/template b/srcpkgs/libepubgen/template
index 1c46ef658e6f..9990fa39449e 100644
--- a/srcpkgs/libepubgen/template
+++ b/srcpkgs/libepubgen/template
@@ -7,7 +7,7 @@ hostmakedepends="doxygen pkg-config"
 makedepends="boost-devel libxml2-devel librevenge-devel"
 checkdepends="libcppunit-devel"
 short_desc="EPUB generator for librevenge"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://sourceforge.net/projects/libepubgen/"
 distfiles="${SOURCEFORGE_SITE}/../project/${pkgname}/${pkgname}-${version}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/libfreehand/template b/srcpkgs/libfreehand/template
index 61202d61ca81..10282b4bd0d4 100644
--- a/srcpkgs/libfreehand/template
+++ b/srcpkgs/libfreehand/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="doxygen gperf perl pkg-config"
 makedepends="icu-devel lcms2-devel librevenge-devel"
 short_desc="Parser for Aldus/Macromedia/Adobe FreeHand documents"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://wiki.documentfoundation.org/DLP/Libraries/libfreehand"
 distfiles="http://dev-www.libreoffice.org/src/${pkgname}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/libgadu/template b/srcpkgs/libgadu/template
index f075c0cd2bf9..3775a273ca97 100644
--- a/srcpkgs/libgadu/template
+++ b/srcpkgs/libgadu/template
@@ -7,7 +7,7 @@ configure_args="--with-c99-vsnprintf"
 hostmakedepends="automake libtool pkg-config perl protobuf-c"
 makedepends="gnutls-devel libcurl-devel expat-devel libxml2-devel zlib-devel"
 short_desc="Gadu-Gadu instant messaging protocol library"
-maintainer="Jürgen Buchüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
 homepage="https://www.wasilczyk.pl/en/projects/libgadu/"
 distfiles="https://github.com/wojtekka/${pkgname}/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index f921ca3fffc6..72c96ff67605 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -11,7 +11,7 @@ makedepends="freexl-devel geos-devel jasper-devel json-c-devel
  libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl2-headers pcre2-devel
  proj-devel sqlite-devel ocl-icd-devel"
 short_desc="Geospatial Data Abstraction Library"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://www.gdal.org/"
 distfiles="http://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz"
diff --git a/srcpkgs/libgnome-games-support/template b/srcpkgs/libgnome-games-support/template
index 69e2cadc6e54..60a1aba20271 100644
--- a/srcpkgs/libgnome-games-support/template
+++ b/srcpkgs/libgnome-games-support/template
@@ -6,7 +6,7 @@ build_style=meson
 hostmakedepends="intltool pkg-config gobject-introspection vala"
 makedepends="gtk+3-devel libgee08-devel"
 short_desc="GNOME games shared code"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://git.gnome.org/browse/libgnome-games-support/"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/libgta/template b/srcpkgs/libgta/template
index b055b91b2b85..cae699f1b481 100644
--- a/srcpkgs/libgta/template
+++ b/srcpkgs/libgta/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="bzip2-devel liblzma-devel zlib-devel"
 short_desc="Generic Tagged Arrays"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://marlam.de/gta/"
 distfiles="https://marlam.de/gta/releases/libgta-${version}.tar.xz"
diff --git a/srcpkgs/libixion/template b/srcpkgs/libixion/template
index 6ffb939d830b..60a21b07ac94 100644
--- a/srcpkgs/libixion/template
+++ b/srcpkgs/libixion/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="pkg-config python3"
 makedepends="boost-devel fmt-devel mdds python3-devel spdlog"
 short_desc="General purpose formula parser and interpreter"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://gitlab.com/ixion/ixion/"
 distfiles="http://kohei.us/files/ixion/src/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/libnumbertext/template b/srcpkgs/libnumbertext/template
index ad68e52442ed..11611f5c3810 100644
--- a/srcpkgs/libnumbertext/template
+++ b/srcpkgs/libnumbertext/template
@@ -4,7 +4,7 @@ version=1.0.7
 revision=1
 build_style=gnu-configure
 short_desc="Language-neutral NUMBERTEXT and MONEYTEXT for LibreOffice Calc"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/Numbertext/libnumbertext"
 distfiles="http://dev-www.libreoffice.org/src/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/libomxil-bellagio/template b/srcpkgs/libomxil-bellagio/template
index 966de521c471..6b120a2a87c4 100644
--- a/srcpkgs/libomxil-bellagio/template
+++ b/srcpkgs/libomxil-bellagio/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="automake libtool doxygen"
 short_desc="Opensource implementation of the OpenMAX Integration Layer API"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://omxil.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/omxil/omxil/Bellagio%20${version}/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/libopenraw/template b/srcpkgs/libopenraw/template
index 14af5153b385..5b2f7bbd814f 100644
--- a/srcpkgs/libopenraw/template
+++ b/srcpkgs/libopenraw/template
@@ -7,7 +7,7 @@ configure_args="--with-boost=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="pkg-config curl"
 makedepends="glib-devel gdk-pixbuf-devel boost-devel libxml2-devel libjpeg-turbo-devel"
 short_desc="Library for camera RAW files decoding"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-3.0-or-later"
 #changelog="https://raw.githubusercontent.com/hfiguiere/libopenraw/master/NEWS"
 homepage="https://${pkgname}.freedesktop.org/wiki/"
diff --git a/srcpkgs/liborcus/template b/srcpkgs/liborcus/template
index 6d083ba48ff2..8c4ca51cf9f3 100644
--- a/srcpkgs/liborcus/template
+++ b/srcpkgs/liborcus/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config python3"
 makedepends="boost-devel mdds libixion-devel python3-devel zlib-devel"
 short_desc="Library for processing spreadsheet documents"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://gitlab.com/orcus/orcus"
 distfiles="http://kohei.us/files/orcus/src/liborcus-${version}.tar.xz"
diff --git a/srcpkgs/libqxp/template b/srcpkgs/libqxp/template
index ebe4dc44f914..8500917732b1 100644
--- a/srcpkgs/libqxp/template
+++ b/srcpkgs/libqxp/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="boost-devel librevenge-devel icu-devel"
 short_desc="Parser for QuarkXPress file format documents"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://wiki.documentfoundation.org/DLP/Libraries/libqxp"
 distfiles="https://dev-www.libreoffice.org/src/${pkgname}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index dbfeda76b6a8..7d6f6b12c152 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -44,7 +44,7 @@ depends+=" libreoffice-i18n-it>=${version}_${revision}"
 depends+=" libreoffice-i18n-pl>=${version}_${revision}"
 depends+=" libreoffice-i18n-pt>=${version}_${revision}"
 short_desc="Productivity suite"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.libreoffice.org/"
 
diff --git a/srcpkgs/libsidplayfp/template b/srcpkgs/libsidplayfp/template
index 2c4004c11d3c..945d635780ad 100644
--- a/srcpkgs/libsidplayfp/template
+++ b/srcpkgs/libsidplayfp/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 hostmakedepends="autoconf"
 short_desc="Library to play Commodore 64 SID music"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://sourceforge.net/p/sidplay-residfp/wiki/Home/"
 distfiles="${SOURCEFORGE_SITE}/sidplay-residfp/${pkgname}/${version%.*}/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/libsoxr/template b/srcpkgs/libsoxr/template
index cafab40d280c..e74cb5d81dc3 100644
--- a/srcpkgs/libsoxr/template
+++ b/srcpkgs/libsoxr/template
@@ -9,7 +9,7 @@ configure_args="-Wno-dev -DBUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=ON
  -DWITH_LSR_BINDINGS=ON -DWITH_OPENMP=ON -DWITH_PFFFT=ON"
 makedepends="libgomp-devel"
 short_desc="SoX resampler library"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://sourceforge.net/p/soxr/wiki/Home/"
 distfiles="${SOURCEFORGE_SITE}/soxr/soxr-${version}-Source.tar.xz"
diff --git a/srcpkgs/libtorrent-rasterbar-python/template b/srcpkgs/libtorrent-rasterbar-python/template
index 993c61d13cfb..3698780659e4 100644
--- a/srcpkgs/libtorrent-rasterbar-python/template
+++ b/srcpkgs/libtorrent-rasterbar-python/template
@@ -4,6 +4,6 @@ version=1.2.2
 revision=1
 build_style=meta
 short_desc="Obsolete package: switch to libtorrent-rasterbar-python3"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://voidlinux.org/"
diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index 0588acd81bd8..8cef116f9aff 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -9,7 +9,7 @@ configure_args="-DCMAKE_CXX_STANDARD=11 -Dbuild_examples=ON -Dbuild_tools=ON
 hostmakedepends="pkg-config intltool libtool python3-devel"
 makedepends="openssl-devel boost-devel geoip-devel python3-devel"
 short_desc="C++ bittorrent library by Rasterbar Software"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://libtorrent.org/"
 distfiles="https://github.com/arvidn/libtorrent/releases/download/v${version}/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/libucontext/template b/srcpkgs/libucontext/template
index aa3f130d1e4a..3552b3c741e2 100644
--- a/srcpkgs/libucontext/template
+++ b/srcpkgs/libucontext/template
@@ -5,7 +5,7 @@ revision=1
 archs="*-musl"
 wrksrc="${pkgname}-${pkgname}-${version}"
 short_desc="Compatibility layer providing ucontext functions"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="ISC"
 homepage="https://github.com/kaniini/libucontext"
 distfiles="https://github.com/kaniini/libucontext/archive/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/lightsoff/template b/srcpkgs/lightsoff/template
index 90fa9b34bf1d..48a6475a6a67 100644
--- a/srcpkgs/lightsoff/template
+++ b/srcpkgs/lightsoff/template
@@ -6,7 +6,7 @@ build_style=meson
 hostmakedepends="gettext glib-devel itstool pkg-config vala"
 makedepends="clutter-gtk-devel librsvg-devel"
 short_desc="GNOME puzzlle game where you turn off lights"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Lightsoff"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/lightzone/template b/srcpkgs/lightzone/template
index 2fe82302d8e4..13242f01cc77 100644
--- a/srcpkgs/lightzone/template
+++ b/srcpkgs/lightzone/template
@@ -8,7 +8,7 @@ hostmakedepends="automake git openjdk11 apache-ant javahelp2 rsync pkg-config"
 makedepends="libgomp-devel lcms2-devel libjpeg-turbo-devel tiff-devel libX11-devel lensfun-devel"
 depends="openjdk11 javahelp2 liblzma tiff"
 short_desc="Professional-level digital darkroom and photo editor"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://www.lightzoneproject.org/"
 distfiles="https://github.com/ktgw0316/LightZone/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz
diff --git a/srcpkgs/linux-firmware-dvb/template b/srcpkgs/linux-firmware-dvb/template
index ccbc83c8d262..332ee32405dc 100644
--- a/srcpkgs/linux-firmware-dvb/template
+++ b/srcpkgs/linux-firmware-dvb/template
@@ -4,7 +4,7 @@ version=20170329
 revision=4
 _gitrev=3fef04a4a4bfeba88ae3b20aff9d3a1fabf1c159
 short_desc="Linux TV firmware package"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="custom:Multiple"
 homepage="https://linuxtv.org/"
 distfiles="
diff --git a/srcpkgs/loadp2/template b/srcpkgs/loadp2/template
index 02a982ce0a95..cb30cc2c210d 100644
--- a/srcpkgs/loadp2/template
+++ b/srcpkgs/loadp2/template
@@ -6,7 +6,7 @@ build_style=gnu-makefile
 hostmakedepends="spin2cpp"
 depends="spin2cpp"
 short_desc="Loader for the Parallax Propeller 2"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/totalspectrum/loadp2"
 distfiles="https://github.com/totalspectrum/${pkgname}/archive/v${version}.tar.gz"
diff --git a/srcpkgs/log4cplus/template b/srcpkgs/log4cplus/template
index ce018b8e1368..8babb2a412bb 100644
--- a/srcpkgs/log4cplus/template
+++ b/srcpkgs/log4cplus/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 configure_args="--with-working-locale"
 short_desc="C++ logger very close to Java's log4j"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/log4cplus/log4cplus"
 #changelog="https://raw.githubusercontent.com/log4cplus/log4cplus/master/ChangeLog"
diff --git a/srcpkgs/lollypop/template b/srcpkgs/lollypop/template
index becd5dacec19..1c38cb23aea4 100644
--- a/srcpkgs/lollypop/template
+++ b/srcpkgs/lollypop/template
@@ -9,7 +9,7 @@ depends="dconf gst-libav gst-plugins-good1 libnotify libsecret
  python3-dbus python3-gobject python3-pylast python3-youtube-dl
  python3-Pillow totem-pl-parser python3-BeautifulSoup4 libhandy1"
 short_desc="Music player for GNOME"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Lollypop"
 distfiles="https://adishatz.org/lollypop/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/lzf/template b/srcpkgs/lzf/template
index 91aa6bde417f..1d4e437dc1d4 100644
--- a/srcpkgs/lzf/template
+++ b/srcpkgs/lzf/template
@@ -6,7 +6,7 @@ wrksrc="lib${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="automake"
 short_desc="Extremely fast compression algorithm"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="http://software.schmorp.de/pkg/liblzf.html"
 distfiles="http://dist.schmorp.de/liblzf/lib${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/mame/template b/srcpkgs/mame/template
index bc498d82863a..b13571dd4cd3 100644
--- a/srcpkgs/mame/template
+++ b/srcpkgs/mame/template
@@ -9,7 +9,7 @@ makedepends="SDL2_ttf-devel fontconfig-devel glm libgomp-devel libjpeg-turbo-dev
  pugixml-devel rapidjson $(vopt_if qt 'qt5-devel')"
 depends="liberation-fonts-ttf"
 short_desc="Multiple Arcade Machine Emulator"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://mamedev.org"
 distfiles="https://github.com/mamedev/mame/archive/mame${version}.tar.gz"
diff --git a/srcpkgs/mmv/template b/srcpkgs/mmv/template
index f43221fc1a95..f9f3fb3aa00e 100644
--- a/srcpkgs/mmv/template
+++ b/srcpkgs/mmv/template
@@ -5,7 +5,7 @@ revision=4
 wrksrc="${pkgname}-${version}.orig"
 build_style=gnu-makefile
 short_desc="Utility for wildcard renaming, copying, etc"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://packages.debian.org/unstable/utils/mmv"
 distfiles="http://mirrors.kernel.org/gentoo/distfiles/${pkgname}_${version}.orig.tar.gz"
diff --git a/srcpkgs/mog/template b/srcpkgs/mog/template
index 7dae24a66f12..88421ccef317 100644
--- a/srcpkgs/mog/template
+++ b/srcpkgs/mog/template
@@ -8,7 +8,7 @@ build_style=gnu-makefile
 makedepends="SDL_image-devel SDL_mixer-devel SDL_sound-devel"
 depends="mog-data>=${version}_${revision}"
 short_desc="Remake of classic MSX game The Maze of Galious"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.braingames.getput.com/mog/"
 distfiles="http://urchlay.naptime.net/~urchlay/src/mog.src_${version}-${_build}.tgz"
diff --git a/srcpkgs/mruby/template b/srcpkgs/mruby/template
index 3749ebf1c254..5648a4c9ea78 100644
--- a/srcpkgs/mruby/template
+++ b/srcpkgs/mruby/template
@@ -4,7 +4,7 @@ version=2.1.2
 revision=1
 hostmakedepends="ruby"
 short_desc="Lightweight implementation of the Ruby language (Ruby 1.9)"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://mruby.org/"
 distfiles="https://github.com/mruby/mruby/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/musl-fts/template b/srcpkgs/musl-fts/template
index 1f8228ecfd7e..fe6cb20c857f 100644
--- a/srcpkgs/musl-fts/template
+++ b/srcpkgs/musl-fts/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="automake libtool"
 archs="*-musl"
 short_desc="Implementation of fts(3) for musl libc"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD"
 homepage="https://github.com/void-linux/musl-fts"
 distfiles="https://github.com/void-linux/${pkgname}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/musl-obstack/template b/srcpkgs/musl-obstack/template
index 09ba95e86148..7da24d223970 100644
--- a/srcpkgs/musl-obstack/template
+++ b/srcpkgs/musl-obstack/template
@@ -6,7 +6,7 @@ archs="*-musl"
 build_style=gnu-configure
 hostmakedepends="automake libtool"
 short_desc="Implementation of obstack for musl libc"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/void-linux/musl-obstack"
 distfiles="${homepage}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/musl-rpmatch/template b/srcpkgs/musl-rpmatch/template
index 40b62aff87d8..754d017afa73 100644
--- a/srcpkgs/musl-rpmatch/template
+++ b/srcpkgs/musl-rpmatch/template
@@ -7,7 +7,7 @@ configure_args="--enable-shared --enable-static"
 hostmakedepends="automake libtool gettext-devel"
 makedepends="gettext-devel"
 short_desc="Implementation of rpmatch(3) for musl libc"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="3-clause-BSD"
 homepage="https://github.com/pullmoll/musl-rpmatch"
 distfiles="https://github.com/pullmoll/musl-rpmatch/archive/v${version}.tar.gz"
diff --git a/srcpkgs/mxml/template b/srcpkgs/mxml/template
index d94622caa7ff..f49a04c6b052 100644
--- a/srcpkgs/mxml/template
+++ b/srcpkgs/mxml/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 make_build_args="libmxml.a all"
 configure_args="--enable-static --enable-shared"
 short_desc="Minimal XML library"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-only"
 homepage="http://www.minixml.org/"
 distfiles="https://github.com/michaelrsweet/mxml/releases/download/v${version}/mxml-${version}.tar.gz"
diff --git a/srcpkgs/nasm-doc/template b/srcpkgs/nasm-doc/template
index 8d82491dc10f..943ff2cd6ac4 100644
--- a/srcpkgs/nasm-doc/template
+++ b/srcpkgs/nasm-doc/template
@@ -9,7 +9,7 @@ make_build_args="doc"
 hostmakedepends="groff perl perl-Font-TTF perl-IO-String perl-Sort-Versions
  ghostscript source-sans-pro liberation-fonts-ttf"
 short_desc="80x86 assembler designed for portability and modularity - documentation"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://www.nasm.us"
 distfiles="https://www.nasm.us/pub/nasm/releasebuilds/${version}/nasm-${version}.tar.xz"
diff --git a/srcpkgs/nasm/template b/srcpkgs/nasm/template
index 88c62ca5da98..6f54506f5a6c 100644
--- a/srcpkgs/nasm/template
+++ b/srcpkgs/nasm/template
@@ -6,7 +6,7 @@ revision=1
 build_style=gnu-configure
 make_build_args="all"
 short_desc="80x86 assembler designed for portability and modularity"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://www.nasm.us"
 changelog="https://nasm.us/doc/nasmdocc.html"
diff --git a/srcpkgs/netbsd-rumpkernel/template b/srcpkgs/netbsd-rumpkernel/template
index 0920c395d744..630bcf1fb30f 100644
--- a/srcpkgs/netbsd-rumpkernel/template
+++ b/srcpkgs/netbsd-rumpkernel/template
@@ -6,7 +6,7 @@ archs="x86_64* i686*"
 wrksrc="buildrump.sh-${version}"
 hostmakedepends="git tar"
 short_desc="NetBSD rump kernel"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD"
 homepage="https://github.com/anttikantee/buildrump.sh"
 distfiles="https://github.com/rumpkernel/buildrump.sh/archive/v${version}.tar.gz"
diff --git a/srcpkgs/notepadqq/template b/srcpkgs/notepadqq/template
index 8a16e31d31e5..194588600db8 100644
--- a/srcpkgs/notepadqq/template
+++ b/srcpkgs/notepadqq/template
@@ -6,7 +6,7 @@ build_style=qmake
 hostmakedepends="pkg-config qt5-tools qt5-qmake qt5-host-tools"
 makedepends="qt5-svg-devel qt5-webkit-devel"
 depends="desktop-file-utils hicolor-icon-theme"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 short_desc="Text editor for developers"
 homepage="https://notepadqq.com"
 license="GPL-3.0-or-later"
diff --git a/srcpkgs/nrg2iso/template b/srcpkgs/nrg2iso/template
index b2b553c4ac62..3257be3dbef8 100644
--- a/srcpkgs/nrg2iso/template
+++ b/srcpkgs/nrg2iso/template
@@ -4,7 +4,7 @@ version=0.4
 revision=1
 build_style=gnu-makefile
 short_desc="Simple tool to convert from Nero Burning Rom (NRG) to ISO"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2"
 homepage="http://gregory.kokanosky.free.fr/v4/linux/nrg2iso.en.html"
 distfiles="http://gregory.kokanosky.free.fr/v4/linux/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/nyx/template b/srcpkgs/nyx/template
index 7edee5a30b7a..d961d945e74e 100644
--- a/srcpkgs/nyx/template
+++ b/srcpkgs/nyx/template
@@ -7,7 +7,7 @@ pycompile_module="nyx"
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-stem tor"
 short_desc="Command-line status monitor for tor"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://nyx.torproject.org/"
 distfiles="${PYPI_SITE}/n/${pkgname}/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/ois/template b/srcpkgs/ois/template
index 27e59464fb27..83536adcb588 100644
--- a/srcpkgs/ois/template
+++ b/srcpkgs/ois/template
@@ -7,7 +7,7 @@ build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="libXaw-devel"
 short_desc="Object oriented input system"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="zlib-acknowledgement"
 homepage="https://wgois.github.io/OIS/"
 distfiles="https://github.com/wgois/OIS/archive/v${version}.tar.gz"
diff --git a/srcpkgs/opencollada/template b/srcpkgs/opencollada/template
index 6b3ffed1d17b..6041120059b1 100644
--- a/srcpkgs/opencollada/template
+++ b/srcpkgs/opencollada/template
@@ -8,7 +8,7 @@ configure_args="-DUSE_SHARED=TRUE"
 hostmakedepends="pkg-config"
 makedepends="libxml2-devel pcre-devel"
 short_desc="Stream based reader and writer library for COLLADA files"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/KhronosGroup/OpenCOLLADA"
 distfiles="https://github.com/KhronosGroup/OpenCOLLADA/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/openlierox/template b/srcpkgs/openlierox/template
index b7696b375c30..7ae0e22f2d3d 100644
--- a/srcpkgs/openlierox/template
+++ b/srcpkgs/openlierox/template
@@ -10,7 +10,7 @@ makedepends="SDL_image-devel SDL_mixer-devel freealut-devel
  gd-devel libcurl-devel libvorbis-devel libxml2-devel libzip-devel"
 depends="virtual?libGL python"
 short_desc="Addictive real-time excessive Worms-clone"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.openlierox.net/"
 distfiles="${SOURCEFORGE_SITE}/openlierox/OpenLieroX_${version/.rc/_rc}.src.tar.bz2"
diff --git a/srcpkgs/openttd/template b/srcpkgs/openttd/template
index a6c009606422..df8575fffaef 100644
--- a/srcpkgs/openttd/template
+++ b/srcpkgs/openttd/template
@@ -12,7 +12,7 @@ makedepends="SDL-devel icu-devel fontconfig-devel libpng-devel lzo-devel liblzma
  libxdg-basedir-devel"
 depends="hicolor-icon-theme"
 short_desc="Open Source version of Transport Tycoon Deluxe"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only, Zlib"
 homepage="https://www.openttd.org/"
 distfiles="https://proxy.binaries.openttd.org/openttd-releases/${version}/openttd-${version}-source.tar.xz
diff --git a/srcpkgs/opentyrian/template b/srcpkgs/opentyrian/template
index f7dcb7ed5682..a9ae953da179 100644
--- a/srcpkgs/opentyrian/template
+++ b/srcpkgs/opentyrian/template
@@ -9,7 +9,7 @@ build_style=gnu-makefile
 hostmakedepends="pkg-config unzip"
 makedepends="SDL_net-devel"
 short_desc="OSS port of the DOS shoot-em-up Tyrian"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://bitbucket.org/opentyrian/opentyrian/wiki/Home"
 distfiles="http://www.camanis.net/${pkgname}/releases/${pkgname}-${version}-src.tar.gz
diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index a35ce21a172d..08bf6d4b6591 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -18,7 +18,7 @@ makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-dev
  $(vopt_if vnc libvncserver-devel)"
 depends="xrandr"
 short_desc="OpenSceneGraph: high performance real-time graphics toolkit"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="OSGPL-2.0-or-later"
 homepage="http://www.openscenegraph.org"
 distfiles="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${version}.tar.gz"
diff --git a/srcpkgs/osmid/template b/srcpkgs/osmid/template
index 3db52e025389..f89e27caedc4 100644
--- a/srcpkgs/osmid/template
+++ b/srcpkgs/osmid/template
@@ -6,7 +6,7 @@ build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="alsa-lib-devel libX11-devel"
 short_desc="Tool to convert MIDI to OSC and OSC to MIDI"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT, ISC, GPL-3.0-or-later"
 homepage="https://github.com/llloret/osmid/"
 distfiles="https://github.com/llloret/osmid/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/paprefs/template b/srcpkgs/paprefs/template
index 90754e82d92b..277903780bcd 100644
--- a/srcpkgs/paprefs/template
+++ b/srcpkgs/paprefs/template
@@ -9,7 +9,7 @@ makedepends="dbus-glib-devel gtkmm-devel glibmm-devel libsigc++-devel
  pulseaudio-devel"
 depends="hicolor-icon-theme"
 short_desc="Editor for pulseaudio settings"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://0pointer.de/lennart/projects/paprefs/"
 distfiles="${FREEDESKTOP_SITE}/pulseaudio/${pkgname}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index c902128411c8..854f8492e24c 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -9,7 +9,7 @@ makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-dev
 depends="hicolor-icon-theme gst-libav gst-plugins-good1
  gst-plugins-bad1 gst-plugins-ugly1"
 short_desc="Modern simple media player"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://docs.xfce.org/apps/parole/start"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/pcb/template b/srcpkgs/pcb/template
index d9dbb9a8fe75..f6db34b88e4b 100644
--- a/srcpkgs/pcb/template
+++ b/srcpkgs/pcb/template
@@ -11,7 +11,7 @@ makedepends="gd-devel gtkglext-devel tk-devel"
 depends="geda gerbv"
 checkdepends="ImageMagick ghostscript"
 short_desc="Interactive printed circuit board editor"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://pcb.geda-project.org/news.html"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/pcsc-ccid/template b/srcpkgs/pcsc-ccid/template
index a4009021ec24..0ce97d2628a5 100644
--- a/srcpkgs/pcsc-ccid/template
+++ b/srcpkgs/pcsc-ccid/template
@@ -8,7 +8,7 @@ configure_args="--enable-udev --enable-twinserial"
 hostmakedepends="pkg-config perl"
 makedepends="pcsclite-devel eudev-libudev-devel libusb-compat-devel"
 short_desc="PC/SC driver to support CCID compliant readers"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://ccid.apdu.fr/"
 changelog="https://salsa.debian.org/rousseau/CCID/-/raw/master/README.md"
diff --git a/srcpkgs/pdmenu/template b/srcpkgs/pdmenu/template
index 492eb767a5bc..68c4de92c568 100644
--- a/srcpkgs/pdmenu/template
+++ b/srcpkgs/pdmenu/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 hostmakedepends="gettext pkg-config"
 makedepends="slang-devel"
 short_desc="Full screen menuing system for Unix"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2"
 homepage="https://joeyh.name/code/pdmenu/"
 distfiles="http://http.debian.net/debian/pool/main/p/pdmenu/${pkgname}_${version}.tar.gz"
diff --git a/srcpkgs/perl-File-Rename/template b/srcpkgs/perl-File-Rename/template
index 7788bc9fa4a0..4d34a0c67888 100644
--- a/srcpkgs/perl-File-Rename/template
+++ b/srcpkgs/perl-File-Rename/template
@@ -8,7 +8,7 @@ hostmakedepends="perl-Module-Build"
 makedepends="perl"
 depends="${makedepends}"
 short_desc="Perl module to rename filenames"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 homepage="https://metacpan.org/release/File-Rename"
 license="Artistic-1.0-Perl"
 distfiles="${CPAN_SITE}/File/${pkgname/perl-/}-${version}.tar.gz"
diff --git a/srcpkgs/pilot-link/template b/srcpkgs/pilot-link/template
index 907ec9ba14d1..5b83232cef8c 100644
--- a/srcpkgs/pilot-link/template
+++ b/srcpkgs/pilot-link/template
@@ -11,7 +11,7 @@ makedepends="libbluetooth-devel libusb-devel libpng-devel popt-devel
  python-devel tcl-devel readline-devel"
 depends="tk"
 short_desc="Suite of tools to connect your Palm or PalmOS® handheld"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2"
 homepage="http://www.pilot-link.org/"
 # Main site is unreachable (no address record).
diff --git a/srcpkgs/pipenightdreams/template b/srcpkgs/pipenightdreams/template
index cb41b4933ea9..baf9b32f95d1 100644
--- a/srcpkgs/pipenightdreams/template
+++ b/srcpkgs/pipenightdreams/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 hostmakedepends="automake flex libtool pkg-config"
 makedepends="SDL_image-devel"
 short_desc="Just another pipe trip"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.libsdl.org/projects/pipenightdreams"
 distfiles="${homepage}/packages/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/python3-pylast/template b/srcpkgs/python3-pylast/template
index bc82ff5514d8..cf5b2fd81cfa 100644
--- a/srcpkgs/python3-pylast/template
+++ b/srcpkgs/python3-pylast/template
@@ -7,7 +7,7 @@ build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
 depends="python3"
 short_desc="Python3 interface to last.fm and libre.fm"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/pylast/pylast"
 distfiles="${PYPI_SITE}/p/pylast/pylast-${version}.tar.gz"
diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index 85519461d8a3..9ae68a2d60f8 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -11,7 +11,7 @@ hostmakedepends="automake libtool pkg-config qt5-host-tools qt5-qmake qt5-tools"
 makedepends="libtorrent-rasterbar-devel qt5-declarative-devel qt5-svg-devel"
 depends="qt5-svg"
 short_desc="Free software alternative to µtorrent"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.qbittorrent.org/"
 changelog="https://www.qbittorrent.org/news.php"
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index 8988affd2836..aafd8d860e0e 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -16,7 +16,7 @@ makedepends="enca-devel faad2-devel ffmpeg-devel jack-devel libarchive-devel
 # At least one QSql plugin should be available
 depends="qt5-plugin-sqlite"
 short_desc="Audio player based on the Qt5 libraries"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://qmmp.ylsoftware.com"
 distfiles="http://qmmp.ylsoftware.com/files/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/qoauth-qt5/template b/srcpkgs/qoauth-qt5/template
index d5f3f388e1e4..ce38576e0e4c 100644
--- a/srcpkgs/qoauth-qt5/template
+++ b/srcpkgs/qoauth-qt5/template
@@ -8,7 +8,7 @@ build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-devel qca-qt5-devel"
 short_desc="Support with OAuth-powered network services"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.1"
 homepage="http://github.com/ayoy/qoauth"
 distfiles="https://github.com/ayoy/qoauth/archive/${_gitrev}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/qqwing/template b/srcpkgs/qqwing/template
index 4e1c0f18e981..ed31e0276bff 100644
--- a/srcpkgs/qqwing/template
+++ b/srcpkgs/qqwing/template
@@ -5,7 +5,7 @@ revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 short_desc="Sudoku generating and solving library"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2"
 homepage="http://qqwing.com/"
 distfiles="https://github.com/stephenostermiller/${pkgname}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/qrcodegen/template b/srcpkgs/qrcodegen/template
index d181e9cdb529..0fd2ba01175f 100644
--- a/srcpkgs/qrcodegen/template
+++ b/srcpkgs/qrcodegen/template
@@ -4,7 +4,7 @@ version=1.6.0
 revision=3
 wrksrc="QR-Code-generator-${version}"
 short_desc="QR Code generator library"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://www.nayuki.io/page/qr-code-generator-library"
 distfiles="https://github.com/nayuki/QR-Code-generator/archive/v${version}.tar.gz"
diff --git a/srcpkgs/qt5-styleplugins/template b/srcpkgs/qt5-styleplugins/template
index 98991b16fa39..9e6b476ff2ea 100644
--- a/srcpkgs/qt5-styleplugins/template
+++ b/srcpkgs/qt5-styleplugins/template
@@ -9,7 +9,7 @@ hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
 makedepends="libxcb-devel libxkbcommon-devel libinput-devel tslib-devel gtk+-devel qt5-devel"
 depends="qt5-core>=5.15.2<5.15.3"
 short_desc="Additional style plugins for Qt5"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only, LGPL-3.0-only"
 homepage="https://github.com/qt/qtstyleplugins"
 distfiles="https://github.com/qt/qtstyleplugins/archive/${_gitrev}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/quadrapassel/template b/srcpkgs/quadrapassel/template
index 330a6bcd16e4..02e8a514a1bd 100644
--- a/srcpkgs/quadrapassel/template
+++ b/srcpkgs/quadrapassel/template
@@ -7,7 +7,7 @@ hostmakedepends="gettext glib-devel itstool pkg-config vala"
 makedepends="gsound-devel gtk+3-devel libglib-devel libcanberra-devel
  clutter-gtk-devel librsvg-devel libmanette-devel"
 short_desc="GNOME classic falling-block game (Tetris)"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Quadrapassel"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/quake4/template b/srcpkgs/quake4/template
index 5987e41d3a80..b5e7c2b331d2 100644
--- a/srcpkgs/quake4/template
+++ b/srcpkgs/quake4/template
@@ -5,7 +5,7 @@ revision=3
 hostmakedepends="tar"
 depends="SDL libXext virtual?libudev zlib desktop-file-utils"
 short_desc="Quake 4 for Linux"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="custom: propietary"
 homepage="http://www.quake4game.com/"
 distfiles="http://sources.voidlinux.de/${pkgname}-${version}/quake4-linux-${version}.x86.run"
diff --git a/srcpkgs/qupzilla/template b/srcpkgs/qupzilla/template
index 35eebf0b515d..06bdbfb072d1 100644
--- a/srcpkgs/qupzilla/template
+++ b/srcpkgs/qupzilla/template
@@ -6,6 +6,6 @@ revision=3
 build_style=meta
 depends="falkon>=${version}_${revision}"
 short_desc="Lightweight multiplatform browser (transitional dummy package)"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3"
 homepage="https://qupzilla.com/"
diff --git a/srcpkgs/qxmpp/template b/srcpkgs/qxmpp/template
index d640ab5a3f5e..5283f8ea32ee 100644
--- a/srcpkgs/qxmpp/template
+++ b/srcpkgs/qxmpp/template
@@ -7,7 +7,7 @@ configure_args="-DBUILD_EXAMPLES=false"
 hostmakedepends="pkg-config"
 makedepends="qt5-devel opus-devel speex-devel libtheora-devel libvpx-devel"
 short_desc="Cross-platform C++ XMPP client and server library"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1"
 homepage="https://github.com/qxmpp-project/qxmpp/"
 distfiles="https://github.com/qxmpp-project/qxmpp/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/rocksndiamonds/template b/srcpkgs/rocksndiamonds/template
index 473813e47672..1985dee75923 100644
--- a/srcpkgs/rocksndiamonds/template
+++ b/srcpkgs/rocksndiamonds/template
@@ -6,7 +6,7 @@ build_style=gnu-makefile
 hostmakedepends="pkg-config"
 makedepends="SDL2_image-devel SDL2_mixer-devel SDL2_net-devel"
 short_desc="Arcade style game"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="http://www.artsoft.org/rocksndiamonds"
 distfiles="http://www.artsoft.org/RELEASES/unix/${pkgname}/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/seabios/template b/srcpkgs/seabios/template
index 29b373acffbe..bec0dcd92f2d 100644
--- a/srcpkgs/seabios/template
+++ b/srcpkgs/seabios/template
@@ -6,7 +6,7 @@ build_style=gnu-makefile
 hostmakedepends="python3"
 archs="i686* x86_64*"
 short_desc="OSS implementation of a 16-bit x86 BIOS"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-3.0-or-later"
 homepage="https://www.seabios.org/"
 distfiles="https://www.seabios.org/downloads/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/silly/template b/srcpkgs/silly/template
index e06b0a84af4a..432cefdabc93 100644
--- a/srcpkgs/silly/template
+++ b/srcpkgs/silly/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libjpeg-turbo-devel libpng-devel"
 short_desc="Simple image loading library"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://sourceforge.net/projects/crayzedsgui/"
 distfiles="${SOURCEFORGE_SITE}/project/crayzedsgui/${pkgname^^}/${version}/${pkgname^^}-${version}.tar.gz"
diff --git a/srcpkgs/simgear/template b/srcpkgs/simgear/template
index eb9e1437efed..4a15e27896ef 100644
--- a/srcpkgs/simgear/template
+++ b/srcpkgs/simgear/template
@@ -9,7 +9,7 @@ hostmakedepends="pkg-config"
 makedepends="boost-devel freetype-devel libjpeg-turbo-devel giflib-devel
  libcurl-devel libfreeglut-devel libopenal-devel osg-devel plib-devel"
 short_desc="Simulation engine for FlightGear - static libraries"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.flightgear.org/"
 distfiles="$SOURCEFORGE_SITE/project/flightgear/release-${version%.*}/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/spin2cpp/template b/srcpkgs/spin2cpp/template
index c73220201a7a..073c70fa750d 100644
--- a/srcpkgs/spin2cpp/template
+++ b/srcpkgs/spin2cpp/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-makefile
 hostmakedepends="bison"
 short_desc="Converting languages for the Parallax Inc. Propeller 1 and 2"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/totalspectrum/spin2cpp/"
 distfiles="https://github.com/totalspectrum/${pkgname}/archive/v${version}.tar.gz"
diff --git a/srcpkgs/stk/template b/srcpkgs/stk/template
index b6b6d821b334..42b5918ced65 100644
--- a/srcpkgs/stk/template
+++ b/srcpkgs/stk/template
@@ -11,7 +11,7 @@ hostmakedepends="automake libtool pkg-config"
 makedepends="alsa-lib-devel jack-devel"
 depends="libstk-${version}_${revision} stk-data-${version}_${revision}"
 short_desc="Synthesis ToolKit in C++"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="custom:MIT-like"
 homepage="https://ccrma.stanford.edu/software/stk/"
 distfiles="https://github.com/thestk/stk/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/swell-foop/template b/srcpkgs/swell-foop/template
index 33da8d8365ad..afb8dd466c3e 100644
--- a/srcpkgs/swell-foop/template
+++ b/srcpkgs/swell-foop/template
@@ -6,7 +6,7 @@ build_style=meson
 hostmakedepends="gettext glib-devel itstool pkg-config vala"
 makedepends="clutter-gtk-devel"
 short_desc="GNOME puzzle game where you remove similar objects"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Swell%20Foop"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/tali/template b/srcpkgs/tali/template
index 8de48032c975..bfd640177d27 100644
--- a/srcpkgs/tali/template
+++ b/srcpkgs/tali/template
@@ -7,7 +7,7 @@ hostmakedepends="cmake pkg-config gettext glib-devel appstream-glib
  desktop-file-utils itstool"
 makedepends="gtk+3-devel libgnome-games-support-devel"
 short_desc="GNOME sort of poker game with dice"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Tali"
 distfiles="${GNOME_SITE}/tali/${version%.*}/tali-${version}.tar.xz"
diff --git a/srcpkgs/tesseract-ocr/template b/srcpkgs/tesseract-ocr/template
index de0278d7afa0..7ed37c53c848 100644
--- a/srcpkgs/tesseract-ocr/template
+++ b/srcpkgs/tesseract-ocr/template
@@ -10,7 +10,7 @@ make_build_args="all training"
 hostmakedepends="automake libtool pkg-config leptonica libxslt asciidoc"
 makedepends="cairo-devel pango-devel leptonica-devel $(vopt_if openmp libgomp-devel) icu-devel"
 short_desc="Tesseract Open Source OCR engine"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/tesseract-ocr/tesseract"
 distfiles="
diff --git a/srcpkgs/tinyclipboard/template b/srcpkgs/tinyclipboard/template
index 2dfaf68d94a4..22e90096b3e9 100644
--- a/srcpkgs/tinyclipboard/template
+++ b/srcpkgs/tinyclipboard/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-makefile
 short_desc="Cross-platform C library for accessing the clipboard"
 makedepends="libXt-devel"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://redmine.guelker.eu/projects/tinyclipboard"
 distfiles="https://files.guelker.eu/projects/${pkgname}/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/toluapp/template b/srcpkgs/toluapp/template
index fb54ad329fc2..d07536814e9b 100644
--- a/srcpkgs/toluapp/template
+++ b/srcpkgs/toluapp/template
@@ -6,7 +6,7 @@ build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="lua51-devel"
 short_desc="Tool to integrate C and C++ code with Lua5.1"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/LuaDist/toluapp"
 distfiles="https://github.com/LuaDist/toluapp/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/tracebox/template b/srcpkgs/tracebox/template
index f0f42c46c4c7..b76bb0123c88 100644
--- a/srcpkgs/tracebox/template
+++ b/srcpkgs/tracebox/template
@@ -10,7 +10,7 @@ archs="i686 x86_64"
 hostmakedepends="automake pkg-config libtool unzip"
 makedepends="libpcap-devel json-c-devel lua53-devel"
 short_desc="A middlebox detection tool"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2"
 nocross=yes
 homepage="http://www.tracebox.org/"
diff --git a/srcpkgs/tslib/template b/srcpkgs/tslib/template
index 8652a2a46e44..60ab1807d8b3 100644
--- a/srcpkgs/tslib/template
+++ b/srcpkgs/tslib/template
@@ -4,7 +4,7 @@ version=1.22
 revision=1
 build_style=cmake
 short_desc="Touchscreen access library"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
 homepage="https://github.com/kergoth/tslib"
 distfiles="https://github.com/kergoth/tslib/releases/download/${version}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/ttyqr/template b/srcpkgs/ttyqr/template
index 1601d553b97b..2840d1fb54e2 100644
--- a/srcpkgs/ttyqr/template
+++ b/srcpkgs/ttyqr/template
@@ -7,7 +7,7 @@ wrksrc=${pkgname}-${_githash}
 build_style=gnu-makefile
 makedepends="qrencode-devel"
 short_desc="Draw QR codes straight into the terminal"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/oskar456/ttyqr/"
 distfiles="https://github.com/oskar456/ttyqr/archive/${_githash}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/twaindsm/template b/srcpkgs/twaindsm/template
index 300c1694b8f8..5bdf8194d67f 100644
--- a/srcpkgs/twaindsm/template
+++ b/srcpkgs/twaindsm/template
@@ -8,7 +8,7 @@ build_wrksrc="TWAIN_DSM/src"
 build_style=cmake
 hostmakedepends="doxygen unzip"
 short_desc="TWAIN data source manager"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://www.twain.org/"
 distfiles="https://github.com/twain/twain-dsm/archive/${_gitrev}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/ucpp/template b/srcpkgs/ucpp/template
index 582e607c4d3d..247c933ffac5 100644
--- a/srcpkgs/ucpp/template
+++ b/srcpkgs/ucpp/template
@@ -6,7 +6,7 @@ wrksrc=${pkgname}
 build_style=gnu-makefile
 nopie=yes
 short_desc="Embeddable, quck, light C preprocessor compliant to C99"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD"
 homepage="https://code.google.com/archive/p/ucpp/"
 distfiles="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ucpp/ucpp-${version}.tar.bz2"
diff --git a/srcpkgs/ufoai/template b/srcpkgs/ufoai/template
index 18fd73176198..3b36cf0d6db1 100644
--- a/srcpkgs/ufoai/template
+++ b/srcpkgs/ufoai/template
@@ -11,7 +11,7 @@ makedepends="MesaLib-devel glu-devel libjpeg-turbo-devel
  gtkglext-devel gtksourceview2-devel"
 depends="ca-certificates"
 short_desc="UFO Alien Invasion"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://ufoai.org/"
 distfiles="
diff --git a/srcpkgs/vgmplay/template b/srcpkgs/vgmplay/template
index 43a844368c9d..2792e0855a20 100644
--- a/srcpkgs/vgmplay/template
+++ b/srcpkgs/vgmplay/template
@@ -6,7 +6,7 @@ build_style=gnu-makefile
 build_wrksrc="VGMPlay"
 makedepends="libao-devel zlib-devel"
 short_desc="VGM file player"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/vgmrips/vgmplay/"
 distfiles="https://github.com/vgmrips/vgmplay/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/vino/template b/srcpkgs/vino/template
index 5930a164616c..bcea8c8b6058 100644
--- a/srcpkgs/vino/template
+++ b/srcpkgs/vino/template
@@ -9,7 +9,7 @@ makedepends="libjpeg-turbo-devel gtk+3-devel
  libXtst-devel NetworkManager-devel libsecret-devel gnutls-devel libSM-devel"
 depends="libsoup>=2.46 desktop-file-utils"
 short_desc="VNC server for the GNOME desktop"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://wiki.gnome.org/action/show/Projects/Vino"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 77ea433a1073..01de503942c0 100644
--- a/srcpkgs/virtuoso/template
+++ b/srcpkgs/virtuoso/template
@@ -9,7 +9,7 @@ configure_args="--enable-static"
 hostmakedepends="automake libtool flex gperf net-tools"
 makedepends="openssl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
 short_desc="Scalable cross-platform server of virtuoso"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2"
 homepage="http://virtuoso.openlinksw.com/wiki/main/Main/"
 distfiles="https://github.com/openlink/virtuoso-opensource/archive/v${version}.tar.gz"
diff --git a/srcpkgs/widelands-maps/template b/srcpkgs/widelands-maps/template
index 47c9c488f5ca..fd6b807ec660 100644
--- a/srcpkgs/widelands-maps/template
+++ b/srcpkgs/widelands-maps/template
@@ -3,7 +3,7 @@ pkgname=widelands-maps
 version=1.1
 revision=4
 short_desc="Additional maps for Widelands v18"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://wl.widelands.org/maps/"
 distfiles="https://distfiles.voidlinux.de/${pkgname}-${version}/${pkgname}-${version}.tar.xz"
diff --git a/srcpkgs/widelands/template b/srcpkgs/widelands/template
index cfa2c10993e0..d0402050262e 100644
--- a/srcpkgs/widelands/template
+++ b/srcpkgs/widelands/template
@@ -11,7 +11,7 @@ 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"
 short_desc="Real-time strategy game"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 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"
diff --git a/srcpkgs/wildmidi/template b/srcpkgs/wildmidi/template
index e7f6a9152235..c70f0003e8a3 100644
--- a/srcpkgs/wildmidi/template
+++ b/srcpkgs/wildmidi/template
@@ -9,7 +9,7 @@ hostmakedepends="pkg-config"
 makedepends="alsa-lib-devel libopenal-devel"
 depends="libwildmidi"
 short_desc="Simple software midi player and core softsynth library"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later, LGPL-3.0-only"
 homepage="https://www.mindwerks.net/projects/wildmidi"
 distfiles="https://github.com/Mindwerks/${pkgname}/archive/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/xerces-c/template b/srcpkgs/xerces-c/template
index 0ead8c752643..56f12c4aab08 100644
--- a/srcpkgs/xerces-c/template
+++ b/srcpkgs/xerces-c/template
@@ -7,7 +7,7 @@ hostmakedepends="automake libtool pkg-config"
 makedepends="libcurl-devel icu-devel"
 depends="lib${pkgname}>=${version}_${revision}"
 short_desc="Validating XML parser written in portable C++"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="http://xerces.apache.org/xerces-c/"
 distfiles="http://archive.apache.org/dist/xerces/c/3/sources/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/xf86-video-mga/template b/srcpkgs/xf86-video-mga/template
index 33f0f89ce2cb..39edac52798d 100644
--- a/srcpkgs/xf86-video-mga/template
+++ b/srcpkgs/xf86-video-mga/template
@@ -7,7 +7,7 @@ hostmakedepends="automake libtool pkg-config xorg-util-macros"
 makedepends="xorg-server-devel"
 depends="virtual?xserver-abi-video-24_1"
 short_desc="Xorg Matrox Graphics Adapter video driver"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/xfce4-plugins/template b/srcpkgs/xfce4-plugins/template
index e5128eed4607..0ac4ae75ea9d 100644
--- a/srcpkgs/xfce4-plugins/template
+++ b/srcpkgs/xfce4-plugins/template
@@ -26,7 +26,7 @@ depends="
 	xfce4-whiskermenu-plugin
 	xfce4-xkb-plugin"
 short_desc="Plugins for the Xfce4 Desktop Environment"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://goodies.xfce.org/"
 replaces="xfce4-kbdleds-plugin>=0
diff --git a/srcpkgs/xnec2c/template b/srcpkgs/xnec2c/template
index df74e185d580..f936c70dff18 100644
--- a/srcpkgs/xnec2c/template
+++ b/srcpkgs/xnec2c/template
@@ -7,7 +7,7 @@ hostmakedepends="automake libtool gettext-devel intltool pkg-config glib-devel"
 makedepends="gtk+3-devel"
 depends="libglvnd"
 short_desc="GTK2 application for Numerical Electromagnetics Code generation"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.qsl.net/5b4az/pkg/nec2/xnec2c/doc/xnec2c.html"
 distfiles="https://www.qsl.net/5/5b4az/pkg/nec2/xnec2c/xnec2c-${version}.tar.bz2"
diff --git a/srcpkgs/xsane/template b/srcpkgs/xsane/template
index 65c6fd79288f..863e61dd58c7 100644
--- a/srcpkgs/xsane/template
+++ b/srcpkgs/xsane/template
@@ -6,7 +6,7 @@ hostmakedepends="pkg-config sane-devel gettext"
 makedepends="gtk+-devel lcms-devel sane-devel gimp-devel"
 depends="sane"
 short_desc="GTK-based X11 frontend for SANE"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.xsane.org"
 distfiles="${DEBIAN_SITE}/main/x/xsane/xsane_${version}.orig.tar.gz"
diff --git a/srcpkgs/ytnef/template b/srcpkgs/ytnef/template
index 7e040d9a5832..512d587fddfe 100644
--- a/srcpkgs/ytnef/template
+++ b/srcpkgs/ytnef/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool"
 short_desc="Yerase's TNEF Stream Reader"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/Yeraze/ytnef"
 distfiles="https://github.com/Yeraze/ytnef/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/zbar/template b/srcpkgs/zbar/template
index 68549362754c..f0195a7c73ae 100644
--- a/srcpkgs/zbar/template
+++ b/srcpkgs/zbar/template
@@ -11,7 +11,7 @@ makedepends="libmagick-devel libXv-devel python3-devel v4l-utils-devel
  gtk+3-devel $(vopt_if qt qt5-x11extras-devel)"
 depends="libzbar-${version}_${revision}"
 short_desc="Barcode reading library and application"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://git.linuxtv.org/zbar.git/"
 distfiles="https://linuxtv.org/downloads/zbar/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/zynaddsubfx/template b/srcpkgs/zynaddsubfx/template
index 04e72410af82..844d14016a06 100644
--- a/srcpkgs/zynaddsubfx/template
+++ b/srcpkgs/zynaddsubfx/template
@@ -9,7 +9,7 @@ hostmakedepends="doxygen fltk pkg-config"
 makedepends="fltk-devel fftw-devel liblo-devel libXpm-devel mxml-devel
  jack-devel portaudio-devel"
 short_desc="Open Source software synthesizer"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://zynaddsubfx.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}/${version}/${pkgname}-${version}.tar.bz2"

From 03fda80e7bc24731cc44e258e49ad6c760429248 Mon Sep 17 00:00:00 2001
From: Enno Boland <g@s01.de>
Date: Wed, 31 Mar 2021 19:31:27 +0200
Subject: [PATCH 0822/2024] srcpkgs: ericonr takes over packages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[skip ci]

Co-authored-by: Érico Nogueira Rolim <34201958+ericonr@users.noreply.github.com>
---
 srcpkgs/aisleriot/template   | 2 +-
 srcpkgs/freerouting/template | 2 +-
 srcpkgs/json-c++/template    | 2 +-
 srcpkgs/qbittorrent/template | 2 +-
 srcpkgs/wildmidi/template    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/aisleriot/template b/srcpkgs/aisleriot/template
index e31845d7fe61..5bd4e53483f8 100644
--- a/srcpkgs/aisleriot/template
+++ b/srcpkgs/aisleriot/template
@@ -11,7 +11,7 @@ hostmakedepends="desktop-file-utils glib-devel guile intltool itstool pkg-config
 makedepends="guile-devel libcanberra-devel librsvg-devel libatomic_ops-devel"
 depends="guile yelp"
 short_desc="GNOME solitaire card game"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Aisleriot"
 distfiles="https://gitlab.gnome.org/GNOME/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/freerouting/template b/srcpkgs/freerouting/template
index 123cb60b2daf..e8c5b371e436 100644
--- a/srcpkgs/freerouting/template
+++ b/srcpkgs/freerouting/template
@@ -5,7 +5,7 @@ revision=2
 hostmakedepends="gradle openjdk11"
 depends="openjdk11"
 short_desc="Advanced PCB autorouter"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/freerouting/freerouting"
 distfiles="https://github.com/freerouting/${pkgname}/archive/v${version}.tar.gz"
diff --git a/srcpkgs/json-c++/template b/srcpkgs/json-c++/template
index 87d68e676c8d..97f0457e88ee 100644
--- a/srcpkgs/json-c++/template
+++ b/srcpkgs/json-c++/template
@@ -7,7 +7,7 @@ build_style=cmake
 configure_args="-DJSON_MultipleHeaders=ON"
 checkdepends="git"
 short_desc="JSON for modern C++"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://github.com/nlohmann/json"
 distfiles="https://github.com/nlohmann/json/archive/v${version}.tar.gz"
diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index 9ae68a2d60f8..924225cf4f84 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -11,7 +11,7 @@ hostmakedepends="automake libtool pkg-config qt5-host-tools qt5-qmake qt5-tools"
 makedepends="libtorrent-rasterbar-devel qt5-declarative-devel qt5-svg-devel"
 depends="qt5-svg"
 short_desc="Free software alternative to µtorrent"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.qbittorrent.org/"
 changelog="https://www.qbittorrent.org/news.php"
diff --git a/srcpkgs/wildmidi/template b/srcpkgs/wildmidi/template
index c70f0003e8a3..634ad5bc88a5 100644
--- a/srcpkgs/wildmidi/template
+++ b/srcpkgs/wildmidi/template
@@ -9,7 +9,7 @@ hostmakedepends="pkg-config"
 makedepends="alsa-lib-devel libopenal-devel"
 depends="libwildmidi"
 short_desc="Simple software midi player and core softsynth library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later, LGPL-3.0-only"
 homepage="https://www.mindwerks.net/projects/wildmidi"
 distfiles="https://github.com/Mindwerks/${pkgname}/archive/${pkgname}-${version}.tar.gz"

From a6fe301be844f75ab7cc0028981ca15daeb4c27c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 10 Apr 2021 16:54:29 +0200
Subject: [PATCH 0823/2024] iselect: adopt.

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

diff --git a/srcpkgs/iselect/template b/srcpkgs/iselect/template
index 37318b036b7e..3260d4836612 100644
--- a/srcpkgs/iselect/template
+++ b/srcpkgs/iselect/template
@@ -1,13 +1,13 @@
 # Template file for 'iselect'
 pkgname=iselect
 version=1.4.0
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="ncurses-devel"
 short_desc="Interactive line selection tool for textual files"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-2.0-or-later"
 homepage="http://www.ossp.org/pkg/tool/iselect/"
 distfiles="${DEBIAN_SITE}/main/${pkgname:0:1}/${pkgname}/${pkgname}_${version}.orig.tar.gz"
 checksum=5b75fc5fa5407e85fa77d2a299c4e7628c0213116809f343946e62a8a25c5b1b

From a8ebd52b62e9a5985dba599ee3f8f27a69ff3a6e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 10 Apr 2021 16:56:42 +0200
Subject: [PATCH 0824/2024] mmv: adopt.

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

diff --git a/srcpkgs/mmv/template b/srcpkgs/mmv/template
index f9f3fb3aa00e..1afd253685d5 100644
--- a/srcpkgs/mmv/template
+++ b/srcpkgs/mmv/template
@@ -5,7 +5,7 @@ revision=4
 wrksrc="${pkgname}-${version}.orig"
 build_style=gnu-makefile
 short_desc="Utility for wildcard renaming, copying, etc"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://packages.debian.org/unstable/utils/mmv"
 distfiles="http://mirrors.kernel.org/gentoo/distfiles/${pkgname}_${version}.orig.tar.gz"

From e773f65bdfa16f0d8771523000b2913b6853b439 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 10 Apr 2021 16:57:29 +0200
Subject: [PATCH 0825/2024] zbar: adopt.

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

diff --git a/srcpkgs/zbar/template b/srcpkgs/zbar/template
index f0195a7c73ae..f64d87fcfe81 100644
--- a/srcpkgs/zbar/template
+++ b/srcpkgs/zbar/template
@@ -11,7 +11,7 @@ makedepends="libmagick-devel libXv-devel python3-devel v4l-utils-devel
  gtk+3-devel $(vopt_if qt qt5-x11extras-devel)"
 depends="libzbar-${version}_${revision}"
 short_desc="Barcode reading library and application"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://git.linuxtv.org/zbar.git/"
 distfiles="https://linuxtv.org/downloads/zbar/${pkgname}-${version}.tar.bz2"

From d3a0c16b0312e9bd9e5402ba76899377292dc211 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:43:48 +0200
Subject: [PATCH 0826/2024] attica: update to 5.81.0.

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

diff --git a/srcpkgs/attica/template b/srcpkgs/attica/template
index ca0d296e38fc..d6476b39fc7b 100644
--- a/srcpkgs/attica/template
+++ b/srcpkgs/attica/template
@@ -1,6 +1,6 @@
 # Template file for 'attica'
 pkgname=attica
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/attica"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e3aa866b01dfcdc1f59012c57f6bd49eabfe5d920560f766116a6633b394ce71
+checksum=19430eca0ebae80902008e0ae65669ee29d06a3cda56bddff222d709fc502f74
 
 attica-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From 7b26a561ff8d96d5f89bb991ec9b61f4a0ea8920 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:43:51 +0200
Subject: [PATCH 0827/2024] baloo5: update to 5.81.0.

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

diff --git a/srcpkgs/baloo5/template b/srcpkgs/baloo5/template
index df597bd43719..26d14d8e9e47 100644
--- a/srcpkgs/baloo5/template
+++ b/srcpkgs/baloo5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo5'
 pkgname=baloo5
-version=5.80.0
+version=5.81.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/Baloo"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=ecdf0ba93c0cfd85b16aed3817db490c85f70c8c1d13e076b461d41ffa00b571
+checksum=5ed2c781ce7603f1e798fe645427814a3f2116f3793a047a82d707560512d556
 
 baloo5-devel_package() {
 	short_desc+=" - development"

From 49f627eb34c7e843418af4cd444ae22df0f3ae52 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:43:54 +0200
Subject: [PATCH 0828/2024] bluez-qt5: update to 5.81.0.

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

diff --git a/srcpkgs/bluez-qt5/template b/srcpkgs/bluez-qt5/template
index e36590f3861d..371ebfad9eb3 100644
--- a/srcpkgs/bluez-qt5/template
+++ b/srcpkgs/bluez-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'bluez-qt5'
 pkgname=bluez-qt5
-version=5.80.0
+version=5.81.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/bluez-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=96e77f80ffd3d6b7854370f5e45773d74cbc685255612e923d703e00ed33e521
+checksum=e34a03e6daccff1f6ea5cd28e3f61a3b209c25e81aa87bb409c608bcbe1d9e8f
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From 890a67f9bc65288313db43a04fb4f11a8871a896 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:43:57 +0200
Subject: [PATCH 0829/2024] breeze-icons: update to 5.81.0.

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

diff --git a/srcpkgs/breeze-icons/template b/srcpkgs/breeze-icons/template
index 67cac82b411b..ef78750196c5 100644
--- a/srcpkgs/breeze-icons/template
+++ b/srcpkgs/breeze-icons/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze-icons'
 pkgname=breeze-icons
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-3.0-or-later"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a266908cafc0233e5da6f11747bbbef94b7d9503e2c1f59c68013ae11f1d6584
+checksum=ef88f0e41407900b0570030dab8e6debb97e749c8aa1841d7572821c959784a0
 
 if [ -z "$CROSS_BUILD" ]; then
 	configure_args="-DBINARY_ICONS_RESOURCE=ON"

From 8359673e54adfa971eabe251a2530debbd21a67d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:00 +0200
Subject: [PATCH 0830/2024] extra-cmake-modules: update to 5.81.0.

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

diff --git a/srcpkgs/extra-cmake-modules/template b/srcpkgs/extra-cmake-modules/template
index c5be5f2dcfe0..ee48dfec369a 100644
--- a/srcpkgs/extra-cmake-modules/template
+++ b/srcpkgs/extra-cmake-modules/template
@@ -1,6 +1,6 @@
 # Template file for 'extra-cmake-modules'
 pkgname=extra-cmake-modules
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_HTML_DOCS=OFF -DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"
 homepage="https://invent.kde.org/frameworks/extra-cmake-modules"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2370fd80f685533d0b96efa6fa443ceea68e0ceba4e8a9d7c151d297b1c96f64
+checksum=5f57e4b843069b6098d955051bb2913558d1623fead3f3b95b7017d7e1e35b83
 python_version=3
 
 post_install() {

From 05c1c277d53a9bebf4f0b7706b7caf32585fbd5c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:03 +0200
Subject: [PATCH 0831/2024] frameworkintegration: update to 5.81.0.

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

diff --git a/srcpkgs/frameworkintegration/template b/srcpkgs/frameworkintegration/template
index 990d6af065dd..f4f81f4c5e64 100644
--- a/srcpkgs/frameworkintegration/template
+++ b/srcpkgs/frameworkintegration/template
@@ -1,6 +1,6 @@
 # Template file for 'frameworkintegration'
 pkgname=frameworkintegration
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/frameworkintegration"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=871d961ccdcc420ac63686bb522febabe9dcdd6199880f9e2e59433239b9696a
+checksum=3b98768f0bbb6f3c427a74504eae7d3045d3af20946d3bc6f5937f6206a88b6d
 
 frameworkintegration-devel_package() {
 	short_desc+=" - development"

From 6ce224105ccce286ae97c97173a458b38bb75179 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:06 +0200
Subject: [PATCH 0832/2024] kactivities5-stats: update to 5.81.0.

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

diff --git a/srcpkgs/kactivities5-stats/template b/srcpkgs/kactivities5-stats/template
index b21320db44da..cc2d624bef76 100644
--- a/srcpkgs/kactivities5-stats/template
+++ b/srcpkgs/kactivities5-stats/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5-stats'
 pkgname=kactivities5-stats
-version=5.80.0
+version=5.81.0
 revision=1
 wrksrc="${pkgname/5/}-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://api.kde.org/frameworks/kactivities/html/index.html"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname/5/}-${version}.tar.xz"
-checksum=d689b7e9b75debce048fa4cbbc95924a4bfb2dd0c32b5874413b2871d18573f0
+checksum=02e7ee69fe46da03ad1a95dbac4fef9494e2c8a9ce7a94722d190710bc796920
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From 338c0444e9e47b42c9a4b3071524e0a0a8b149c5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:08 +0200
Subject: [PATCH 0833/2024] kactivities5: update to 5.81.0.

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

diff --git a/srcpkgs/kactivities5/template b/srcpkgs/kactivities5/template
index 30dc528f50b9..f77844763271 100644
--- a/srcpkgs/kactivities5/template
+++ b/srcpkgs/kactivities5/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5'
 pkgname=kactivities5
-version=5.80.0
+version=5.81.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kactivities"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=1a90e14a16e2efa5ae460843f05e88ca412c7fe078fc077dee8a1cf022303592
+checksum=78ff3d4b6448582bf3578076d05a04ad5f91a664c7fd0d91162c3a8fd875536b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools"

From eda021c8aef2f14ebec772eab4ea3518f2216bea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:11 +0200
Subject: [PATCH 0834/2024] kapidox: update to 5.81.0.

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

diff --git a/srcpkgs/kapidox/template b/srcpkgs/kapidox/template
index 469a5db977d3..7ba30aca033e 100644
--- a/srcpkgs/kapidox/template
+++ b/srcpkgs/kapidox/template
@@ -1,6 +1,6 @@
 # Template file for 'kapidox'
 pkgname=kapidox
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules python3 python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-2-Clause, CC0-1.0"
 homepage="https://invent.kde.org/frameworks/kapidox"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7f14805350c5f0c1326b3ad2b2923c71f3d41e6782249723013a0f3ef18b1204
+checksum=42ff9da76a192cd9a9c6007ca75cb184703c888c4c141a8ac39655d982bf04f3
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt

From dee67d30c7f971bb5e1e412fc9efb8125c5ab2e9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:13 +0200
Subject: [PATCH 0835/2024] karchive: update to 5.81.0.

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

diff --git a/srcpkgs/karchive/template b/srcpkgs/karchive/template
index a17ab9a49087..308a915506c7 100644
--- a/srcpkgs/karchive/template
+++ b/srcpkgs/karchive/template
@@ -1,6 +1,6 @@
 # Template file for 'karchive'
 pkgname=karchive
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/karchive"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fce08d578c5311c475f43df5c40480ddafbb065c41599c535b5e98d2175c5df5
+checksum=1e263a3e25417eca68fe59bc8b958ab4f5cf4da16d4c47d36a5230fa3cf596ba
 
 karchive-devel_package() {
 	short_desc+=" - development"

From 2677a9f9f4155929d770fe7f09bc9e114795d5af Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:16 +0200
Subject: [PATCH 0836/2024] kauth: update to 5.81.0.

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

diff --git a/srcpkgs/kauth/template b/srcpkgs/kauth/template
index 0d3dc13ef134..7c0ca8ee8956 100644
--- a/srcpkgs/kauth/template
+++ b/srcpkgs/kauth/template
@@ -1,6 +1,6 @@
 # Template file for 'kauth'
 pkgname=kauth
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kauth"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=26f07de07729abf90500749d7746eee63398fe96ca00d32f845084b4c89896dd
+checksum=7e0062efe1838766890dee709b3ecd6767ced49173f9c149ac2ef492261fc9bd
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons qt5-host-tools qt5-qmake qt5-tools-devel polkit-qt5-devel"

From 80f33f0caa63d649720b69b3c4eb3f8f542ea5c7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:18 +0200
Subject: [PATCH 0837/2024] kbookmarks: update to 5.81.0.

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

diff --git a/srcpkgs/kbookmarks/template b/srcpkgs/kbookmarks/template
index 8a210ef4882e..630566cbff4f 100644
--- a/srcpkgs/kbookmarks/template
+++ b/srcpkgs/kbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'kbookmarks'
 pkgname=kbookmarks
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kbookmarks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5880324922e465b66384acbdd4f6db2f26c533c2e27c1cb121ec0e0e37f53586
+checksum=f5bfcc85d58b35439252f6e3d086a4deb359c4a0649fdfa57a96960cf7a00f2f
 
 kbookmarks-devel_package() {
 	short_desc+=" - development"

From 1cb580315b9bc0bc712e11cf7a5d551c04127c0f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:20 +0200
Subject: [PATCH 0838/2024] kcalendarcore: update to 5.81.0.

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

diff --git a/srcpkgs/kcalendarcore/template b/srcpkgs/kcalendarcore/template
index f035b281cab5..53f758f35022 100644
--- a/srcpkgs/kcalendarcore/template
+++ b/srcpkgs/kcalendarcore/template
@@ -1,7 +1,7 @@
 # Template file for 'kcalendarcore'
 pkgname=kcalendarcore
 reverts="19.08.3_1 19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1 19.04.2_1 19.04.1_1 19.04.0_1 18.12.3_1 18.12.2_1 18.12.1_1 18.12.0_2 18.12.0_1 18.08.3_1 18.08.2_1 18.08.1_1 18.08.0_1 18.04.3_1 17.12.3_1"
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="${KDE_SITE}https://invent.kde.org/frameworks/kcalendarcore"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e5cdec2ed0b2bee08e5d5395aee1dc13626e2287a235cd9f1506ad5f96d012fd
+checksum=bac828b363a7b406b3ccdc98854fb3ebd4d06b503c298dc676215a4612451529
 replaces="kcalcore>=0"
 
 do_check() {

From 066fb0313841a7d8c2c748f873e6e8024ab007bb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:23 +0200
Subject: [PATCH 0839/2024] kcmutils: update to 5.81.0.

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

diff --git a/srcpkgs/kcmutils/template b/srcpkgs/kcmutils/template
index 5ce249e9c530..c604ad54cd9e 100644
--- a/srcpkgs/kcmutils/template
+++ b/srcpkgs/kcmutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcmutils'
 pkgname=kcmutils
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kcmutils"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8c93b1a865bcfe0aa85b8ac59b7b0f214aa5fdc5767ee51657657360a8739e59
+checksum=b25ecd2e52ef1c133cbd3be87375ab4aebc7dcff5aeb2511282f68f4ede60297
 
 kcmutils-devel_package() {
 	short_desc+=" - development"

From 67c9d3869e308460b701053b7088582ee7e96190 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:25 +0200
Subject: [PATCH 0840/2024] kcodecs: update to 5.81.0.

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

diff --git a/srcpkgs/kcodecs/template b/srcpkgs/kcodecs/template
index 7af5b11cc0a4..a0f33bcd16ad 100644
--- a/srcpkgs/kcodecs/template
+++ b/srcpkgs/kcodecs/template
@@ -1,6 +1,6 @@
 # Template file for 'kcodecs'
 pkgname=kcodecs
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcodecs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4f56744c9647096b8d403d212081afffa890b4f386eeb33d1be497cee560881a
+checksum=4392afb4a3e1a4c8d6e645e7161d2651f5b83ca8620156cf942bfc95c33ce564
 
 kcodecs-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From 33413aa46129709d1bd87f802b095cb8cda0733f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:27 +0200
Subject: [PATCH 0841/2024] kcompletion: update to 5.81.0.

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

diff --git a/srcpkgs/kcompletion/template b/srcpkgs/kcompletion/template
index 93726f742347..32b42dca9989 100644
--- a/srcpkgs/kcompletion/template
+++ b/srcpkgs/kcompletion/template
@@ -1,6 +1,6 @@
 # Template file for 'kcompletion'
 pkgname=kcompletion
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcompletion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ef4251a6196255e8b131c8dd0793b3e79f7de05449cf2d466131d30078686093
+checksum=f7ac17e57203bfee92b252b92cd31174a624620119a461fad04087a7c8337c95
 
 if [ "CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools-devel"

From 3965bafa6aa9782925c50bdfae4f8c2e1803c2af Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:27 +0200
Subject: [PATCH 0842/2024] plasma-wayland-protocols: update to 1.2.1.

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

diff --git a/srcpkgs/plasma-wayland-protocols/template b/srcpkgs/plasma-wayland-protocols/template
index 2d9d9300ccc0..594de71c5d31 100644
--- a/srcpkgs/plasma-wayland-protocols/template
+++ b/srcpkgs/plasma-wayland-protocols/template
@@ -1,15 +1,16 @@
 # Template file for 'plasma-wayland-protocols'
 pkgname=plasma-wayland-protocols
-version=1.1.1
+version=1.2.1
 revision=1
+wrksrc="$pkgname-v$version"
 build_style=cmake
 hostmakedepends="extra-cmake-modules"
 short_desc="Plasma Specific Protocols for Wayland"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/libraries/plasma-wayland-protocols"
-distfiles="${KDE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=c5493383d115171c3435ea9a21b3966860632a844544ffac8f54890436a51d38
+distfiles="${KDE_SITE}/${pkgname}/${pkgname}-v${version}.tar.xz"
+checksum=287b90903f9a7f394c75e75cb187426862eaf64a92f1be7e2ef68e99fd8cbaaa
 
 post_install() {
 	vsed -e '/NOT CMAKE_SIZEOF_VOID_P STREQUAL/,+5d' \

From dc531b9e41443ee0221036f48af680cf07314124 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:29 +0200
Subject: [PATCH 0843/2024] kconfig: update to 5.81.0.

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

diff --git a/srcpkgs/kconfig/template b/srcpkgs/kconfig/template
index 4989a4e27919..10adbf9e4ac9 100644
--- a/srcpkgs/kconfig/template
+++ b/srcpkgs/kconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfig'
 pkgname=kconfig
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2600449e6a6ccf2d9f61ba33abff7ed29c1f975b33bfe6cc7e6d8993dddd19b2
+checksum=1ddf9e384140ce72bbd555eb36a76d0db1a256391429b02b51769c08ebf0ae8f
 
 kconfig-devel_package() {
 	short_desc+=" - development"

From 8e3169965a050d22b72de0fd463556c6d12c4506 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:32 +0200
Subject: [PATCH 0844/2024] kconfigwidgets: update to 5.81.0.

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

diff --git a/srcpkgs/kconfigwidgets/template b/srcpkgs/kconfigwidgets/template
index 903e3a62b90e..507d63b8cea3 100644
--- a/srcpkgs/kconfigwidgets/template
+++ b/srcpkgs/kconfigwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfigwidgets'
 pkgname=kconfigwidgets
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kconfigwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=479eef40642498adf5f1fd2ef5004be105e1d06d7981136d9f560b18121d2c8b
+checksum=e075022ba2db52df92fd21736e92ff73138eddc782fb765938ff84c68cedfdec
 
 kconfigwidgets-devel_package() {
 	short_desc+=" - development"

From 54ed586d9dd6921b2abee223429fdcca9f2499ee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:34 +0200
Subject: [PATCH 0845/2024] kcontacts: update to 5.81.0.

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

diff --git a/srcpkgs/kcontacts/template b/srcpkgs/kcontacts/template
index 15e5ab7025e8..101d4de6ff13 100644
--- a/srcpkgs/kcontacts/template
+++ b/srcpkgs/kcontacts/template
@@ -1,7 +1,7 @@
 # Template file for 'kcontacts'
 pkgname=kcontacts
 reverts="19.08.2_1 19.08.1_1 19.08.0_1 19.04.3_1"
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcontacts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d387b909e2e52b35efef6201502cb71705a76fdcd4fda8e7e535e5c66cbf7b9c
+checksum=e431fb04a17bf86cca0e5e618b0b7170c10815c3fdb891af80df48dcdfd59397
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen

From cd0fa3463d748ba05bf7c3eac26250f6aaa4cd62 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:37 +0200
Subject: [PATCH 0846/2024] kcoreaddons: update to 5.81.0.

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

diff --git a/srcpkgs/kcoreaddons/template b/srcpkgs/kcoreaddons/template
index 2ce3d9ad82d6..f95d9bb971f3 100644
--- a/srcpkgs/kcoreaddons/template
+++ b/srcpkgs/kcoreaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kcoreaddons'
 pkgname=kcoreaddons
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcoreaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ece39271678b3ff3753116bce8bb6747ebadbad522782d0f8051d8bab66f3ed1
+checksum=ac0ccb1687dd159ad2c6926f766498a2450906266139ec924d7794839a8cfedb
 
 post_install() {
 	vsed -e 's;${_IMPORT_PREFIX};/usr;g' \

From 1d8021ae9f6a8f019b3233be5a3d793f4f24a034 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:39 +0200
Subject: [PATCH 0847/2024] kcrash: update to 5.81.0.

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

diff --git a/srcpkgs/kcrash/template b/srcpkgs/kcrash/template
index fda993f37ff3..821f84871bcb 100644
--- a/srcpkgs/kcrash/template
+++ b/srcpkgs/kcrash/template
@@ -1,6 +1,6 @@
 # Template file for 'kcrash'
 pkgname=kcrash
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcrash"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=64a3e918fbf41c1bc1b708b526d2c928ac7d4c10579a10416e15788553444bb0
+checksum=0139f2630a5ad8fb8abb0fd504b1ba6d3e6f3b6a352acfaa1156f750e94a3cc7
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools kwindowsystem-devel kcoreaddons"

From 3fb36f9a17316892a8c6315a9b029da6bca60bf2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:42 +0200
Subject: [PATCH 0848/2024] kdav: update to 5.81.0.

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

diff --git a/srcpkgs/kdav/template b/srcpkgs/kdav/template
index ebb12d097b7f..e0b0ab47922d 100644
--- a/srcpkgs/kdav/template
+++ b/srcpkgs/kdav/template
@@ -1,7 +1,7 @@
 # Template file for 'kdav'
 pkgname=kdav
 reverts="19.04.0_1 19.04.1_1 19.04.2_1 19.04.3_1 19.08.0_1 19.08.1_1 19.08.2_1 19.08.3_1 19.12.0_1 19.12.1_1 19.12.2_1 19.12.3_1 20.04.0_1 20.04.1_1 20.04.2_1 20.04.3_1"
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdav"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=01044dfe0427eecc4cbe60357b4ef570c9081fa9b45cd846a9d8797cef254bb1
+checksum=0b00fdf902b1aeadfefe9caa11fad52a26f18e4c0e747c1bf8d9a1758b8bb133
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen

From c9c5bd80ca755af4a7bcc37f31ccc1ea3ce627de Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:44 +0200
Subject: [PATCH 0849/2024] kdbusaddons: update to 5.81.0.

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

diff --git a/srcpkgs/kdbusaddons/template b/srcpkgs/kdbusaddons/template
index b971fc4ee296..d11b15648e6f 100644
--- a/srcpkgs/kdbusaddons/template
+++ b/srcpkgs/kdbusaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kdbusaddons'
 pkgname=kdbusaddons
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdbusaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=14924319878951a4fbbf7b93da22428274449bec2bdd93b092e89f11bfbc1bf0
+checksum=49f5234327a8975e19602e4c7cc01f5ffbbd6e14d02fbcaefa2674d4eeab793d
 
 kdbusaddons-devel_package() {
 	short_desc+=" - development"

From 24cca2041190e11f492d1d388d35f9786369ab88 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:47 +0200
Subject: [PATCH 0850/2024] kdeclarative: update to 5.81.0.

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

diff --git a/srcpkgs/kdeclarative/template b/srcpkgs/kdeclarative/template
index e3ce275660f9..cade4690ccda 100644
--- a/srcpkgs/kdeclarative/template
+++ b/srcpkgs/kdeclarative/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeclarative'
 pkgname=kdeclarative
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdeclarative"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bf55ba32475f3459e32f38ca49ced27373427b679ab5dd98e03f02e6f1359d3d
+checksum=7dcce4ec31bc41958f0c2ca53134821f921b1d5ebbab75f6d41bf07b0555d368
 
 kdeclarative-devel_package() {
 	short_desc+=" - development"

From a7c4cca59f3b83f5c4a31590c767a8179f92a8f0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:50 +0200
Subject: [PATCH 0851/2024] kded: update to 5.81.0.

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

diff --git a/srcpkgs/kded/template b/srcpkgs/kded/template
index 4e5de9dca164..96238e9cb50d 100644
--- a/srcpkgs/kded/template
+++ b/srcpkgs/kded/template
@@ -1,6 +1,6 @@
 # Template file for 'kded'
 pkgname=kded
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kded"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4157de65d9acc6620da42f777c6fc56ef4ecb846cd3b80db5e349b35dc1f736a
+checksum=513b1bec662741e25d43c21b64b3213e0fd6f840b9f282e9024536c558960084
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools"

From 9893b0e5950e076372fdbb02f525eb3d3fb51077 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:54 +0200
Subject: [PATCH 0852/2024] kdelibs4support: update to 5.81.0.

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

diff --git a/srcpkgs/kdelibs4support/template b/srcpkgs/kdelibs4support/template
index c2f03082f828..a2eee7c2ea69 100644
--- a/srcpkgs/kdelibs4support/template
+++ b/srcpkgs/kdelibs4support/template
@@ -1,6 +1,6 @@
 # Template file for 'kdelibs4support'
 pkgname=kdelibs4support
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -16,7 +16,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdelibs4support"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=43e258cac33f5dc85438034e20dbe29627cddad3b595527fc524681d110a6d05
+checksum=6614d9d8c004e15359ef0f5ac37419d706beb0bcc53fafecc3536a340d8963b2
 
 if [ "$CROSS_BUILD" ]; then
 	# gettaddrinfo runtime test is always fine (can't be achieved in crossbuild)

From db460ecba5a672d40848f9e1d70103ddcf9e6d26 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:56 +0200
Subject: [PATCH 0853/2024] kdesignerplugin: update to 5.81.0.

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

diff --git a/srcpkgs/kdesignerplugin/template b/srcpkgs/kdesignerplugin/template
index dede1b28e06a..67ca33028162 100644
--- a/srcpkgs/kdesignerplugin/template
+++ b/srcpkgs/kdesignerplugin/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesignerplugin'
 pkgname=kdesignerplugin
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only"
 homepage="https://invent.kde.org/frameworks/kdesignerplugin"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=43e36e8ba3b0c9d84de2359c89ee332f96e6cbf7cfebd4bc81b9d9e3c7c3e9b4
+checksum=4307cd1c3bb681ec1c28cb4399ef952a1966273963f6511eb0b6256d9791f6e5
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools python kgendesignerplugin kdoctools"

From a17e941b939b9a617980ec8c2d3063cf714d8840 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:44:58 +0200
Subject: [PATCH 0854/2024] kdesu: update to 5.81.0.

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

diff --git a/srcpkgs/kdesu/template b/srcpkgs/kdesu/template
index 880d03c5829f..cd7ba48a09e7 100644
--- a/srcpkgs/kdesu/template
+++ b/srcpkgs/kdesu/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesu'
 pkgname=kdesu
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kdesu"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8d45ea674551bb344fc897f9d1c5500291008cd099ce71205a9949cb386a4acf
+checksum=de0b4ab6a0606e0fc00181c4295a533928ab2be9fbe24ca726abdecd6618c59c
 
 kdesu-devel_package() {
 	short_desc+=" - development"

From f83ae7bc07c68d387ca9da7e3e59388dac1d0d83 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:00 +0200
Subject: [PATCH 0855/2024] kdewebkit: update to 5.81.0.

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

diff --git a/srcpkgs/kdewebkit/template b/srcpkgs/kdewebkit/template
index 8ee2cda8486c..9a53524aef56 100644
--- a/srcpkgs/kdewebkit/template
+++ b/srcpkgs/kdewebkit/template
@@ -1,6 +1,6 @@
 # Template file for 'kdewebkit'
 pkgname=kdewebkit
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdewebkit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=917defa04b29407e8b89daedb16e1fe5dfdc1b116811b5b9815faa2a78ea0687
+checksum=e78862349a786e0969cc6934e4b99845a6bd7c66de1d94ef5893978c78bd4d08
 
 kdewebkit-devel_package() {
 	short_desc+=" - development"

From 00b2e9d848bbff775945e2d97303d874ccec95b2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:04 +0200
Subject: [PATCH 0856/2024] kdnssd: update to 5.81.0.

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

diff --git a/srcpkgs/kdnssd/template b/srcpkgs/kdnssd/template
index 05023a6c8c15..d6db1cfcc5e2 100644
--- a/srcpkgs/kdnssd/template
+++ b/srcpkgs/kdnssd/template
@@ -1,6 +1,6 @@
 # Template file for 'kdnssd'
 pkgname=kdnssd
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdnssd"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=afa10cdb6cc97413a045e5f152d74e1ef2f0a7bab057460a3d20ab62e098144d
+checksum=316e53ad258a08acff886a11a1f0fac69433a5df90b8c6ad5dea945c0a4f84c2
 
 kdnssd-devel_package() {
 	short_desc+=" - development"

From 440bdd2d16ac2d1b8853d8ef342fbf079e9fb92c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:06 +0200
Subject: [PATCH 0857/2024] kdoctools: update to 5.81.0.

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

diff --git a/srcpkgs/kdoctools/template b/srcpkgs/kdoctools/template
index ae30fe179053..bb4bd7af6da2 100644
--- a/srcpkgs/kdoctools/template
+++ b/srcpkgs/kdoctools/template
@@ -1,6 +1,6 @@
 # Template file for 'kdoctools'
 pkgname=kdoctools
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdoctools"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1eae100e641206ef01275d3577c286f73523a516854fe146121ceb302fc0ac83
+checksum=398677ebea07c6db652a735689c5e2fdb4a6fd42757dec850f90c0433af60a87
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools-devel"

From 4bb18c02bdf5d64c6e6396271e426a5fe083cb4d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:09 +0200
Subject: [PATCH 0858/2024] kemoticons: update to 5.81.0.

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

diff --git a/srcpkgs/kemoticons/template b/srcpkgs/kemoticons/template
index 4891df41eca4..5ffc0924ff5b 100644
--- a/srcpkgs/kemoticons/template
+++ b/srcpkgs/kemoticons/template
@@ -1,6 +1,6 @@
 # Template file for 'kemoticons'
 pkgname=kemoticons
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, CC-BY-4.0"
 homepage="https://invent.kde.org/frameworks/kemoticons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0b8affb1cd506fcc7a7582b37fac2da68fc45e8f34df32e4f5335fb79af9e549
+checksum=ec8d17115c03c7a3071b4088478819c091cb3bb237a4fa7277e9e1ea9849fb9f
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From fadcdf5c1f86805303e6a6e82270c64c3f0a6edd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:12 +0200
Subject: [PATCH 0859/2024] kfilemetadata5: update to 5.81.0.

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

diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index e2b164f2598d..4ab6591f3fdf 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,6 +1,6 @@
 # Template file for 'kfilemetadata5'
 pkgname=kfilemetadata5
-version=5.80.0
+version=5.81.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kfilemetadata"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=75cd4d04eced8a30eb372157f0d0cfbe5dd89737b5083aceb0b650afa7f7600a
+checksum=318cd48f2b2400b2e453a4c3f373e84dc1296c972c0b0e01c5c39429353d6a31
 
 kfilemetadata5-devel_package() {
 	short_desc+=" - development"

From 4f8c288d6d3358058ca9e635133d54b78285c5b2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:14 +0200
Subject: [PATCH 0860/2024] kglobalaccel: update to 5.81.0.

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

diff --git a/srcpkgs/kglobalaccel/template b/srcpkgs/kglobalaccel/template
index 5c2f9fb11db0..cd5e507fd35e 100644
--- a/srcpkgs/kglobalaccel/template
+++ b/srcpkgs/kglobalaccel/template
@@ -1,6 +1,6 @@
 # Template file for 'kglobalaccel'
 pkgname=kglobalaccel
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kglobalaccel"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=36f0abd93064b1b213c87d2e182649bc2f43cdd78ab45a4d686d9fb2c609bd04
+checksum=ff33288695af403eaf3ddd2a142e3ea7d3451c897e6d49a3746b6977aba3b829
 
 kglobalaccel-devel_package() {
 	short_desc+=" - development"

From 0577fe29400f2deaa869b67214b4457af1d0fbbd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:16 +0200
Subject: [PATCH 0861/2024] kguiaddons: update to 5.81.0.

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

diff --git a/srcpkgs/kguiaddons/template b/srcpkgs/kguiaddons/template
index c0eaa7c4e821..d4f647b38ef8 100644
--- a/srcpkgs/kguiaddons/template
+++ b/srcpkgs/kguiaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kguiaddons'
 pkgname=kguiaddons
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kguiaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e563f232261b3a60c8d6c88ec5b08b6267c3c513d76d368386386192cefd4dc5
+checksum=e3f7ee35ae89f82af13e4da75d3cfa163597062c5a7b3207ed2841a9d7ca3ee1
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen

From 6c72f673e405dfd78be036f3cefab8f894ee50f4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:19 +0200
Subject: [PATCH 0862/2024] kholidays: update to 5.81.0.

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

diff --git a/srcpkgs/kholidays/template b/srcpkgs/kholidays/template
index 79c384e36276..6c992b4efeec 100644
--- a/srcpkgs/kholidays/template
+++ b/srcpkgs/kholidays/template
@@ -1,7 +1,7 @@
 # Template file for 'kholidays'
 pkgname=kholidays
 reverts="17.12.3_1 17.12.1_1 17.12.0_1 17.04.3_1"
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kholidays"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5f9c0f0b652c9169b39148120d57c26d0c73c82111e8844d51e5c39fc3d7d5ce
+checksum=4ce8cee4f8e02f2f9940ef8036c5ff6a7d1f03928fee4e78bad2505f2fff98dd
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From 45fa57f70a48b7b8a9e9f4e69dd1b8a8c09cb207 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:22 +0200
Subject: [PATCH 0863/2024] khtml: update to 5.81.0.

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

diff --git a/srcpkgs/khtml/template b/srcpkgs/khtml/template
index b0e488536b0f..893a3e756027 100644
--- a/srcpkgs/khtml/template
+++ b/srcpkgs/khtml/template
@@ -1,6 +1,6 @@
 # Template file for 'khtml'
 pkgname=khtml
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/khtml"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=bd1a267013cdfcb7825d38c1ce3ad47fc52545163e1a201fa69ee2c4b50e12a1
+checksum=f7d920d5c701e38d121e912662e3eded80dcc78f7c776e3b8f303941791fe229
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen

From 2625c3e40208bc897bca3a5c506f2acc081346d0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:24 +0200
Subject: [PATCH 0864/2024] ki18n: update to 5.81.0.

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

diff --git a/srcpkgs/ki18n/template b/srcpkgs/ki18n/template
index 7e0212bb5969..9ecaa3135080 100644
--- a/srcpkgs/ki18n/template
+++ b/srcpkgs/ki18n/template
@@ -1,6 +1,6 @@
 # Template file for 'ki18n'
 pkgname=ki18n
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ki18n"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=883a79d7e6c795148c0fe76f44a6f9ffe34282f827e580e70937fe8259967a7a
+checksum=2c4bd5b4882890430369fa7fa47a754015e6db93277bfc8a4f1e20fe7d6ba78a
 
 ki18n-devel_package() {
 	short_desc+=" - development"

From 5cac85389192618e47dfecc899219d0047eba721 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:28 +0200
Subject: [PATCH 0865/2024] kiconthemes: update to 5.81.0.

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

diff --git a/srcpkgs/kiconthemes/template b/srcpkgs/kiconthemes/template
index ddc40a6ba1eb..dee9c22d2ce0 100644
--- a/srcpkgs/kiconthemes/template
+++ b/srcpkgs/kiconthemes/template
@@ -1,6 +1,6 @@
 # Template file for 'kiconthemes'
 pkgname=kiconthemes
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kiconthemes"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=92f2dc363fb8e6b7acdf1d7013d5b06f1f825466d8db00f79cd73cfc3ed9768c
+checksum=fc47bee6468b91603fee0dcc166ca3dc3cea999eb4719b07fb269d17db3f6a14
 
 kiconthemes-devel_package() {
 	short_desc+=" - development"

From d610ccb8c1dbedbd86fd5d70aa15827f6b5ee183 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:30 +0200
Subject: [PATCH 0866/2024] kidletime: update to 5.81.0.

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

diff --git a/srcpkgs/kidletime/template b/srcpkgs/kidletime/template
index b76122decfdb..4e6d7dd5a63b 100644
--- a/srcpkgs/kidletime/template
+++ b/srcpkgs/kidletime/template
@@ -1,6 +1,6 @@
 # Template file for 'kidletime'
 pkgname=kidletime
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kidletime"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=03b9878dd11d98798a2801af3797be2c7a700bf637c7df1a5947238ae78552fa
+checksum=1be7af2cf8d1fa2a67dbec0ac4733e36f7b2d98250a5c63db3a8c323666af98b
 
 kidletime-devel_package() {
 	short_desc+=" - development"

From c3a1574cb87a66aba6193d576c591919def6ca68 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:33 +0200
Subject: [PATCH 0867/2024] kimageformats: update to 5.81.0.

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

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index 45fefe561fce..d9111329cd7a 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,6 +1,6 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kimageformats"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1d65641583e44c25de8ac98d7ef5925f08074a9ccf33ef7e7b504dd3a7347160
+checksum=a332a0d708417c6e973b19d8b3aec006f3c1c57ef17851dc00e4921d7c43864e

From 58d50e16a7654f15e2fa9de537b1d0529267d439 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:35 +0200
Subject: [PATCH 0868/2024] kinit: update to 5.81.0.

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

diff --git a/srcpkgs/kinit/template b/srcpkgs/kinit/template
index 65e8f99795e6..267c2ab19397 100644
--- a/srcpkgs/kinit/template
+++ b/srcpkgs/kinit/template
@@ -1,6 +1,6 @@
 # Template file for 'kinit'
 pkgname=kinit
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kinit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=df256d1cb082de845a6f8d18b372694130c83e9b800033f0987d1929fcdc3480
+checksum=927c09cb6476143e1091e24f91cf26751ad57bab87b8cf3640d1ab4ab6c768f3
 
 kinit-devel_package() {
 	short_desc+=" - development"

From ab0fbc277a036e25b6eb7e64d3494c55e46cf0ef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:39 +0200
Subject: [PATCH 0869/2024] kio: update to 5.81.0.

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

diff --git a/srcpkgs/kio/template b/srcpkgs/kio/template
index 1b44de646fb5..b10c5e967ed1 100644
--- a/srcpkgs/kio/template
+++ b/srcpkgs/kio/template
@@ -1,6 +1,6 @@
 # Template file for 'kio'
 pkgname=kio
-version=5.80.1
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kio"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d971ce61a022f9e4d2d6be9c66917be271d0fb212795a151150e208e64cd5a28
+checksum=c62bae911978d163bbb86648344708d5b963823244941de0904c2a7800ecc07e
 
 CXXFLAGS+=" -fpermissive"
 

From df08a027f35ecab255a8bf8d7b7566b636ebda9c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:42 +0200
Subject: [PATCH 0870/2024] kirigami2: update to 5.81.0.

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

diff --git a/srcpkgs/kirigami2/template b/srcpkgs/kirigami2/template
index 5a5e863bf4e5..9ddac83378a0 100644
--- a/srcpkgs/kirigami2/template
+++ b/srcpkgs/kirigami2/template
@@ -1,6 +1,6 @@
 # Template file for 'kirigami2'
 pkgname=kirigami2
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://techbase.kde.org/Kirigami"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kirigami2-${version}.tar.xz"
-checksum=228ef76fa69f1d7f89f8f04be93a0528507352f3c97f6d98b6259207b2679272
+checksum=d6572cfd6effc60429fb780fd0436fa484c42a01b30c9cf0319c68b15c158cad
 
 kirigami2-devel_package() {
 	short_desc+=" - development"

From 97c2ae3e4ee65df622585f7dcacb1df3ba99f9dc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:45 +0200
Subject: [PATCH 0871/2024] kitemmodels: update to 5.81.0.

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

diff --git a/srcpkgs/kitemmodels/template b/srcpkgs/kitemmodels/template
index d2e73871cfb6..63225c0e3e6a 100644
--- a/srcpkgs/kitemmodels/template
+++ b/srcpkgs/kitemmodels/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemmodels'
 pkgname=kitemmodels
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemmodels"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=93948d1b2a29a9d6e8c436af5bc0ac5fc59e0d7a5632a5c611ee31a648856faf
+checksum=8093617c30c99d54562f6facdeb8929a7132841f13c63c4a0ad1a78e002e476f
 
 kitemmodels-devel_package() {
 	short_desc+=" - development"

From 231dbc13247b6079f19ce9f4cc5322ff1d54f123 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:47 +0200
Subject: [PATCH 0872/2024] kitemviews: update to 5.81.0.

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

diff --git a/srcpkgs/kitemviews/template b/srcpkgs/kitemviews/template
index 5085d0fe2d7e..339df951acc9 100644
--- a/srcpkgs/kitemviews/template
+++ b/srcpkgs/kitemviews/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemviews'
 pkgname=kitemviews
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemviews"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9702a531799c5f99810beaa64efeb0683d5ae8d4c4933de6906d205f192635c9
+checksum=368039bdd5a925565a8731a2cd405a51cf8c2ef19f7397a0c234d6558e61b05a
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools qt5-tools-devel"

From 5fe856b0973ce198421756d131b5364a36ab4388 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:50 +0200
Subject: [PATCH 0873/2024] kjobwidgets: update to 5.81.0.

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

diff --git a/srcpkgs/kjobwidgets/template b/srcpkgs/kjobwidgets/template
index b01352491e61..a2c8ed477044 100644
--- a/srcpkgs/kjobwidgets/template
+++ b/srcpkgs/kjobwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kjobwidgets'
 pkgname=kjobwidgets
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjobwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=572a9b6475a5e07ad6b8b7e138533a84d0aaeac72bd86143814d076965b2c5fb
+checksum=eac2a1bf5a7b6f8f549096a0574ded82dc2378059d5c9ea290754954908a88be
 
 kjobwidgets-devel_package() {
 	short_desc+=" - development"

From 607f52052901afb064dcd6a20b9b79b307d0ec24 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:52 +0200
Subject: [PATCH 0874/2024] kjs: update to 5.81.0.

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

diff --git a/srcpkgs/kjs/template b/srcpkgs/kjs/template
index c30af1f45cc4..f66858ca04e7 100644
--- a/srcpkgs/kjs/template
+++ b/srcpkgs/kjs/template
@@ -1,6 +1,6 @@
 # Template file for 'kjs'
 pkgname=kjs
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=3286281f3ebbfc78336cff73a012106f836f39b7ef1ed32e6040c4ffb98f72ec
+checksum=b9a71c912448bf24083a6b7fb509ec5fa904b2838e02ae38d49dda702bbd2a11
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools kjs"

From fc879c434fbfb6d7f2e6353438fbc25548168753 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:55 +0200
Subject: [PATCH 0875/2024] kjsembed: update to 5.81.0.

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

diff --git a/srcpkgs/kjsembed/template b/srcpkgs/kjsembed/template
index 3b801522cdf5..7b1be930ea07 100644
--- a/srcpkgs/kjsembed/template
+++ b/srcpkgs/kjsembed/template
@@ -1,6 +1,6 @@
 # Template file for 'kjsembed'
 pkgname=kjsembed
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjsembed"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=a7446a5439c5be9ec24715c506d287379398d65ce4836937480afaa367ba6f20
+checksum=090f2e3e25f35566a4afd6a9369a867124c22a590b02d53e9d0fb49a99fb6a7e
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"

From c3a53b13aac135a23fb0818a0802b74d1a47c9be Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:45:57 +0200
Subject: [PATCH 0876/2024] kmediaplayer: update to 5.81.0.

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

diff --git a/srcpkgs/kmediaplayer/template b/srcpkgs/kmediaplayer/template
index 0b89840cf495..0c602c326d65 100644
--- a/srcpkgs/kmediaplayer/template
+++ b/srcpkgs/kmediaplayer/template
@@ -1,6 +1,6 @@
 # Template file for 'kmediaplayer'
 pkgname=kmediaplayer
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="X11"
 homepage="https://invent.kde.org/frameworks/kmediaplayer"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=cb94adfd7fa6b24742cd958dd765fd82957bfb1cf242658cbd451e2ffdcf2628
+checksum=0b1de1e94f1ac3c0eefb976f19ec9b6d13f6a0e4c92bb14c2408f379c289327c
 
 kmediaplayer-devel_package() {
 	short_desc+=" - development"

From af8f3cb0929d7d2679a3850a0d67e30174485b4d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:00 +0200
Subject: [PATCH 0877/2024] knewstuff: update to 5.81.0.

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

diff --git a/srcpkgs/knewstuff/template b/srcpkgs/knewstuff/template
index 141ab05ccc84..5085b07c9b4c 100644
--- a/srcpkgs/knewstuff/template
+++ b/srcpkgs/knewstuff/template
@@ -1,6 +1,6 @@
 # Template file for 'knewstuff'
 pkgname=knewstuff
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knewstuff"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=dfe874f7fe944fe877c0d443349102ceacb268c45dc1f666ec42ff219024735d
+checksum=d3ae54a7a8dc4293c305eb440dfe524d4ef394e2ebcb050a0abadb66ad41ae72
 
 knewstuff-devel_package() {
 	short_desc+=" - development"

From 13e96bfdad891ceea4adbde557d046b26752885e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:02 +0200
Subject: [PATCH 0878/2024] knotifications: update to 5.81.0.

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

diff --git a/srcpkgs/knotifications/template b/srcpkgs/knotifications/template
index 03560e2b6ca5..4e9c06b5064f 100644
--- a/srcpkgs/knotifications/template
+++ b/srcpkgs/knotifications/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifications'
 pkgname=knotifications
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifications"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5a7c9914f868818d57e2062e27c258a94c4041e702a0b55dafe3e1067730d6e9
+checksum=1ad7f7d0e17724085c2e55f9fda34828add9ff74966aae0bc95aa1041accce13
 
 knotifications-devel_package() {
 	short_desc+=" - development"

From fccb1e993577c45435478c6c141c2574a74fc763 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:05 +0200
Subject: [PATCH 0879/2024] knotifyconfig: update to 5.81.0.

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

diff --git a/srcpkgs/knotifyconfig/template b/srcpkgs/knotifyconfig/template
index e49a03147110..247f563d8e6f 100644
--- a/srcpkgs/knotifyconfig/template
+++ b/srcpkgs/knotifyconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifyconfig'
 pkgname=knotifyconfig
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifyconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fd474e9d231330b141e1443f46036d5b6d884c0edb9e55f1a4e762e1e2bd812c
+checksum=7a49ef1a4416b17082cc9d56e7ee01264999289cdcf06bd2d1a08717ce492d77
 
 knotifyconfig-devel_package() {
 	short_desc+=" - development"

From c472d5f7d5c3ebd424e941dbd20f0b2defb401d5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:07 +0200
Subject: [PATCH 0880/2024] kpackage: update to 5.81.0.

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

diff --git a/srcpkgs/kpackage/template b/srcpkgs/kpackage/template
index 220b30965a1f..04493841d112 100644
--- a/srcpkgs/kpackage/template
+++ b/srcpkgs/kpackage/template
@@ -1,6 +1,6 @@
 # Template file for 'kpackage'
 pkgname=kpackage
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpackage"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=90894de985c5acfd7a393787a295d50778a9562ad5d88725e06dc71195e79880
+checksum=6a164389b07a6f00176a985cf9f88f9d5880514ba57084281a94722d7cd93ee4
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"

From 09c40c1f22420ab2fb9facd6b1c17e3636f8fac2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:11 +0200
Subject: [PATCH 0881/2024] kparts: update to 5.81.0.

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

diff --git a/srcpkgs/kparts/template b/srcpkgs/kparts/template
index f20b15bc97a4..95e4fa3ff477 100644
--- a/srcpkgs/kparts/template
+++ b/srcpkgs/kparts/template
@@ -1,6 +1,6 @@
 # Template file for 'kparts'
 pkgname=kparts
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kparts"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9eb464f171f219e264237bb200767c8b3c70f10004521fad2d90af93bf926eba
+checksum=eb90dee4329fbc97acf3349fe344a86b2ef742dece35edf80e44ca5b1eaf58be
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen

From 34d6b7b0ab0d9ba4586adade29a7efcb9f0f68e9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:14 +0200
Subject: [PATCH 0882/2024] kpeople: update to 5.81.0.

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

diff --git a/srcpkgs/kpeople/template b/srcpkgs/kpeople/template
index e729f8ec2aed..1ac63125702c 100644
--- a/srcpkgs/kpeople/template
+++ b/srcpkgs/kpeople/template
@@ -1,6 +1,6 @@
 # Template file for 'kpeople'
 pkgname=kpeople
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpeople"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9c99f07f1acaf6ffbf94a9c2be7564f724ec41604986a74fc4400ea82296c9b2
+checksum=305a2b5c43c8964fa88e4326ef9d8a487b56af04c858a4f18e991b9218d2c3a8
 
 kpeople-devel_package() {
 	short_desc+=" - development"

From 89d5b7b51f60dc1b13fc43684ad730a73707d1d7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:16 +0200
Subject: [PATCH 0883/2024] kplotting: update to 5.81.0.

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

diff --git a/srcpkgs/kplotting/template b/srcpkgs/kplotting/template
index f414dfcf867c..66c507e07650 100644
--- a/srcpkgs/kplotting/template
+++ b/srcpkgs/kplotting/template
@@ -1,6 +1,6 @@
 # Template file for 'kplotting'
 pkgname=kplotting
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kplotting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bc5ba241d24d063d6973303eaed1dce9d2d9aba630b83c74e4e73d06fe63711c
+checksum=cbfb7207c45b2e2afae2f78f9f924ec269515d07ac93bf52ca556287ab4266e8
 
 kplotting-devel_package() {
 	short_desc+=" - development"

From 5cafd450694deb2a6c270d8d93cfc8ecd1f22e74 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:18 +0200
Subject: [PATCH 0884/2024] kpty: update to 5.81.0.

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

diff --git a/srcpkgs/kpty/template b/srcpkgs/kpty/template
index 03bb3537ca7e..0fb2a200b176 100644
--- a/srcpkgs/kpty/template
+++ b/srcpkgs/kpty/template
@@ -1,6 +1,6 @@
 # Template file for 'kpty'
 pkgname=kpty
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpty"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=93d0d266db0bb249ccb4f329acc0dbfb52289e697e0a6bfbb8c98e687fb6748d
+checksum=f34a4f614e2ce5346363fc303d2cc2291fee52c9c359115e9f1a8638e7954351
 
 kpty-devel_package() {
 	short_desc+=" - development"

From 543c82b5a27732e70fba3a05cbc099d4564c72ca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:21 +0200
Subject: [PATCH 0885/2024] kquickcharts: update to 5.81.0.

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

diff --git a/srcpkgs/kquickcharts/template b/srcpkgs/kquickcharts/template
index 14338d2dbc1e..729e06b14982 100644
--- a/srcpkgs/kquickcharts/template
+++ b/srcpkgs/kquickcharts/template
@@ -1,16 +1,17 @@
 # Template file for 'kquickcharts'
 pkgname=kquickcharts
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools"
 makedepends="qt5-declarative-devel qt5-quickcontrols2-devel"
+checkdepends="glslang which"
 short_desc="QtQuick plugin providing high-performance charts"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kquickcharts-${version}.tar.xz"
-checksum=962ed2b22ccac8ae900827bc41581efea546b833495869d3e3ccc5795314c74d
+checksum=5f864d1132a11fdbd9f77419a98277cfd4b761a227f171d08d8dd2c82fa88203
 
 do_check() {
 	export QT_QPA_PLATFORM=offscreen

From 7888d7fccf7c34e05824ba55cbae6a1171820cd6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:24 +0200
Subject: [PATCH 0886/2024] kross: update to 5.81.0.

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

diff --git a/srcpkgs/kross/template b/srcpkgs/kross/template
index 81bf735b1388..e5661c59b4cb 100644
--- a/srcpkgs/kross/template
+++ b/srcpkgs/kross/template
@@ -1,6 +1,6 @@
 # Template file for 'kross'
 pkgname=kross
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kross"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=29ce280dd59d2019387bbe29326dbfd2a0a66b7f73ea15149b3ee5d561c5be19
+checksum=a3522ed07a9a33013639cb36484b4745af5025ef65efb10e291bc663b3f25a0a
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 7f7ccc1e4f6d7e65feb2d889072f9dd98a7999b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:26 +0200
Subject: [PATCH 0887/2024] krunner: update to 5.81.0.

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

diff --git a/srcpkgs/krunner/template b/srcpkgs/krunner/template
index 87bf57cd88d1..c3a1da63a692 100644
--- a/srcpkgs/krunner/template
+++ b/srcpkgs/krunner/template
@@ -1,6 +1,6 @@
 # Template file for 'krunner'
 pkgname=krunner
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/krunner"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fcf6e404e4a56877751ea5dc60c7a4b58cfb8986ae4262cc77bdeeca01342d2e
+checksum=45bdc312c28c995a9a29e8212b1299bd89350ea4cab706d343bf42813826c0f9
 
 krunner-devel_package() {
 	short_desc+=" - development"

From 91671adb0f2974195c8beb1a200006ccee325b0c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:29 +0200
Subject: [PATCH 0888/2024] kservice: update to 5.81.0.

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

diff --git a/srcpkgs/kservice/template b/srcpkgs/kservice/template
index 10466421046c..3fb47fc5023b 100644
--- a/srcpkgs/kservice/template
+++ b/srcpkgs/kservice/template
@@ -1,6 +1,6 @@
 # Template file for 'kservice'
 pkgname=kservice
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kservice"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e868f2a337e8e05a8cc596f8baaa9c310cbc51e73b3dfd4f81ed3c3ca8217319
+checksum=ec6b054942417cb8c6adb2f502c43a268f96d85d9e4477e1292b1dd4d0e766cd
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel kcoreaddons kdoctools"

From 91a011b23c33b5ce43c67718a36826d7e780e7c9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:31 +0200
Subject: [PATCH 0889/2024] ksolid: update to 5.81.0.

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

diff --git a/srcpkgs/ksolid/template b/srcpkgs/ksolid/template
index 48791cc8f7ed..c35ba77d9442 100644
--- a/srcpkgs/ksolid/template
+++ b/srcpkgs/ksolid/template
@@ -1,6 +1,6 @@
 # Template file for 'ksolid'
 pkgname=ksolid
-version=5.80.0
+version=5.81.0
 revision=1
 wrksrc="${pkgname#k}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/solid"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#k}-${version}.tar.xz"
-checksum=a54fdcbcd4d7f8cc3d10808199b2c09a249e0059e70b23053c8d79a3e8997f08
+checksum=8199ec5bc1443a54632c7c3999ec574b40bb0c35b9fb0ef6c54f5e0d9b242470
 
 libksolid_package() {
 	short_desc+=" - runtime library"

From 0f007dd091fde1a87408db6470530b4a147495dd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:35 +0200
Subject: [PATCH 0890/2024] ktexteditor: update to 5.81.0.

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

diff --git a/srcpkgs/ktexteditor/template b/srcpkgs/ktexteditor/template
index 5b2dac88d17f..549fe251f632 100644
--- a/srcpkgs/ktexteditor/template
+++ b/srcpkgs/ktexteditor/template
@@ -1,6 +1,6 @@
 # Template file for 'ktexteditor'
 pkgname=ktexteditor
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/ktexteditor"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a081655a8ea67818be740363a9310b2972ca34659e61f879ebf0df85421d073c
+checksum=75e774bff6eb0134818dc93fc505639ce3aa8316dce45255b28892f9f19c7ddd
 
 ktexteditor-devel_package() {
 	short_desc+=" - development"

From c7b32d58b461141428a25d1d5051db69d006ad35 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:37 +0200
Subject: [PATCH 0891/2024] ktextwidgets: update to 5.81.0.

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

diff --git a/srcpkgs/ktextwidgets/template b/srcpkgs/ktextwidgets/template
index 432795e79b4a..32cfc30c64d7 100644
--- a/srcpkgs/ktextwidgets/template
+++ b/srcpkgs/ktextwidgets/template
@@ -1,18 +1,19 @@
 # Template file for 'ktextwidgets'
 pkgname=ktextwidgets
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
  qt5-tools gettext python3"
-makedepends="kcompletion-devel kiconthemes-devel kservice-devel sonnet-devel"
+makedepends="kcompletion-devel kiconthemes-devel kservice-devel sonnet-devel
+ qt5-speech-devel"
 short_desc="KDE Text editing widgets"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/ktextwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e8d5dd11835b8245ad1cb0ce0de74d40a9e8310df93b3c64998b2e3eb29d2289
+checksum=c8274b737da6535af2bfe3b51733baaea5f1bb348ea7854658b84f58bb10b612
 
 ktextwidgets-devel_package() {
 	short_desc+=" - development"

From a24a9f1450f87b75de70734019ddd31b29514a64 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:40 +0200
Subject: [PATCH 0892/2024] kunitconversion: update to 5.81.0.

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

diff --git a/srcpkgs/kunitconversion/template b/srcpkgs/kunitconversion/template
index 7f4ba3ab48c9..b96701a522b0 100644
--- a/srcpkgs/kunitconversion/template
+++ b/srcpkgs/kunitconversion/template
@@ -1,6 +1,6 @@
 # Template file for 'kunitconversion'
 pkgname=kunitconversion
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools ki18n-devel
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kunitconversion"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=94ac5214e4a990ae569f2e4bdc66d2d6f46b60a225ee9f90274c4b39e69093c1
+checksum=3efc21a1438875429620a725e4bb4b8dbe40e2aa5f041f5d6557e2e1461131bd
 
 kunitconversion-devel_package() {
 	short_desc+=" - development"

From a2027c7d87fabecc6f38bf4d1f0fb60bd105e36d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:43 +0200
Subject: [PATCH 0893/2024] kwallet: update to 5.81.0.

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

diff --git a/srcpkgs/kwallet/template b/srcpkgs/kwallet/template
index 913f8c6ce984..83de3e0b794e 100644
--- a/srcpkgs/kwallet/template
+++ b/srcpkgs/kwallet/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet'
 pkgname=kwallet
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwallet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e1c9ed012735fdea4000086c2646e2ad99f15127b399420885a7b7de25ec99df
+checksum=ff8596bf771c55bbfdc9da2736eeb4f86a63a92bc82132ce4a6b1d82809005c4
 
 kwallet-devel_package() {
 	short_desc+=" - development"

From 4ecfc4f8f0ce8d37f0d77e8a26e9c6954ba5b51a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:46 +0200
Subject: [PATCH 0894/2024] kwayland: update to 5.81.0.

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

diff --git a/srcpkgs/kwayland/template b/srcpkgs/kwayland/template
index ada4563d3aef..868c326c9abb 100644
--- a/srcpkgs/kwayland/template
+++ b/srcpkgs/kwayland/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland'
 pkgname=kwayland
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwayland"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=403bf7c8426febfda37f26addb90a31b5978d9fc76d25a22472570e8273b79ab
+checksum=de22cad7b4ddaebbfc9a9b60cbd7e41c5de5a943c89b46b077a12b651cfb43a8
 
 kwayland-devel_package() {
 	short_desc+=" - development"

From 5c367686753246fded22beb16a877dc32cad951b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:50 +0200
Subject: [PATCH 0895/2024] kwidgetsaddons: update to 5.81.0.

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

diff --git a/srcpkgs/kwidgetsaddons/template b/srcpkgs/kwidgetsaddons/template
index 0a005d1c4acb..3685b6bc3480 100644
--- a/srcpkgs/kwidgetsaddons/template
+++ b/srcpkgs/kwidgetsaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kwidgetsaddons'
 pkgname=kwidgetsaddons
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwidgetsaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a9bfd5653d4c45d55bac5d0a28c8caec8d504bce2ee192d68ecf3ce10a0fcf1
+checksum=2f25e926edcab19e3ff3529b71ca409b2bb100c35f5a6e3aff663e1854a3b642
 
 kwidgetsaddons-devel_package() {
 	short_desc+=" - development"

From d367f387014550791da1ec64dcf444e91c15d538 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:52 +0200
Subject: [PATCH 0896/2024] kwindowsystem: update to 5.81.0.

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

diff --git a/srcpkgs/kwindowsystem/template b/srcpkgs/kwindowsystem/template
index 7b24aaa197ac..00ae6c415e12 100644
--- a/srcpkgs/kwindowsystem/template
+++ b/srcpkgs/kwindowsystem/template
@@ -1,6 +1,6 @@
 # Template file for 'kwindowsystem'
 pkgname=kwindowsystem
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwindowsystem"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b352b67752d17d67a4eb120c224b5b165af3b09f9ac5e1224909d278042704b2
+checksum=4753aaabb073b41dd8be79d454756ec616cc386f3be16f5503a77c84e12eaa86
 
 kwindowsystem-devel_package() {
 	short_desc+=" - development"

From c9ac32edd1cad1c62051bacb141ed1395b642fba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:56 +0200
Subject: [PATCH 0897/2024] kxmlgui: update to 5.81.0.

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

diff --git a/srcpkgs/kxmlgui/template b/srcpkgs/kxmlgui/template
index 8d43d3f35ed3..d70a1b72485b 100644
--- a/srcpkgs/kxmlgui/template
+++ b/srcpkgs/kxmlgui/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlgui'
 pkgname=kxmlgui
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kxmlgui"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=81af735b097231e4343e9d695dc4b8d80e64ab49a32d34c4bce1cd17c566b79d
+checksum=db232450286e515491059ee5017287ba4b610be0a194179e882af4c03e4e6ad0
 
 kxmlgui-devel_package() {
 	short_desc+=" - development"

From 39d2786719c1eda56ca8185b078db85648eaa626 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:46:59 +0200
Subject: [PATCH 0898/2024] kxmlrpcclient: update to 5.81.0.

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

diff --git a/srcpkgs/kxmlrpcclient/template b/srcpkgs/kxmlrpcclient/template
index 02b6a0686c99..b0246c669822 100644
--- a/srcpkgs/kxmlrpcclient/template
+++ b/srcpkgs/kxmlrpcclient/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlrpcclient'
 pkgname=kxmlrpcclient
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://invent.kde.org/frameworks/kxmlrpcclient"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=04122dcbd5fdc4ebaa3091750fc51e29a5dcb0dc7acbaf72ce6fe92ea7115a29
+checksum=0f8e5a6b331e306292763fa573e832a62e1c0ace911051b687d617dbb8e10397
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt

From 5553d38f59cffc8fb32a3e674a031ec523541bfd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:47:01 +0200
Subject: [PATCH 0899/2024] modemmanager-qt5: update to 5.81.0.

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

diff --git a/srcpkgs/modemmanager-qt5/template b/srcpkgs/modemmanager-qt5/template
index b312445f1851..9740a3b11394 100644
--- a/srcpkgs/modemmanager-qt5/template
+++ b/srcpkgs/modemmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'modemmanager-qt5'
 pkgname=modemmanager-qt5
-version=5.80.0
+version=5.81.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/modemmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=865aa36da3bca6657dc130313bfcc6030b6b2bac2993c0dfa3b02321448724e0
+checksum=060e62f99bf7786619a9b182f6f5a2191f173b2ad3a764e05152e39e80243907
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From 75dfae772be517b4ba8d4d2f56a1bae1c75fe121 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:47:03 +0200
Subject: [PATCH 0900/2024] networkmanager-qt5: update to 5.81.0.

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

diff --git a/srcpkgs/networkmanager-qt5/template b/srcpkgs/networkmanager-qt5/template
index b42fdefafb3f..a9f42dd23cc6 100644
--- a/srcpkgs/networkmanager-qt5/template
+++ b/srcpkgs/networkmanager-qt5/template
@@ -1,6 +1,6 @@
 # Template file for 'networkmanager-qt5'
 pkgname=networkmanager-qt5
-version=5.80.0
+version=5.81.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/networkmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=e0da7c2fcdc3f9d1250c8f0757267c5110ac3e38f70c26a736df9e4aacb0bff1
+checksum=2e8a6c1a78119d5ccd21e92a99ed55d3f866dccc2622e8c908c76793899246c8
 
 networkmanager-qt5-devel_package() {
 	short_desc+=" - development"

From f862e279b8a47ce5b6eaffa1aed40a60679df29e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:48:12 +0200
Subject: [PATCH 0901/2024] oxygen-icons5: update to 5.81.0.

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

diff --git a/srcpkgs/oxygen-icons5/template b/srcpkgs/oxygen-icons5/template
index ea26c4941341..a8d582b00d88 100644
--- a/srcpkgs/oxygen-icons5/template
+++ b/srcpkgs/oxygen-icons5/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen-icons5'
 pkgname=oxygen-icons5
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, LGPL-3.0-or-later"
 homepage="https://invent.kde.org/frameworks/oxygen-icons5"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=35a97955b45f35244ca0d30433f3ad1e9348e9083f91e42d0e0198b6474ab84e
+checksum=1f9a1b5fb676eeb71b9180d6a4703dc25ce872019231464ca0cd709759dc0fe8
 conflicts="oxygen-icons>=0"
 
 oxygen-icons_package() {

From 36b37c6ed8fc5f94bc2c987c093c560fa0a98aa0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:48:15 +0200
Subject: [PATCH 0902/2024] plasma-framework: update to 5.81.0.

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

diff --git a/srcpkgs/plasma-framework/template b/srcpkgs/plasma-framework/template
index 3ff14239726d..57747992d4e6 100644
--- a/srcpkgs/plasma-framework/template
+++ b/srcpkgs/plasma-framework/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-framework'
 pkgname=plasma-framework
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/plasma-framework"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d3af0f7628c6404c63ac871ffe7540fc6d12be2bf988503724c6bb00505893d9
+checksum=67037be91694620fa713a1cf3972f42f3ca798217c8c5915dcdaa9298651663c
 
 plasma-framework-devel_package() {
 	short_desc+=" - development"

From b92fbaa03c27a18c25257eb39c54b7223eb08f99 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:48:18 +0200
Subject: [PATCH 0903/2024] prison: update to 5.81.0.

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

diff --git a/srcpkgs/prison/template b/srcpkgs/prison/template
index 24d408da29bc..6b3c6fa22283 100644
--- a/srcpkgs/prison/template
+++ b/srcpkgs/prison/template
@@ -1,6 +1,6 @@
 # Template file for 'prison'
 pkgname=prison
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-tools doxygen qt5-declarative-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="MIT"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/prison-${version}.tar.xz"
-checksum=ff2eed5feff0a57e22eef9dcbf324435894ba76892a06e7087f1380438df9ab9
+checksum=cf13d796b99e2aa9f5d591f9936782ee891ff8b0cf487a5eca242f941ee439d7
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"

From 79440cb4eebff5a68a0898e6ffd6b329bdf4e9e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:48:20 +0200
Subject: [PATCH 0904/2024] purpose: update to 5.81.0.

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

diff --git a/srcpkgs/purpose/template b/srcpkgs/purpose/template
index 7beaa7a64fc4..1a4bc42f37e5 100644
--- a/srcpkgs/purpose/template
+++ b/srcpkgs/purpose/template
@@ -1,6 +1,6 @@
 # Template file for 'purpose'
 pkgname=purpose
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/purpose"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ad507573aa42e0223771679c92887ff309fa33e68f20820c98b5702617acfd80
+checksum=4e0a04c90c6e2d97a08158e80f486163d30abf156035214ed5e665e37be70805
 
 do_check() {
 	export QT_QPA_PLATFORM=offscreen

From 424ca80ff6723eb909ec61afe5ede235f9cc2c56 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:48:22 +0200
Subject: [PATCH 0905/2024] qqc2-desktop-style: update to 5.81.0.

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

diff --git a/srcpkgs/qqc2-desktop-style/template b/srcpkgs/qqc2-desktop-style/template
index 3317bdb40389..59ba3ccb4f2c 100644
--- a/srcpkgs/qqc2-desktop-style/template
+++ b/srcpkgs/qqc2-desktop-style/template
@@ -1,6 +1,6 @@
 # Template file for 'qqc2-desktop-style'
 pkgname=qqc2-desktop-style
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/qqc2-desktop-style"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=efb3ed865996100921b8dd7340d4f7dd1bc477381ce401cf36b8ed548d3dbe91
+checksum=a5cb7fcc4fa7bc87a66a2ef3df7d67568faf685e21b01d7db3dc99e80d9384a9
 
 qqc2-desktop-style-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From fb9c5a7d75ca644773d7f1524c9e089e5b0d7f1a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:48:25 +0200
Subject: [PATCH 0906/2024] sonnet: update to 5.81.0.

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

diff --git a/srcpkgs/sonnet/template b/srcpkgs/sonnet/template
index cff67af11bc7..661cd1376b02 100644
--- a/srcpkgs/sonnet/template
+++ b/srcpkgs/sonnet/template
@@ -1,6 +1,6 @@
 # Template file for 'sonnet'
 pkgname=sonnet
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/sonnet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b0d2eda96edc461319d48b05171457a3648217805f3481b893b8be65bc6b788e
+checksum=4a7c4e4d3da2df50004565c76ce0334697b941bd011be08fed7d91f96c37364e
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-tools-devel sonnet"

From 45393d2ddb7240474e57634f84aeeb41fe7e7d0e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:48:27 +0200
Subject: [PATCH 0907/2024] syndication: update to 5.81.0.

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

diff --git a/srcpkgs/syndication/template b/srcpkgs/syndication/template
index a31e5480c573..5b565eeb0daa 100644
--- a/srcpkgs/syndication/template
+++ b/srcpkgs/syndication/template
@@ -1,7 +1,7 @@
 # Template file for 'syndication'
 pkgname=syndication
 reverts="18.08.0_1 18.08.0_2 18.08.1_1"
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/syndication-${version}.tar.xz"
-checksum=10f2273b87e89f2ea73baee66a8b1cc993acea96d74be29f99ac631145f742c8
+checksum=76be770e0ba18fb6494b4de5b6928553b56495ac736d32c80818d0899a85adbb
 
 syndication-devel_package() {
 	short_desc+=" - development"

From a0b8d95e6875a79cedd75bd0664b814bc0acb283 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:48:31 +0200
Subject: [PATCH 0908/2024] syntax-highlighting: update to 5.81.0.

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

diff --git a/srcpkgs/syntax-highlighting/template b/srcpkgs/syntax-highlighting/template
index ed80a704ff27..b7a15a589afa 100644
--- a/srcpkgs/syntax-highlighting/template
+++ b/srcpkgs/syntax-highlighting/template
@@ -1,6 +1,6 @@
 # Template file for 'syntax-highlighting'
 pkgname=syntax-highlighting
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/syntax-highlighting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=91f458918613703468512b00690a02b617eb47be4df5ed7d9e3f1311b3b31218
+checksum=cb170316f447c7b0097a72b9690b17b1fb87cb578528c5c5e3bb4de411ff4a5d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools syntax-highlighting qt5-devel qt5-tools-devel"

From 54c140700df9b7cad5cd205ab3ec0d3af17039a1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 13:48:34 +0200
Subject: [PATCH 0909/2024] threadweaver: update to 5.81.0.

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

diff --git a/srcpkgs/threadweaver/template b/srcpkgs/threadweaver/template
index 2f7b6e7a09aa..0534f4d03712 100644
--- a/srcpkgs/threadweaver/template
+++ b/srcpkgs/threadweaver/template
@@ -1,6 +1,6 @@
 # Template file for 'threadweaver'
 pkgname=threadweaver
-version=5.80.0
+version=5.81.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/threadweaver"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6a3722a5c927eeaf8e9841fdcb513018ea41f384f41c25a1542cc52bdd43b5c8
+checksum=4e25142bf75212660d2b1c20293ff5d04aa8c6b51aef8e935231d7bde227bf0e
 
 threadweaver-devel_package() {
 	short_desc+=" - development"

From 6eeaf445b836b0c6fef178fcff5c8d2e05278e88 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 10 Apr 2021 20:35:32 +0200
Subject: [PATCH 0910/2024] sispmctl: update to 4.9.

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

diff --git a/srcpkgs/sispmctl/template b/srcpkgs/sispmctl/template
index e3aef58360f5..c8a6753b03b0 100644
--- a/srcpkgs/sispmctl/template
+++ b/srcpkgs/sispmctl/template
@@ -1,6 +1,6 @@
 # Template file for 'sispmctl'
 pkgname=sispmctl
-version=4.8
+version=4.9
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://sispmctl.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=0f8391f7e95cbf1fb96a68686a1dcf1e16747b050ae1b8ff90653c99976068db
+checksum=6a9ec7125e8c01bb45d4a3b56f07fb41fc437020c8dcd8c0f29ebb98dc55a647
 system_groups="sispmctl"
 
 post_install() {

From d272b6f3c7ea5ee03f3d7cc6aefa3d6fa1167df6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 10 Apr 2021 21:13:51 +0200
Subject: [PATCH 0911/2024] strip-nondeterminism: update to 1.11.0.

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

diff --git a/srcpkgs/strip-nondeterminism/template b/srcpkgs/strip-nondeterminism/template
index 6cd5094e8b0f..3d02ed349f83 100644
--- a/srcpkgs/strip-nondeterminism/template
+++ b/srcpkgs/strip-nondeterminism/template
@@ -1,6 +1,6 @@
 # Template file for 'strip-nondeterminism'
 pkgname=strip-nondeterminism
-version=1.9.0
+version=1.11.0
 revision=1
 build_style=perl-module
 hostmakedepends="perl-Archive-Zip perl-Sub-Override"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://reproducible-builds.org/tools/"
 distfiles="http://http.debian.net/debian/pool/main/s/${pkgname}/${pkgname}_${version}.orig.tar.bz2"
-checksum=467a1f11830e82c41b2f40c5f7a7f1c5579391a18170652ece581d83ba6d1242
+checksum=0774647828fe348a4f957a32fc0d8ab1749c013347bd6544147d059c208700d6
 
 post_install() {
 	# remove Debhelper add-on

From 6976a76202b0bcc052f83b6c71e99c05a5b58d5d Mon Sep 17 00:00:00 2001
From: Nicolo <nicolo@mabragor.physics.uu.se>
Date: Fri, 9 Apr 2021 17:58:40 +0200
Subject: [PATCH 0912/2024] thunderbird: update to 78.9.1.

Closes: #30112 [via git-merge-pr]
---
 srcpkgs/thunderbird/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index 78531a033701..001956952220 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n".
 #
 pkgname=thunderbird
-version=78.9.0
+version=78.9.1
 revision=1
 build_helper="rust"
 short_desc="Standalone Mail/News reader"
@@ -11,7 +11,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.thunderbird.net/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=8015a7f78b1644578f398b5ab670637c70890ab2bade35ba321d47d099ed3ac0
+checksum=6be0daf439ea5aeef0fd1619511cb1af4f1ba056823910475adc17e60069317d
 
 lib32disabled=yes
 

From 1918b244ea9ad58186cf93256d1b4f81890a2d4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sat, 10 Apr 2021 16:21:23 -0300
Subject: [PATCH 0913/2024] thunderbird-i18n: update to 78.9.1.

---
 srcpkgs/thunderbird-i18n/template | 112 +++++++++++++++---------------
 1 file changed, 56 insertions(+), 56 deletions(-)

diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template
index e00b1cb59577..bd4fc0c38f89 100644
--- a/srcpkgs/thunderbird-i18n/template
+++ b/srcpkgs/thunderbird-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'thunderbird-i18n'
 pkgname=thunderbird-i18n
-version=78.9.0
+version=78.9.1
 revision=1
 build_style=meta
 short_desc="Thunderbird language packs"
@@ -96,58 +96,58 @@ _pkgtmpl() {
 	}
 }
 
-checksum="63771cab0ed5fda4da901b6b6ecd2c88d87ddb9db019e0d5150e6a7111be6be3
- efd68277617e53282fbcb54bb63274d55c13211eac7340e6ba481d6b083604d3
- 9d9d566a8a71ce6bcbf7fdc4adf0d4e621bfcfffb792d582e86dbbd393f4eb4c
- 3edf831839f3d3a5ae3edce5578748cc6a73a2b3a4f413a10c32e7808eb4a242
- e2968ec5aabddb23249acb95a56f3f4c5068a3024f4a987cfcec29f46d1295df
- a254d31294909e4007811c8ab1f21f2814863765da71cf999332a04910b8cc1c
- 82a842c5d4fe297b1adfbed74fc8a63831b9507a4b1098db26f31a59d268dad0
- 295f9730a9c9baa4325b346c163cd0ee1e19bf589cba595c151f7a31311a43c0
- cb21492b06e6d4d7dc10f93e1a9c673297af7f010cbc6807245a776795d56486
- ed1ce2005e42d5796596863344913506f7423ca31bb0640167964b7c36395585
- 873a10bfc3f54c3240830eae45310f137823c0b83fb83dfc2098cc3a89acd802
- e87877e537c49be2ce03cf8a41d6776e8f861f1f9d90bc862224df18acfc52bb
- 8cdc746af4060d0260b1cf1c7efbd102ed4eabf57bdfb0e62167a39a08b526e1
- 39363f37a388c7b82df2d3cf868803682d8d6612a2b6557f1fdb9ae1466d4be7
- 48f51bb821ffe212f15e2065a6b3377cc33704f0a07a18b3deaa79d839bef89d
- 11c649466c6df3d2a62402711be46d74a02b668ec95de83f87e0675692b4633f
- 5e4cf5c5b24cfabe35971dec28e47c337749a3d382b43f7a2558deadc73a7864
- 1c49fe83d149bb1bbe4adce5f43bbf9e6bff1c6a917f898c029ce3fd46a7174c
- e3ed198a41f20b4168b23e29324eec3e5149de2cc454675f1a30d68baaa301c3
- b3fece3eaaccedcf28702e747307e11988eec65ef0cadccc0a01ea4092df8ac0
- fd8f4cec4dba5ba66f905c0428f01c9be9a2a20f8d3996828f54da6fff331028
- b6031ea780b0bf7b4f8c96aaf38d96dc686f0e2f3d58a4ec9918ad282f554c94
- e7f28b4333ea0d2db01af8496192769af1cf2666585bb463dc39d1ba1fd73345
- 2a80d9ca7e942c5eca5cbd8b82ca47901728f52c2de074fb9751c6c37fcb37ec
- 3dc2a28bf96db0d678457f86e46d7a24e683c38579c0b480f59c1eb9ef2573b9
- ff9079655352bdf9f5c1bb2e4e1596d1755300eda7e1670dbdb796a99223158a
- 71a1964cc36893f217a3c778a3fa17810843f830245241af27054ac1222a14e5
- 70b03fb570e5f3443d3be9970dd65fdd4fcd81bff4cd8319f028c0a4c8c166a8
- 78833bae90336e27256341a6b7ff1e53be9dd65447a1e71528ead725504f330d
- ac5276b4a13bb4a07c92160a6c3cbdb3d76bd622c49163eb0e82f84153259b5b
- c1f8180207e1abdbeaed39337c9bbf5d421eb2c85146646a888bd02e5de8c27e
- 800eb1b98bbb145a5bf22fa8a1e7cb8581371939655d61dcd642bba0de8250ba
- f39cb90898efc60c0f977f3f9abb94db5c1e18e2ace7317240784dc6382bccb3
- 496275439573f95f41a28d08d434ccea79e86d40f2a8321b47b98daa6dd3036c
- cc3229a2a009fcec836b2056ccbf50cdd4aba461517dad9a04331ae5f95a3a2f
- d20ff56ab68e53e3e4365247b564f6efc3c0cbdb301ff79ff9a80aae986c3b7d
- 998224c8e059afc068b004c0dd3887f85974a0af56b9d0ef0dad945e049db2b0
- fcf47de621e9f75729b1fa8c6c5f2135eb5b6d3dd78c8fae01acd6ad857604d2
- c7b3a6b7c0a59620e65877b3eaef92b2b2b7b4f5e7e152b7297db3d24a00b399
- 7fae97e71b183f55292feed9847a8d6141671d703e2af8aa1d64a71db2c377ec
- c8aa778fcf6c1c32b0038affadf540145cee44c9e59d278b55c4d1966ffa27d3
- 14065be7c50080586aa36cd43814dcabfae8572065cc3ec1ee8344e77cae9ce1
- af30877d15eecc65804528bbd4fde0897663526f4d25fdef00b4eaf84be8e580
- 925ea6a7f6e1a1fb17004cc7ab16bc0a307995541b9741264497f51d8a60679e
- 419b8bd06dd680b27b0843f5cf6af1b787695dc608136970a417ebafe3ae325a
- 7d9eb5e2bea78aa75dc345598e62ccc3efb37e64f21ec19a92920f826f486651
- e8e88cfad04351f1cc3ecb811011bcd964d6b4ef3a6a30f98e0f8a1363c93d37
- 1ca503db23e2648c4ebb40b117c652e0d8b95e4d07e843031db0530e00bfdd6f
- d02b1a07f824644e336a9e92a8342d58f5eaec903fa6b80067f3c650659b3756
- 7caf4222472434b465fca8f072a29503d38c143c1900b71bac7a607a7120d359
- 9a7c0186b6fca8e48ec3d0c94f0bfaeb73f378178799adc04c79164b300e575a
- abac946215c6a41be19aeacd271a2a2b2040bda87906d7e1c6f76ea19a35e507
- 5a3827a6f662950fdb001863ce8367d02fabe1c40d44500ee6b7019874119d23
- d1a1f0a30e037d65b667e1cff856a195c4747af4bf599f1bc8211347259fedf6
- dcdd87071b6b16eafb39d752119f60105d461dae5155c9b33d00bc3037a98dbe"
+checksum="4fddad63b7354b9c6db09428d3f73918d931768f61ae126596ae982ee00a6f9e
+ ea442b319837fec3bdbb80cec6ec5095f621caca9c784de70bdcf8a2523802cc
+ d93560c0870d361eb7088749dd88e1e61d1c68a4770b487863bb9dfaa770663a
+ c568bda96a224835ed6ac5acb0bfa997fa847fe2ef3d5cba8c3258b682d80019
+ e1494a55fa057d58d1709275a79a56af4e018f6210159bf8fa1baa1189b5f0e8
+ a6243eaaa5e06ee93f242c9d79959cee2b295fc281014de904d8baef2c27c33a
+ 5e2f59621dc5af683ad7f436c6838c304a6746956874b6089c25b4831c43a28c
+ 3855cac8661f5dc6567729418bbd398a1492b53f71e1af4ce5fa3984ad42a447
+ 3f9d4b4d23272213b3ff9640cf053c788907dcd0f780c03439871eb7529d48a7
+ 7e334735fce0bf7263b667a1d2003edab972aa83d2f8e7765865f01da28fd6c5
+ 138ab3c032ed48178c399c610648f7a5c44579bdee4021446771ac5cab86233f
+ 6493bde23c0909295c1e2d784ba317f294bccd3ee9c3a679e999c59bc02899c3
+ d579a1c125082e2dbe78cadbe0d0d45f12fff3ade7fe73ce652d23cc3a906dbf
+ 9cc6ee40f58a1f6bb8ca8cf965d4a558a2e3f8583474f06e61e34d00c5e342a7
+ 3ada2f1216617809b0b3330e6d825a65e2901f9a86bdfc0f41ca0545bd088e8a
+ 9bd2900ec74cb8dd306df64032546255d603c9b324de9d057c840b42ee1706bf
+ 1b11b00f7fc9380e414af33f62519ca0da1068ad446815768e169b2494e9c8da
+ 68f91ed0da57e4783240c500d2a19d3b5de3b21a5dab61444d29926698ebe793
+ c1033137d32c87848cdf85d4bf8acef36dfd85b20172f3bc448bed64280f9c6d
+ 02062b3925df8c511f313cb973f55c41e1585e6891c95013288d1715d24ddfb7
+ a1365e409d1eb897317a39c7513c1703e9fb93595d43a0820a579246381f1605
+ d1622c075e451eb5b87cd1ba9a19c0abc36289d99b33dfbba6831df7ce8b3f53
+ 3ac54f983ae0adc2395266f6a882ac56583c87ab3f6345257c507835c0c2d14e
+ a86188f64f643175d760bac1086b6b466a4a657425596cd79987a76ced42a8d9
+ 8a0cf55c1eff56cb5c6be354b96bab973c9852dcdb39446822c0eaa555b950ef
+ 4ef44068b021fd2cc15cae58bbda4ca86fdf3f7b2ffe23a86d32cc8040baead3
+ 09e81eeaa1ade640d7788fc927c58a0a290fbbc84f250e2e954e594c8466b528
+ dd5791a364b2bd4901d337ce58f4cacc4640acbb116d98d3b38ab13ac57bfc64
+ 3073815242bab5a49d6c9412f963e7fbeff8da1bc5f7655c66a093ee0459dff6
+ 5eb605f125548132cb9e9ce65682708423f31bbaf84767d87d0c743014004563
+ c85771a299ed01b440d8354d7220cd52f489d0a7364c5e1769b178adc27c3d17
+ adec1b156f39f7f2e0aa6a7fe19179734629077a7e7d387332bdc2cbd205ff40
+ b50c4d047c042194c8150b005f5e3666bebcc22fe7785ca79874ef3ef1a66380
+ 6ccecfd19cf3ba6dff2da883812bff303f0b36001d9ae2663dc3d2cb1fd87363
+ 15b2744ebbcb1c6b2a935821f3059265e79678fbe34a07dba2525c7a3a160eb6
+ 44069899ee9f6bf19e4b4a9cd63d83fc61c7f8a882f24ff34d5161a7dbf8ae15
+ 24986599a7cc2cf57d703b6d72c2aecad593dc08b2e0184770e7a283e6f7f7b8
+ 104f713c761beb7de9d7b5aa8be3dfad23f6864a5ba0f67823cd61e31979ef57
+ a4d5d0cc0cdad59f66b6d9f76029059e29619c838f022e322046ac210f963ac9
+ 4b1e917f5839f21a73e5595021c07573238df0212a984a5467adfd637cecd64c
+ f173d29ec6506635a622818b7e5cf2a11b0b7b5041daf555a930410f9d5cbf4b
+ 5699f89669e88c82a656488b4ad27d18beccb4db1a2293602d1e742628315a67
+ 842afff69b6fcac17e603a706b1d196aa3b4b875ff5139feb4c39324c2244563
+ de2499e4e04ed0bff3bc852f5e85baf60e4223d68cd323375d3df87f2828801d
+ 47cc9d5e63e5e99c066dba6bd1db440fbf6cd2885ed51af9bc021df892e4cdea
+ 89341fe50ff3655e7c41b8ad3097aaa745752f048739ac21652304e805491ac1
+ fc23e405ed4711c4b184f238e58b2be8705664e22038201deba674efd2315a15
+ b52ee3d71341f581b2b1b82764fb6d98e59bcd5d5564ad069b0f6220c82385dd
+ 29473e268c7a89302844a313f0ba1be93580a3aa5c11e78469fc1e73c6b14e50
+ 3d1f7950d66db5d01b3972ccee16056bc495866eff57b8c7434121d5fb54fa14
+ 59027c47928ccd0a326194dedffcffa2cdc1d73e9ee8d9e7edb87f9e0d8a4d37
+ cba44dee27d9a1bccbd23fcf46080e3e2e2d8b2e2bacd5414542f10824d9a969
+ de72ecf79efdd8fd97ead8af456fe02eee3725f5b41d96cb0c5c1e391a32e65a
+ 6f9d8cb48f7845874219c6cef403d037d52ef4f465e62494e53d43e640b7e1f7
+ 8c5e997ca6a2a512d3ad72424d0bed9d6e9adddacaed5151ad153529e28cb67e"

From 2516cc7146ebc2964c169010432bae2e5642d72c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 10 Apr 2021 17:39:54 +0300
Subject: [PATCH 0914/2024] ttyd: update to 1.6.3.

---
 .../patches/cmake-find-libwebsockets.patch    | 27 -------------------
 srcpkgs/ttyd/template                         |  6 ++---
 2 files changed, 3 insertions(+), 30 deletions(-)
 delete mode 100644 srcpkgs/ttyd/patches/cmake-find-libwebsockets.patch

diff --git a/srcpkgs/ttyd/patches/cmake-find-libwebsockets.patch b/srcpkgs/ttyd/patches/cmake-find-libwebsockets.patch
deleted file mode 100644
index 68816ea49a1c..000000000000
--- a/srcpkgs/ttyd/patches/cmake-find-libwebsockets.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-# make it link against libwebsockets dynamically
-
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -53,21 +53,9 @@
- 
- find_package(OpenSSL REQUIRED)
- find_package(ZLIB REQUIRED)
--find_package(Libwebsockets 1.7.0 QUIET)
--
--if(NOT Libwebsockets_FOUND) # for libwebsockets-dev on ubuntu 16.04
--    find_path(LIBWEBSOCKETS_INCLUDE_DIR NAMES libwebsockets.h)
--    find_library(LIBWEBSOCKETS_LIBRARY NAMES websockets)
--    find_package_handle_standard_args(Libwebsockets REQUIRED_VARS LIBWEBSOCKETS_LIBRARY LIBWEBSOCKETS_INCLUDE_DIR)
--    mark_as_advanced(LIBWEBSOCKETS_INCLUDE_DIR LIBWEBSOCKETS_LIBRARY)
--    if(Libwebsockets_FOUND)
--        SET(LIBWEBSOCKETS_INCLUDE_DIRS "${LIBWEBSOCKETS_INCLUDE_DIR}")
--        SET(LIBWEBSOCKETS_LIBRARIES "${LIBWEBSOCKETS_LIBRARY}")
--    endif()
--endif()
- 
- set(INCLUDE_DIRS ${OPENSSL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${LIBWEBSOCKETS_INCLUDE_DIRS} ${JSON-C_INCLUDE_DIRS} ${LIBUV_INCLUDE_DIRS})
--set(LINK_LIBS ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES} ${LIBWEBSOCKETS_LIBRARIES} ${JSON-C_LIBRARIES} ${LIBUV_LIBRARIES})
-+set(LINK_LIBS ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES} websockets ${JSON-C_LIBRARIES} ${LIBUV_LIBRARIES})
- 
- if(WIN32)
-     list(APPEND LINK_LIBS shell32)
diff --git a/srcpkgs/ttyd/template b/srcpkgs/ttyd/template
index e870724e1d9a..0ed4cb21f952 100644
--- a/srcpkgs/ttyd/template
+++ b/srcpkgs/ttyd/template
@@ -1,7 +1,7 @@
 # Template file for 'ttyd'
 pkgname=ttyd
-version=1.6.0
-revision=5
+version=1.6.3
+revision=1
 build_style=cmake
 hostmakedepends="pkg-config xxd"
 makedepends="libwebsockets-devel json-c-devel openssl-devel zlib-devel
@@ -11,7 +11,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="MIT"
 homepage="https://tsl0922.github.io/ttyd/"
 distfiles="https://github.com/tsl0922/ttyd/archive/${version}.tar.gz"
-checksum=d14740bc82be0d0760dd0a3c97acbcbde490412a4edc61edabe46d311b068f83
+checksum=1116419527edfe73717b71407fb6e06f46098fc8a8e6b0bb778c4c75dc9f64b9
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"

From 8a6b28c24c38fe460b768c68c200d6731227a091 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 10 Apr 2021 21:20:46 +0200
Subject: [PATCH 0915/2024] hiawatha: update to 10.12.

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

diff --git a/srcpkgs/hiawatha/template b/srcpkgs/hiawatha/template
index 7e50522c999b..04377f40b88b 100644
--- a/srcpkgs/hiawatha/template
+++ b/srcpkgs/hiawatha/template
@@ -1,6 +1,6 @@
 # Template file for 'hiawatha'
 pkgname=hiawatha
-version=10.11
+version=10.12
 revision=1
 build_style=cmake
 configure_args="-DLOG_DIR=/var/log/hiawatha -DPID_DIR=/run
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://hiawatha-webserver.org"
 distfiles="${homepage}/files/${pkgname}-${version}.tar.gz"
-checksum=79d85d165d68dd7043bbd337f5bc7dd10d8632d68ba61d0e557f84bd687c9727
+checksum=61bf41146c51244769984135529fcffd0f6cb92be18dc12d460effc42f19f50d
 conf_files="/etc/${pkgname}/*.conf /etc/${pkgname}/*.xslt"
 make_dirs="/var/log/hiawatha 0755 root root"
 

From 4d85433fc9d22e1453ede37246f4aaca75bf09f2 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 10 Apr 2021 21:58:02 +0200
Subject: [PATCH 0916/2024] bwm-ng: update to 0.6.3.

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

diff --git a/srcpkgs/bwm-ng/template b/srcpkgs/bwm-ng/template
index fef308bd29b9..da2098cbec20 100644
--- a/srcpkgs/bwm-ng/template
+++ b/srcpkgs/bwm-ng/template
@@ -1,6 +1,6 @@
 # Template file for 'bwm-ng'
 pkgname=bwm-ng
-version=0.6.2
+version=0.6.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake"
@@ -10,7 +10,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.gropp.org/?id=projects&sub=bwm-ng"
 distfiles="https://github.com/vgropp/bwm-ng/archive/v${version}.tar.gz"
-checksum=906a2d561f2ec9e0dd68b7f51b302908e99515ea1216d0ecaf14d873ef54ae70
+checksum=c1a552b6ff48ea3e4e10110a7c188861abc4750befc67c6caaba8eb3ecf67f46
 
 CFLAGS="-fgnu89-inline"
 

From ae752fe0536af2bd41e7394b9d1acd2ec52a7ac6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 10 Apr 2021 21:59:38 +0200
Subject: [PATCH 0917/2024] btrbk: update to 0.31.2.

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

diff --git a/srcpkgs/btrbk/template b/srcpkgs/btrbk/template
index 2f2d73653a8f..cad73834ecbc 100644
--- a/srcpkgs/btrbk/template
+++ b/srcpkgs/btrbk/template
@@ -1,6 +1,6 @@
 # Template file for 'btrbk'
 pkgname=btrbk
-version=0.31.1
+version=0.31.2
 revision=1
 build_style=gnu-makefile
 make_install_args="BINDIR=/usr/bin"
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
 homepage="http://digint.ch/btrbk"
 changelog=https://github.com/digint/btrbk/blob/master/ChangeLog
 distfiles="http://digint.ch/download/btrbk/releases/${pkgname}-${version}.tar.xz"
-checksum=ab461532d8f60ec794bddc8942e5a5bb055d92eb638b7b141134fe7d972b7a7a
+checksum=ec18ec934e7b6d22e3cf210b9d78c2961167aac0d31419de7b88d03fc8bfec80
 conf_files="/etc/btrbk/*"
 
 post_install() {

From bb0534e1aa32225fdc03bad15bfd509db72281d3 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sat, 10 Apr 2021 19:39:39 -0500
Subject: [PATCH 0918/2024] spotify: update to 1.1.56.

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

diff --git a/srcpkgs/spotify/template b/srcpkgs/spotify/template
index e6e75f86daa6..c978264e78b7 100644
--- a/srcpkgs/spotify/template
+++ b/srcpkgs/spotify/template
@@ -1,8 +1,8 @@
 # Template file for 'spotify'
 pkgname=spotify
-version=1.1.55
+version=1.1.56
 revision=1
-_ver="${version}.498.gf9a83c60_amd64"
+_ver="${version}.595.g2d2da0de_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=78b2364f050c2b02b05784710344e70109b288a2661f92de29f373a718e2ac24
+checksum=eee658c4ce875e4646c2ef617832a9dbb3ad09ba1b7aeeaaf3476b7b00b833d1
 _license_checksum=3c073aa5bd7ffaba3df5283cdd2d3b36a415bd824234693844548fc3e16027a5
 repository=nonfree
 restricted=yes

From 9c13c36a6acf0072cbdeebf4a94bccbad0f4b264 Mon Sep 17 00:00:00 2001
From: Mate GABRI <mate.gabri@playhq.com>
Date: Sun, 11 Apr 2021 08:59:41 +1000
Subject: [PATCH 0919/2024] kops: update to 1.20.0

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

diff --git a/srcpkgs/kops/template b/srcpkgs/kops/template
index 08bff1e80434..11aedb91559b 100644
--- a/srcpkgs/kops/template
+++ b/srcpkgs/kops/template
@@ -1,6 +1,6 @@
 # Template file for 'kops'
 pkgname=kops
-version=1.19.1
+version=1.20.0
 revision=1
 archs="x86_64*"
 build_wrksrc=src/k8s.io/kops

From 5628683e8fd6182a100d6dfed25c8f2b428bf56c Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Sat, 10 Apr 2021 17:24:34 +0200
Subject: [PATCH 0920/2024] vale: update to 2.10.2.

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

diff --git a/srcpkgs/vale/template b/srcpkgs/vale/template
index 387c8af6ed4d..b4d2377ac74c 100644
--- a/srcpkgs/vale/template
+++ b/srcpkgs/vale/template
@@ -1,16 +1,17 @@
 # Template file for 'vale'
 pkgname=vale
-version=2.6.7
+version=2.10.2
 revision=1
 build_style=go
 go_import_path="github.com/errata-ai/vale/v2"
+go_package="${go_import_path}/cmd/vale"
 go_ldflags=" -X main.version=${version}"
 short_desc="Natural language linter"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://docs.errata.ai/vale/about/"
 distfiles="https://github.com/errata-ai/vale/archive/v${version}.tar.gz"
-checksum=21a43c7122932d0914bd023ae412432aed3e0112473bf809b542dba3986ee4bd
+checksum=15300f1470981dd975af8f8f6db26c51d3e5a10bda73f6c267fc1cebef9a4205
 
 post_install() {
 	vlicense LICENSE

From a0aea2fdb1c878745a1b1cb15998e6def4f4038d Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Sat, 10 Apr 2021 22:17:33 +0200
Subject: [PATCH 0921/2024] pipe-viewer: update to 0.0.9.

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

diff --git a/srcpkgs/pipe-viewer/template b/srcpkgs/pipe-viewer/template
index 32991f6806bc..0ef7f35c9db0 100644
--- a/srcpkgs/pipe-viewer/template
+++ b/srcpkgs/pipe-viewer/template
@@ -1,11 +1,10 @@
 # Template file for 'pipe-viewer'
 pkgname=pipe-viewer
-version=0.0.7
+version=0.0.9
 revision=1
 build_style=perl-ModuleBuild
 configure_args="--gtk"
 hostmakedepends="perl-Module-Build"
-makedepends="perl"
 depends="perl-Data-Dump perl-JSON perl-LWP-Protocol-https perl-Term-ReadLine-Gnu
  perl-Unicode-LineBreak perl-JSON-XS"
 checkdepends="perl-Test-Pod"
@@ -15,7 +14,7 @@ license="Artistic-2.0"
 homepage="https://github.com/trizen/pipe-viewer"
 changelog="https://github.com/trizen/pipe-viewer/releases"
 distfiles="https://github.com/trizen/pipe-viewer/archive/${version}.tar.gz"
-checksum=5e1211ec963aa2a187bcb0983227c5667e6c580bfc9de93dcb582388cc1baf22
+checksum=598ec7c39be0a42900ed1f4c5c68c26a728dd09b774e9dd38a873aa2def76e27
 
 pipe-viewer-gtk_package() {
 	depends="${sourcepkg}>=${version}_${revision} perl-Gtk3 perl-File-ShareDir"

From 36f00affac8255551205f5e11a2e42022c7790c3 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 10 Apr 2021 22:20:01 +0200
Subject: [PATCH 0922/2024] x42-plugins: update to 20210409.

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

diff --git a/srcpkgs/x42-plugins/template b/srcpkgs/x42-plugins/template
index 76c74f6f7a32..432739cded19 100644
--- a/srcpkgs/x42-plugins/template
+++ b/srcpkgs/x42-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'x42-plugins'
 pkgname=x42-plugins
-version=20210408
+version=20210409
 revision=1
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ maintainer="tibequadorian <tibequadorian@posteo.de>"
 license="GPL-2.0-or-later"
 homepage="https://x42-plugins.com"
 distfiles="https://gareus.org/misc/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=cdc1d958581556ba56a6984fb8c1c66144e4c7447c11417824239fb2fa787fe4
+checksum=4423ea27ccc3f6e93a687d344a8ad5177b830d2bac25be8c36ae12ed0e3092e4
 
 pre_build() {
 	export OPTIMIZATIONS="-fomit-frame-pointer -O3 -fno-finite-math-only -DNDEBUG"

From 8ed2ec3b4a3733cff0b80d4a3618a2621fe1eb36 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 10 Apr 2021 21:50:05 +0200
Subject: [PATCH 0923/2024] glfw-wayland: update to 3.3.4.

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

diff --git a/srcpkgs/glfw-wayland/template b/srcpkgs/glfw-wayland/template
index ca283a9ddc7a..6f90d6bc7778 100644
--- a/srcpkgs/glfw-wayland/template
+++ b/srcpkgs/glfw-wayland/template
@@ -1,6 +1,6 @@
 # Template file for 'glfw-wayland'
 pkgname=glfw-wayland
-version=3.3.3
+version=3.3.4
 revision=1
 wrksrc=glfw-${version}
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="q66 <daniel@octaforge.org>"
 license="Zlib"
 homepage="http://www.glfw.org"
 distfiles="${SOURCEFORGE_SITE}/glfw/glfw-${version}.tar.bz2"
-checksum=2daed24366d729ea78a3aa0dfbc268a786ac43903f2990d8a215fab6b4dc154b
+checksum=035f4572d9b7967433b3256f0eaa5257532b0e18865878a162233b108b6ca1db
 provides="glfw-${version}_${revision}"
 replaces="glfw>=0"
 

From e00b8360ae636b88f3b53a1c67ed20f54df32969 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 10 Apr 2021 21:50:09 +0200
Subject: [PATCH 0924/2024] glfw: update to 3.3.4.

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

diff --git a/srcpkgs/glfw/template b/srcpkgs/glfw/template
index 9db52afc0e09..99feb63bca77 100644
--- a/srcpkgs/glfw/template
+++ b/srcpkgs/glfw/template
@@ -1,7 +1,7 @@
 # Template file for 'glfw'
 # update together with glfw-wayland
 pkgname=glfw
-version=3.3.3
+version=3.3.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
@@ -12,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Zlib"
 homepage="http://www.glfw.org"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=2daed24366d729ea78a3aa0dfbc268a786ac43903f2990d8a215fab6b4dc154b
+checksum=035f4572d9b7967433b3256f0eaa5257532b0e18865878a162233b108b6ca1db
 
 glfw-devel_package() {
 	depends="glfw>=${version}_${revision} $makedepends"

From 8a336bbc1d41e61a04145e9807f9ed143baa3e0b Mon Sep 17 00:00:00 2001
From: Manfred Usselmann <mu@usselmann.it>
Date: Sat, 10 Apr 2021 14:40:52 +0200
Subject: [PATCH 0925/2024] gnucash: update to 4.5

---
 srcpkgs/gnucash/patches/fixtest.patch | 17 -----------------
 srcpkgs/gnucash/template              |  6 +++---
 2 files changed, 3 insertions(+), 20 deletions(-)
 delete mode 100644 srcpkgs/gnucash/patches/fixtest.patch

diff --git a/srcpkgs/gnucash/patches/fixtest.patch b/srcpkgs/gnucash/patches/fixtest.patch
deleted file mode 100644
index 4404d99a534b..000000000000
--- a/srcpkgs/gnucash/patches/fixtest.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- libgnucash/engine/test/utest-Transaction.cpp
-+++ libgnucash/engine/test/utest-Transaction.cpp
-@@ -901,7 +901,6 @@ test_xaccTransEqual (Fixture *fixture, gconstpointer pData)
-    g_assert_cmpint (check->hits, ==, 10);
-    g_assert_cmpint (check2->hits, ==, 1);
-
--   g_free (check->msg);
-    g_free (check2->msg);
-    check2->msg = g_strdup_printf (
-                     "[xaccTransEqual] splits %s and %s differ", split_guid0, split_guid0);
-@@ -924,6 +923,7 @@ test_xaccTransEqual (Fixture *fixture, gconstpointer pData)
-        auto bal01 = gnc_numeric_to_string (split01->balance);
-        auto bal10 = gnc_numeric_to_string (split10->balance);
-        auto bal11 = gnc_numeric_to_string (split11->balance);
-+       g_free (check->msg);
-        check->msg = g_strdup_printf("[xaccSplitEqualCheckBal] balances differ: %s vs %s", bal10, bal00);
-        check3->msg = g_strdup_printf("[xaccSplitEqualCheckBal] balances differ: %s vs %s", bal11, bal01);
\ No newline at end of file
diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template
index 125b7100770d..fa8bd17d09ad 100644
--- a/srcpkgs/gnucash/template
+++ b/srcpkgs/gnucash/template
@@ -1,7 +1,7 @@
 # Template file for 'gnucash'
 pkgname=gnucash
-version=4.4
-revision=2
+version=4.5
+revision=1
 wrksrc="${pkgname}-${version%b}"
 build_style=cmake
 make_check_target=check
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnucash.org"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
 #distfiles="https://sources.voidlinux.org/gnucash-${version}/gnucash-${version}.tar.bz2"
-checksum=d91e0d126b461d71de1bc1b20d9cf142704353dec07d3e6599d138422759e67a
+checksum=bc1f48a8453488a2e9f6b83b68613aa55caebe4d2983460bdac7e084b46cffdc
 
 pycompile_dirs="usr/share/gnucash/python"
 conf_files="/etc/gnucash/environment"

From 2b9a6250cd6e23a5e7be0a269b99b5f1e17c5aa6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 7 Apr 2021 16:31:51 -0300
Subject: [PATCH 0926/2024] intel-gmmlib: add comment about -march used in
 compiler flags.

Reported by sgn
Suggestion for "fix" by tornaria
Closes #29801
---
 srcpkgs/intel-gmmlib/template | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/srcpkgs/intel-gmmlib/template b/srcpkgs/intel-gmmlib/template
index de10b7059d95..ad6ba012fa90 100644
--- a/srcpkgs/intel-gmmlib/template
+++ b/srcpkgs/intel-gmmlib/template
@@ -5,6 +5,14 @@ revision=1
 archs="i686* x86_64*"
 wrksrc=gmmlib-intel-gmmlib-${version}
 build_style=cmake
+# We could add -DGMMLIB_ARCH=generic to make it use -march=generic
+# instead of their default of 'corei7', but it isn't necessary:
+# the baseline of CPUs supported by gmmlib all fit under 'corei7'.
+# They also add many '-msse*' flags, but they are all supported
+# as well. Since this library isn't a dependency for anything but
+# intel-media-driver, which is wholly optional and installed only on
+# systems with supported CPUs, it doesn't make sense to change the
+# compilers flag in use.
 configure_args="-Wno-dev"
 short_desc="Intel Graphics Memory Management Library"
 maintainer="Stefano Ragni <st3r4g@protonmail.com>"

From b06b06502cf03fa35147abea143a83ee5a9f34ee Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 09:14:43 -0700
Subject: [PATCH 0927/2024] daemonize: fix license

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

diff --git a/srcpkgs/daemonize/template b/srcpkgs/daemonize/template
index 70dd249d23df..05ec75cda058 100644
--- a/srcpkgs/daemonize/template
+++ b/srcpkgs/daemonize/template
@@ -1,16 +1,16 @@
 # Template file for 'daemonize'
 pkgname=daemonize
 version=1.7.8
-revision=1
+revision=2
+wrksrc="$pkgname-release-$version"
 build_style=gnu-configure
 make_install_args="INSTALL_SBIN=/usr/bin"
 short_desc="Run a program as a Unix daemon"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="BSD, MIT, Public Domain"
+license="BSD-3-Clause, MIT, Public Domain"
 homepage="http://software.clapper.org/daemonize/daemonize.html"
 distfiles="https://github.com/bmc/$pkgname/archive/release-$version.tar.gz"
 checksum=20c4fc9925371d1ddf1b57947f8fb93e2036eb9ccc3b43a1e3678ea8471c4c60
-wrksrc="$pkgname-release-$version"
 
 post_extract() {
 	sed -i '/CC.*-o/s/$/ $(LDFLAGS)/' Makefile.in

From 4d715da465b2b66d7c43d4fd320352bc3bc9d648 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 10:30:36 -0700
Subject: [PATCH 0928/2024] darkice: fix license

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

diff --git a/srcpkgs/darkice/template b/srcpkgs/darkice/template
index b86b883060a8..b61c6d8c7f8a 100644
--- a/srcpkgs/darkice/template
+++ b/srcpkgs/darkice/template
@@ -1,7 +1,7 @@
 # Template file for 'darkice'
 pkgname=darkice
 version=1.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="
  --with-lame-prefix=${XBPS_CROSS_BASE}/usr
@@ -15,9 +15,9 @@ hostmakedepends="pkg-config"
 makedepends="lame-devel libogg-devel libvorbis-devel faac-devel
  alsa-lib-devel pulseaudio-devel jack-devel libsamplerate-devel"
 conf_files="/etc/darkice.cfg"
-short_desc="A live audio streamer source client for icecast"
+short_desc="Live audio streamer source client for icecast"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="http://www.darkice.org"
 distfiles="${SOURCEFORGE_SITE}/project/darkice/darkice/${version}/darkice-${version}.tar.gz"
 checksum=2c0d0faaa627c0273b2ce8b38775a73ef97e34ef866862a398f660ad8f6e9de6

From 3f14c89c4b34b4027ef0f2288e9bfc36ff7c15bf Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 12:18:46 -0700
Subject: [PATCH 0929/2024] dcfldd: fix license, use vsed

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

diff --git a/srcpkgs/dcfldd/template b/srcpkgs/dcfldd/template
index 60df0c6b4017..6a935d979d76 100644
--- a/srcpkgs/dcfldd/template
+++ b/srcpkgs/dcfldd/template
@@ -1,16 +1,16 @@
 # Template file for 'dcfldd'
 pkgname=dcfldd
 version=1.3.4r1
-revision=2
+revision=3
 wrksrc="${pkgname}-${version/r/-}"
 build_style=gnu-configure
 short_desc="Fork of dd with hashing, status, wipe and verify"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://dcfldd.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version/r/-}.tar.gz"
 checksum=f5143a184da56fd5ac729d6d8cbcf9f5da8e1cf4604aa9fb97c59553b7e6d5f8
 
 post_extract() {
-	sed -i 's/__linux__/__GLIBC__/' util.c   # disable obscure workaround
+	vsed -i 's/__linux__/__GLIBC__/' util.c   # disable obscure workaround
 }

From 3e5f2188d9cc424c982249a56135324865d5de6c Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 12:21:26 -0700
Subject: [PATCH 0930/2024] dfc: fix license

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

diff --git a/srcpkgs/dfc/template b/srcpkgs/dfc/template
index 8e29452f84a4..3b351375dcd0 100644
--- a/srcpkgs/dfc/template
+++ b/srcpkgs/dfc/template
@@ -1,13 +1,13 @@
 # Template file for 'dfc'
 pkgname=dfc
 version=3.1.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DXDG_CONFIG_DIR=/etc/xdg"
 hostmakedepends="gettext"
 short_desc="Display file system space usage using graphs and colors"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="3-clause-BSD"
+license="BSD-3-Clause"
 homepage="http://projects.gw-computing.net/projects/dfc"
 distfiles="https://github.com/Rolinh/dfc/archive/v${version}.tar.gz"
 checksum=cea18fab1f053eddc359530816712edd1f497c556035a7c4d63ac87a4abc4b28

From f50c8dd6c2254ea74de1f690a1a5d07d734799ce Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 12:22:43 -0700
Subject: [PATCH 0931/2024] dfu-programmer: fix license

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

diff --git a/srcpkgs/dfu-programmer/template b/srcpkgs/dfu-programmer/template
index 7556fe631a10..d3fca448e6bf 100644
--- a/srcpkgs/dfu-programmer/template
+++ b/srcpkgs/dfu-programmer/template
@@ -1,17 +1,17 @@
 # Template file for 'dfu-programmer'
 pkgname=dfu-programmer
 version=0.7.2
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--includedir=${XBPS_CROSS_BASE}/usr/include"
 hostmakedepends="automake"
 makedepends="libusb-devel"
 short_desc="Device Firmware Upgrade class USB driver and flasher"
 maintainer="Matt Carroll <oholiab@gmail.com>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://dfu-programmer.github.io"
 distfiles="${SOURCEFORGE_SITE}/dfu-programmer/dfu-programmer/${version}/dfu-programmer-${version}.tar.gz"
 checksum=1db4d36b1aedab2adc976e8faa5495df3cf82dc4bf883633dc6ba71f7c4af995
-configure_args="--includedir=${XBPS_CROSS_BASE}/usr/include"
 
 pre_configure() {
 	./bootstrap.sh

From 4edb37d4c3486edf50316c5dc0128c2c86cc6c46 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 13:55:59 -0700
Subject: [PATCH 0932/2024] dgen-sdl: fix licenses

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

diff --git a/srcpkgs/dgen-sdl/template b/srcpkgs/dgen-sdl/template
index 52bc28e21688..d32ca6d23948 100644
--- a/srcpkgs/dgen-sdl/template
+++ b/srcpkgs/dgen-sdl/template
@@ -1,13 +1,13 @@
 # Template file for 'dgen-sdl'
 pkgname=dgen-sdl
 version=1.33
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config nasm"
 makedepends="SDL-devel libarchive-devel"
 short_desc="Multi-platform Genesis/Mega Drive Emulator"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD, GPL-2, LGPL-2.1"
+license="BSD-3-Clause, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://dgen.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/dgen/${pkgname}-${version}.tar.gz"
 checksum=99e2c06017c22873c77f88186ebcc09867244eb6e042c763bb094b02b8def61e

From 1c49d354664f1cb7530b0bc762a88c963b1cdc1e Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 14:00:13 -0700
Subject: [PATCH 0933/2024] dhcp-helper: fix license

As there isn't a GPL v2.1 nor a GPL v4, I'm making the assumption that
GPL-2-only OR GPL-3-only is a wordy way of sauing GPL-2-or-later.
---
 srcpkgs/dhcp-helper/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dhcp-helper/template b/srcpkgs/dhcp-helper/template
index bf5e2641e050..bf2672d010d3 100644
--- a/srcpkgs/dhcp-helper/template
+++ b/srcpkgs/dhcp-helper/template
@@ -1,14 +1,14 @@
 # Template file for 'dhcp-helper'
 pkgname=dhcp-helper
 version=1.2
-revision=1
+revision=2
 _srcver=1
 build_style=gnu-makefile
 make_build_args="version=$version"
 make_install_args="BINDIR=/usr/bin MANDIR=/usr/share/man"
 short_desc="Simple, straightforward DHCP relay agent"
 maintainer="fosslinux <fosslinux@aussies.space>"
-license="GPL-2.0-only OR GPL-3.0-only"
+license="GPL-2.0-or-later"
 homepage="http://www.thekelleys.org.uk/dhcp-helper/"
 distfiles="${DEBIAN_SITE}/main/d/dhcp-helper/dhcp-helper_${version}-${_srcver}.tar.gz"
 checksum=d11647e4af1f8b25fb854b6f444fec66910d7446d97de918eff5b8a284397e49

From 95efdde22ff33fd746c5962f6f0651a7818a827d Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 14:10:59 -0700
Subject: [PATCH 0934/2024] dhcping: fix license

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

diff --git a/srcpkgs/dhcping/template b/srcpkgs/dhcping/template
index 201c54bde415..e7fc06965a8c 100644
--- a/srcpkgs/dhcping/template
+++ b/srcpkgs/dhcping/template
@@ -1,11 +1,15 @@
 # Template file for 'dhcping'
 pkgname=dhcping
 version=1.2
-revision=2
+revision=3
 build_style=gnu-configure
+short_desc="Small tool to test availability of a dhcp-server"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="2-clause-BSD"
+license="BSD-2-Clause"
 homepage="http://www.mavetju.org/unix/general.php"
-short_desc="A small tool letting you perform a dhcp-request to find out if a dhcp-server is still running"
 distfiles="http://www.mavetju.org/download/${pkgname}-${version}.tar.gz"
 checksum=32ef86959b0bdce4b33d4b2b216eee7148f7de7037ced81b2116210bc7d3646a
+
+post_install() {
+	vlicense LICENSE
+}

From f60fb0fec57d8bf6f2298d8bd74ed81dc584b503 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 14:16:50 -0700
Subject: [PATCH 0935/2024] diction: fix license

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

diff --git a/srcpkgs/diction/template b/srcpkgs/diction/template
index 0a141dffb580..4beee8c9564a 100644
--- a/srcpkgs/diction/template
+++ b/srcpkgs/diction/template
@@ -1,11 +1,11 @@
 # Template file for 'diction'
 pkgname=diction
 version=1.11
-revision=1
+revision=2
 build_style=gnu-configure
 short_desc="Writing style checkers, diction and style"
 maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/diction/diction.html"
 distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.gz"
 checksum=35c2f1bf8ddf0d5fa9f737ffc8e55230736e5d850ff40b57fdf5ef1d7aa024f6

From 891dd1d7ed2f08cf4943212d4cda02c449d66a94 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 14:19:00 -0700
Subject: [PATCH 0936/2024] diff-pdf: fix license

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

diff --git a/srcpkgs/diff-pdf/template b/srcpkgs/diff-pdf/template
index 520c2c24e8ba..d58932a4a0df 100644
--- a/srcpkgs/diff-pdf/template
+++ b/srcpkgs/diff-pdf/template
@@ -1,14 +1,14 @@
 # Template file for 'diff-pdf'
 pkgname=diff-pdf
 version=0.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-wx-config=wx-config-gtk3"
 hostmakedepends="automake pkg-config"
 makedepends="wxWidgets-gtk3-devel cairo-devel poppler-devel poppler-glib-devel"
-short_desc="A simple tool for visually comparing two PDF files"
+short_desc="Simple tool for visually comparing two PDF files"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://vslavik.github.io/diff-pdf/"
 distfiles="https://github.com/vslavik/diff-pdf/archive/v$version.tar.gz"
 checksum=0648a8c07127dbf3eed4b0856d1042987b9da9a96dc86ebee62e988af13e4475

From 12a0a2d6ac08c9c5b8919a4b0446678b9ce57906 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 14:44:59 -0700
Subject: [PATCH 0937/2024] dnstracer: fix license

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

diff --git a/srcpkgs/dnstracer/template b/srcpkgs/dnstracer/template
index f71827d3d792..eb5c5baa2321 100644
--- a/srcpkgs/dnstracer/template
+++ b/srcpkgs/dnstracer/template
@@ -1,13 +1,13 @@
 # Template file for 'dnstracer'
 pkgname=dnstracer
 version=1.10
-revision=1
+revision=2
 wrksrc="$pkgname"
 build_style=gnu-makefile
 hostmakedepends="perl"
 short_desc="Trace a chain of DNS servers to the source"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
-license="BSD"
+license="BSD-2-Clause"
 homepage="http://www.mavetju.org/unix/dnstracer.php"
 distfiles="http://www.mavetju.org/download/dnstracer-${version}.tar.bz2"
 checksum=64cda0ed15ef598a38ec72a96a356e3d10b7f822fc75928115eae96a65ae2b21

From 730107032df05265b228b0e240b83b94ec26b141 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 14:51:38 -0700
Subject: [PATCH 0938/2024] docker-gc: fix license

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

diff --git a/srcpkgs/docker-gc/template b/srcpkgs/docker-gc/template
index 87d828eecf8d..d8e39ff15fc1 100644
--- a/srcpkgs/docker-gc/template
+++ b/srcpkgs/docker-gc/template
@@ -1,13 +1,13 @@
 # Template file for 'docker-gc'
 pkgname=docker-gc
 version=0.0.20170125
-revision=1
+revision=2
 _commit=f460c1d2d50b652e156ffe68489362bedc9278a5
 wrksrc="$pkgname-$_commit"
 depends="docker"
 short_desc="Docker garbage collection of containers and images"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="GPL-3"
+license="Apache-2.0"
 homepage="https://github.com/spotify/docker-gc"
 distfiles="$homepage/archive/$_commit.tar.gz"
 checksum=82ebc5eab842b41282c10e5cf1a82af521e4aa46e6d0fb9bddb2565cef5984a2

From 847003b0e6ba89d2b02d08fdc8e1be60c9a70b4a Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 14:56:56 -0700
Subject: [PATCH 0939/2024] dssi: fix license

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

diff --git a/srcpkgs/dssi/template b/srcpkgs/dssi/template
index fac019b9f57b..0a53d93ea421 100644
--- a/srcpkgs/dssi/template
+++ b/srcpkgs/dssi/template
@@ -1,7 +1,7 @@
 # Template file for 'dssi'
 pkgname=dssi
 version=1.1.1
-revision=8
+revision=9
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="
@@ -9,7 +9,7 @@ makedepends="
  ladspa-sdk libSM-devel libX11-devel"
 short_desc="API for audio processing plugins"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
+license="LGPL-2.1-or-later"
 homepage="http://dssi.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=f2c82b073a947c8255284249097667f9b14e660bf86186f3fcd3b3b3e087814e

From 494862e03be95b73c8de4f918bcc446541c446cd Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 14:58:04 -0700
Subject: [PATCH 0940/2024] dtach: fix license

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

diff --git a/srcpkgs/dtach/template b/srcpkgs/dtach/template
index f1a0fe3fd865..09fdd2505cdb 100644
--- a/srcpkgs/dtach/template
+++ b/srcpkgs/dtach/template
@@ -1,12 +1,12 @@
 # Template file for 'dtach'
 pkgname=dtach
 version=0.9
-revision=1
+revision=2
 build_style=gnu-configure
 short_desc="Tiny program that emulates the detach feature of GNU screen"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
 homepage="http://dtach.sourceforge.net/"
-license="GPL-2"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 checksum=32e9fd6923c553c443fab4ec9c1f95d83fa47b771e6e1dafb018c567291492f3
 

From 4fbddff85e5b5db8a9a087498adf6da53ce096d2 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 14:59:24 -0700
Subject: [PATCH 0941/2024] dumpet: fix license

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

diff --git a/srcpkgs/dumpet/template b/srcpkgs/dumpet/template
index bb6a7713afe6..35204d8aa5e2 100644
--- a/srcpkgs/dumpet/template
+++ b/srcpkgs/dumpet/template
@@ -1,13 +1,13 @@
 # Template file for 'dumpet'
 pkgname=dumpet
 version=2.1
-revision=4
+revision=5
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
 makedepends="popt-devel libxml2-devel"
 short_desc="Tool to dump and debug bootable CD-like images"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://tracker.debian.org/pkg/dumpet"
 distfiles="http://http.debian.net/debian/pool/main/d/dumpet/dumpet_${version}.orig.tar.bz2"
 checksum=2cc1fa3a1b06f885e4524d1be80bdacc5b6a55057d0577262f2f5186b49a4da3

From d188944e16d9ffb6cb104dddd6ed596c69e8b865 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 15:27:59 -0700
Subject: [PATCH 0942/2024] dvd+rw-tools: fix license and description

Closes: #29837 [via git-merge-pr]
---
 srcpkgs/dvd+rw-tools/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dvd+rw-tools/template b/srcpkgs/dvd+rw-tools/template
index 5388e15692c9..b3c996b8fc2f 100644
--- a/srcpkgs/dvd+rw-tools/template
+++ b/srcpkgs/dvd+rw-tools/template
@@ -1,12 +1,12 @@
 # Template file for 'dvd+rw-tools'
 pkgname=dvd+rw-tools
 version=7.1
-revision=4
+revision=5
 build_style=gnu-makefile
 hostmakedepends="m4"
-short_desc="A set of tools for DVD+RW/-RW drives"
+short_desc="Tools for DVD+RW/-RW drives"
 maintainer="Duncaen <mail@duncano.de>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://fy.chalmers.se/~appro/linux/DVD+RW/"
 distfiles="http://fy.chalmers.se/~appro/linux/DVD+RW/tools/${pkgname}-${version}.tar.gz"
 checksum=f8d60f822e914128bcbc5f64fbe3ed131cbff9045dca7e12c5b77b26edde72ca

From dcab2ec05c1bb49505507891229eca6c1b033d89 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 14:42:58 -0700
Subject: [PATCH 0943/2024] dmraid: fix license, xlint

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

diff --git a/srcpkgs/dmraid/template b/srcpkgs/dmraid/template
index 7fccd9201546..420749bc8aa6 100644
--- a/srcpkgs/dmraid/template
+++ b/srcpkgs/dmraid/template
@@ -3,20 +3,20 @@ pkgname=dmraid
 _distver=1.0.0.rc16
 _patchver=3
 version="${_distver}.${_patchver}"
-revision=11
+revision=12
 wrksrc="${pkgname}"
 build_wrksrc="${_distver}-${_patchver}/${pkgname}"
 build_style=gnu-configure
 configure_args="--enable-led --enable-intel_led --enable-shared_lib"
 makedepends="device-mapper-devel"
-lib32disabled=yes
-disable_parallel_build="yes"
 short_desc="Device mapper RAID interface"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2, LGPL-2.1"
+license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://people.redhat.com/~heinzm/sw/dmraid/"
 distfiles="${homepage}/src/dmraid-${_distver}-${_patchver}.tar.bz2"
 checksum=93421bd169d71ff5e7d2db95b62b030bfa205a12010b6468dcdef80337d6fbd8
+disable_parallel_build=yes
+lib32disabled=yes
 
 dmraid-devel_package() {
 	short_desc+=" - development files"

From 430076fe03ccb2eedc0cb109506ac7307be3d597 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Mon, 22 Mar 2021 22:49:03 +0100
Subject: [PATCH 0944/2024] New package: pulseeffects-legacy-4.8.5

pulseeffects-legacy is a version of pulseeffects before 5.0.0 which still supports pulseaudio
---
 srcpkgs/pulseeffects-legacy/template | 21 +++++++++++++++++++++
 srcpkgs/pulseeffects-legacy/update   |  1 +
 2 files changed, 22 insertions(+)
 create mode 100644 srcpkgs/pulseeffects-legacy/template
 create mode 100644 srcpkgs/pulseeffects-legacy/update

diff --git a/srcpkgs/pulseeffects-legacy/template b/srcpkgs/pulseeffects-legacy/template
new file mode 100644
index 000000000000..c38c8ef2d9ef
--- /dev/null
+++ b/srcpkgs/pulseeffects-legacy/template
@@ -0,0 +1,21 @@
+# Template file for 'pulseeffects-legacy'
+pkgname=pulseeffects-legacy
+version=4.8.5
+revision=1
+wrksrc="pulseeffects-${version}"
+build_style=meson
+hostmakedepends="itstool pkg-config gettext"
+makedepends="boost-devel glib-devel gsettings-desktop-schemas-devel
+ gst-plugins-bad1-devel gtkmm-devel libebur128-devel lilv-devel
+ pulseaudio-devel python3-gobject-devel sratom-devel
+ libsndfile-devel"
+depends="calf gsettings-desktop-schemas gst-plugins-bad1
+ gst-plugins-good1 pulseaudio python3-gobject python3-scipy"
+short_desc="Sound effects for systems using PulseAudio (legacy)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/wwmm/pulseeffects"
+distfiles="https://github.com/wwmm/pulseeffects/archive/v${version}.tar.gz"
+checksum=df1c4c4a9811c62a549822dacde3a9e36233ba3ec58817ae52a236f6181a507c
+python_version=3
+conflicts="pulseeffects"
diff --git a/srcpkgs/pulseeffects-legacy/update b/srcpkgs/pulseeffects-legacy/update
new file mode 100644
index 000000000000..2638b2b10b6e
--- /dev/null
+++ b/srcpkgs/pulseeffects-legacy/update
@@ -0,0 +1 @@
+ignore="5.*"

From 12ce1e7f32a809ba337191804800ec86bc6a539d Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Sat, 20 Mar 2021 23:54:16 +0100
Subject: [PATCH 0945/2024] pulseeffects: update to 5.0.3

Closes: #29638 [via git-merge-pr]
---
 srcpkgs/pulseeffects/INSTALL.msg |  2 ++
 srcpkgs/pulseeffects/template    | 15 ++++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)
 create mode 100644 srcpkgs/pulseeffects/INSTALL.msg

diff --git a/srcpkgs/pulseeffects/INSTALL.msg b/srcpkgs/pulseeffects/INSTALL.msg
new file mode 100644
index 000000000000..74c17ca2a8c5
--- /dev/null
+++ b/srcpkgs/pulseeffects/INSTALL.msg
@@ -0,0 +1,2 @@
+PulseEffects version 5 and later only support PipeWire and drop support for PulseAudio.
+If you want to use PulseEffects with PulseAudio, install pulseeffects-legacy instead.
diff --git a/srcpkgs/pulseeffects/template b/srcpkgs/pulseeffects/template
index a06f3042d97f..3b94e3dc873b 100644
--- a/srcpkgs/pulseeffects/template
+++ b/srcpkgs/pulseeffects/template
@@ -1,19 +1,20 @@
 # Template file for 'pulseeffects'
 pkgname=pulseeffects
-version=4.8.4
+version=5.0.3
 revision=1
 build_style=meson
 hostmakedepends="itstool pkg-config gettext"
 makedepends="boost-devel glib-devel gsettings-desktop-schemas-devel
  gst-plugins-bad1-devel gtkmm-devel libebur128-devel lilv-devel
- pulseaudio-devel python3-gobject-devel sratom-devel
- libsndfile-devel"
+ pipewire-devel python3-gobject-devel sratom-devel zita-convolver-devel
+ libsndfile-devel libbs2b-devel"
 depends="calf gsettings-desktop-schemas gst-plugins-bad1
- gst-plugins-good1 pulseaudio python3-gobject python3-scipy"
-short_desc="Sound effects for Pulseaudio applications"
+ gst-plugins-good1 pipewire python3-gobject python3-scipy zita-convolver
+ gstreamer1-pipewire"
+short_desc="Sound effects for systems using PipeWire"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/wwmm/pulseeffects"
-distfiles="https://github.com/wwmm/pulseeffects/archive/${version}.tar.gz"
-checksum=12ba3205025d815a747b58636861594f7d1e43a578a5b0411f7794f4c12e5d86
+distfiles="https://github.com/wwmm/pulseeffects/archive/v${version}.tar.gz"
+checksum=2e14858918b54bee5f6e4898cc803ae2170b4d624407fef39e0831b6584c4a4f
 python_version=3

From d6be6db7f4985e6649fc5e53703be90252dda90f Mon Sep 17 00:00:00 2001
From: Karol Kosek <krkk@krkk.ct8.pl>
Date: Sat, 10 Apr 2021 11:47:47 +0200
Subject: [PATCH 0946/2024] libheif: enable avif and heif encoding

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

diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index 64518027febf..5a7af30c347d 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,11 +1,12 @@
 # Template file for 'libheif'
 pkgname=libheif
 version=1.11.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-option-checking"
 hostmakedepends="automake autoconf pkg-config libtool"
-makedepends="libjpeg-turbo-devel libpng-devel libde265-devel"
+makedepends="libjpeg-turbo-devel libpng-devel libde265-devel x265-devel
+ libaom-devel"
 short_desc="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="LGPL-3.0-or-later"
@@ -19,7 +20,7 @@ pre_configure() {
 
 libheif-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision} libde265-devel"
+	depends="${sourcepkg}>=${version}_${revision} libde265-devel x265-devel libaom-devel"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"

From 255682f2fe38f0d752f45fb20209f68073868246 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Fri, 9 Apr 2021 16:24:06 -0500
Subject: [PATCH 0947/2024] gns3-server: update to 2.2.20.

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

diff --git a/srcpkgs/gns3-server/template b/srcpkgs/gns3-server/template
index 97b3922b3335..5d1569f3255b 100644
--- a/srcpkgs/gns3-server/template
+++ b/srcpkgs/gns3-server/template
@@ -1,6 +1,6 @@
 # Template file for 'gns3-server'
 pkgname=gns3-server
-version=2.2.19
+version=2.2.20
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,17 +13,15 @@ maintainer="Tim Sandquist <tim.sandquist@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gns3.com"
 distfiles="https://github.com/GNS3/gns3-server/archive/v${version}.tar.gz"
-checksum=@d40618d1a623acd27733e9f172a57827eb46d7a25d18d49d7f6a3b77f98296e0
+checksum=@a7e068fd48b985acdfef111258c066c75e6d48a07bdb5b19af785ae3be607bf0
 make_check=no
 
 post_patch() {
 	# relax requirements
 	vsed -e 's|aiofiles.*|aiofiles>=0.4.0|' \
-		-e 's|aiohttp-cors.*|aiohttp-cors>=0.7.0|' \
-		-e 's|aiohttp=.*|aiohttp>=3.6.2|' \
+		-e 's|aiohttp=.*|aiohttp>=3.7.4|' \
 		-e 's|jsonschema.*|jsonschema>=2.6.0|' \
-		-e 's|psutil.*|psutil>=5.6.7|' \
-		-e 's|py-cpuinfo.*|py-cpuinfo>=5.0.0|' -i requirements.txt
+		-e 's|py-cpuinfo.*|py-cpuinfo>=5.8.0|' -i requirements.txt
 }
 post_install() {
 	# remove tests directory polluting site-packages

From 972349a7c61af662e83c84254a44a3209c6736ec Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Fri, 9 Apr 2021 16:24:00 -0500
Subject: [PATCH 0948/2024] gns3-gui: update to 2.2.20.

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

diff --git a/srcpkgs/gns3-gui/template b/srcpkgs/gns3-gui/template
index db049f1065a4..c50b2880a7aa 100644
--- a/srcpkgs/gns3-gui/template
+++ b/srcpkgs/gns3-gui/template
@@ -1,6 +1,6 @@
 # Template file for 'gns3-gui'
 pkgname=gns3-gui
-version=2.2.19
+version=2.2.20
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,12 +13,11 @@ maintainer="Tim Sandquist <tim.sandquist@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gns3.com"
 distfiles="https://github.com/GNS3/${pkgname}/archive/v${version}.tar.gz"
-checksum=@8da8b09690bf5d086732c032d3871b8e77fd55efa8553ac9e5f65c4c19bfb3d6
+checksum=@6a5cc45f2a1d7ec8634b33b812013df6635b4c3994f58bf0f55efc41d0a096d0
 
 post_patch() {
 	# relax requirements
-	vsed -e 's|jsonschema.*|jsonschema>=2.6.0|' \
-		-e 's|psutil.*|psutil>=5.6.7|' -i requirements.txt
+	vsed -e 's|jsonschema.*|jsonschema>=2.6.0|' -i requirements.txt
 }
 
 do_check() {

From c214c07db1dd0bcc4c8a4d721896b95043d921aa Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Fri, 9 Apr 2021 20:49:31 -0500
Subject: [PATCH 0949/2024] python3-sentry: update to 1.0.0.

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

diff --git a/srcpkgs/python3-sentry/template b/srcpkgs/python3-sentry/template
index c4406811688e..c2056965cad9 100644
--- a/srcpkgs/python3-sentry/template
+++ b/srcpkgs/python3-sentry/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-sentry'
 pkgname=python3-sentry
-version=0.15.1
-revision=2
+version=1.0.0
+revision=1
 wrksrc="sentry-python-${version}"
 build_style=python3-module
 hostmakedepends=python3-setuptools
@@ -12,7 +12,7 @@ maintainer="Karol Kosek <krkk@krkk.ct8.pl>"
 license="BSD-2-Clause"
 homepage="https://github.com/getsentry/sentry-python"
 distfiles="https://github.com/getsentry/sentry-python/archive/${version}.tar.gz"
-checksum=92008498d7e1d286cf0d971200398152eb776293814db82a2121f1f264cd966e
+checksum=@514331143990028b4cecf9f8e4ff5dfe4c0dddd0dcb206b28b7fba22ada6cece
 
 do_check() {
 	cd build/lib

From ba2d37a1e060b811e7cf615066729405e13656d3 Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Wed, 24 Mar 2021 09:37:05 -0400
Subject: [PATCH 0950/2024] python3-googleapis-common-protos: update to 1.53.0.

---
 srcpkgs/python3-googleapis-common-protos/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-googleapis-common-protos/template b/srcpkgs/python3-googleapis-common-protos/template
index 776af77144ba..8b3c309b55d4 100644
--- a/srcpkgs/python3-googleapis-common-protos/template
+++ b/srcpkgs/python3-googleapis-common-protos/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-googleapis-common-protos'
 pkgname=python3-googleapis-common-protos
-version=1.52.0
-revision=2
+version=1.53.0
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,9 @@ maintainer="Peter Bui <pbui@github.bx612.space>"
 license="Apache-2.0"
 homepage="https://github.com/googleapis/googleapis"
 distfiles="${PYPI_SITE}/g/googleapis-common-protos/googleapis-common-protos-${version}.tar.gz"
-checksum=560716c807117394da12cecb0a54da5a451b5cf9866f1d37e9a5e2329a665351
+checksum=a88ee8903aa0a81f6c3cec2d5cf62d3c8aa67c06439b0496b49048fb1854ebf4
+# testing requires many optional dependencies
+make_check=no
 
 post_install() {
 	chmod -R +r "${DESTDIR}/${py3_sitelib}"

From 414d342b9c20bfad63e6ffb9fd846fbb4d55d0bf Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Wed, 24 Mar 2021 09:37:12 -0400
Subject: [PATCH 0951/2024] python3-google-api-core: update to 1.26.2.

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

diff --git a/srcpkgs/python3-google-api-core/template b/srcpkgs/python3-google-api-core/template
index f933a7e028b1..3530e7d8941c 100644
--- a/srcpkgs/python3-google-api-core/template
+++ b/srcpkgs/python3-google-api-core/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-google-api-core'
 pkgname=python3-google-api-core
-version=1.22.2
-revision=2
+version=1.26.2
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,8 +13,6 @@ maintainer="Peter Bui <pbui@github.bx612.space>"
 license="Apache-2.0"
 homepage="https://github.com/googleapis/python-api-core"
 distfiles="${PYPI_SITE}/g/google-api-core/google-api-core-${version}.tar.gz"
-checksum=779107f17e0fef8169c5239d56a8fbff03f9f72a3893c0c9e5842ec29dfedd54
-
-do_check() {
-	: all tests require grpc, which is optional dependencies.
-}
+checksum=418a131cd349e8bda036741d93e7fb9caefa691daa7296851193edc60b3c946c
+# all tests require grpc, which is optional dependencies.
+make_check=no

From 7882c98a0f03558619b608debca19036d89b7069 Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Wed, 24 Mar 2021 09:49:12 -0400
Subject: [PATCH 0952/2024] python3-google-auth: update to 1.28.0.

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

diff --git a/srcpkgs/python3-google-auth/template b/srcpkgs/python3-google-auth/template
index 9048569a95e2..880bb0441a1e 100644
--- a/srcpkgs/python3-google-auth/template
+++ b/srcpkgs/python3-google-auth/template
@@ -1,14 +1,16 @@
 # Template file for 'python3-google-auth'
 pkgname=python3-google-auth
-version=1.22.0
-revision=2
+version=1.28.0
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools python3-setuptools"
+hostmakedepends="python3-setuptools"
 depends="python3-pyasn1-modules python3-rsa python3-six python3-cachetools"
 short_desc="Google Authentication Library (Python3)"
 maintainer="Peter Bui <pbui@github.bx612.space>"
 license="Apache-2.0"
 homepage="https://github.com/GoogleCloudPlatform/google-auth-library-python"
 distfiles="${PYPI_SITE}/g/google-auth/google-auth-${version}.tar.gz"
-checksum=a73e6fb6d232ed1293ef9a5301e6f8aada7880d19c65d7f63e130dc50ec05593
+checksum=9bd436d19ab047001a1340720d2b629eb96dd503258c524921ec2af3ee88a80e
+# all tests require many optional dependencies
+make_check=no

From 2594bfa0ee1a129c4136812815fd12c1f00273b2 Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Wed, 24 Mar 2021 09:55:35 -0400
Subject: [PATCH 0953/2024] python3-google-auth-httplib2: update to 0.1.0.

---
 srcpkgs/python3-google-auth-httplib2/template | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-google-auth-httplib2/template b/srcpkgs/python3-google-auth-httplib2/template
index 08d324c28714..c8ecea74b5f3 100644
--- a/srcpkgs/python3-google-auth-httplib2/template
+++ b/srcpkgs/python3-google-auth-httplib2/template
@@ -1,14 +1,17 @@
 # Template file for 'python3-google-auth-httplib2'
 pkgname=python3-google-auth-httplib2
-version=0.0.4
-revision=2
+version=0.1.0
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools python3-setuptools"
+hostmakedepends="python3-setuptools"
 depends="python3-google-auth python3-httplib2"
+checkdepends="$depends python3-mock python3-pytest python3-Flask"
 short_desc="Google Authentication Library: httplib2 transport (Python3)"
 maintainer="Peter Bui <pbui@github.bx612.space>"
 license="Apache-2.0"
-homepage="https://github.com/GoogleCloudPlatform/google-auth-library-python3-httplib2"
+homepage="https://github.com/GoogleCloudPlatform/google-auth-library-python-httplib2"
 distfiles="${PYPI_SITE}/g/google-auth-httplib2/google-auth-httplib2-${version}.tar.gz"
-checksum=8d092cc60fb16517b12057ec0bba9185a96e3b7169d86ae12eae98e645b7bc39
+checksum=a07c39fd632becacd3f07718dfd6021bf396978f03ad3ce4321d060015cc30ac
+# tests require unpackaged optional dependency
+make_check=no

From 5e280e01fb380be7bf057aa6ddc672f47ae5d619 Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Wed, 24 Mar 2021 09:57:44 -0400
Subject: [PATCH 0954/2024] python3-google-api-python-client: update to 2.0.2.

Closes: #29719 [via git-merge-pr]
---
 srcpkgs/python3-google-api-python-client/template | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/python3-google-api-python-client/template b/srcpkgs/python3-google-api-python-client/template
index 10685d99dbe5..a3ed75efa6cf 100644
--- a/srcpkgs/python3-google-api-python-client/template
+++ b/srcpkgs/python3-google-api-python-client/template
@@ -1,26 +1,23 @@
 # Template file for 'python3-google-api-python-client'
 pkgname=python3-google-api-python-client
-version=1.12.3
-revision=2
+version=2.0.2
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-httplib2 python3-google-auth python3-google-auth-httplib2
  python3-google-api-core python3-uritemplate python3-six"
+# FIXME: 6 unittests are failing, cannot use py test to override
 checkdepends="python3-mock $depends python3-oauth2client"
 short_desc="Google API client library for Python3"
 maintainer="Peter Bui <pbui@github.bx612.space>"
 license="Apache-2.0"
 homepage="https://github.com/googleapis/google-api-python-client"
 distfiles="${PYPI_SITE}/g/google-api-python-client/google-api-python-client-${version}.tar.gz"
-checksum=844ef76bda585ea0ea2d5e7f8f9a0eb10d6e2eba66c4fea0210ec7843941cb1a
+checksum=48686cceb0dc8cb8b9ee1920ad7c0d9b499ef4fca0ca51c1c69f1e462a628011
 
 post_patch() {
 	# unittest2 is python2 thing.
 	vsed -i -e '/^import unittest2 as unittest/s/.*/import unittest/' \
 		tests/test_*.py
 }
-
-do_check() {
-	: 6 unittest is failing, cannot use py test to override
-}

From 0fb6218857b77328a5c27665b7465f5237712e81 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sat, 20 Mar 2021 13:09:33 +0100
Subject: [PATCH 0955/2024] attr: update to 2.5.1.

Closes: #29609 [via git-merge-pr]
---
 srcpkgs/attr/patches/escape-left-brace-regex.patch | 11 -----------
 srcpkgs/attr/template                              |  8 ++++----
 2 files changed, 4 insertions(+), 15 deletions(-)
 delete mode 100644 srcpkgs/attr/patches/escape-left-brace-regex.patch

diff --git a/srcpkgs/attr/patches/escape-left-brace-regex.patch b/srcpkgs/attr/patches/escape-left-brace-regex.patch
deleted file mode 100644
index 5c91bba818ad..000000000000
--- a/srcpkgs/attr/patches/escape-left-brace-regex.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- test/run
-+++ test/run
-@@ -106,7 +106,7 @@ for (;;) {
-   if (defined $line) {
-     # Substitute %VAR and %{VAR} with environment variables.
-     $line =~ s[%(\w+)][$ENV{$1}]eg;
--    $line =~ s[%{(\w+)}][$ENV{$1}]eg;
-+    $line =~ s[%\{(\w+)}][$ENV{$1}]eg;
-   }
-   if (defined $line) {
-     if ($line =~ s/^\s*< ?//) {
diff --git a/srcpkgs/attr/template b/srcpkgs/attr/template
index c5e6b8aa5ebf..231701bd0158 100644
--- a/srcpkgs/attr/template
+++ b/srcpkgs/attr/template
@@ -1,19 +1,19 @@
 # Template file for 'attr'
 pkgname=attr
-version=2.4.48
+version=2.5.1
 revision=1
 bootstrap=yes
 build_style=gnu-configure
-checkdepends="perl"
 configure_args="--libdir=/usr/lib${XBPS_TARGET_WORDSIZE}
  --libexecdir=/usr/lib${XBPS_TARGET_WORDSIZE}"
+make_check_args="-j1" # Tests broken when ran in parallel
+checkdepends="perl"
 short_desc="Extended attribute support library for ACL support"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://savannah.nongnu.org/projects/attr"
 distfiles="${NONGNU_SITE}/attr/attr-${version}.tar.gz"
-checksum=5ead72b358ec709ed00bbf7a9eaef1654baad937c001c044fe8b74c57f5324e7
-make_check_args="-j1" # Tests broken when ran in parallel
+checksum=bae1c6949b258a0d68001367ce0c741cebdacdd3b62965d17e5eb23cd78adaf8
 conf_files="/etc/xattr.conf"
 
 # The included libtool is rotten and only works with bash; easiest fix.

From 06e4c89f953c43fc9403d3458f961554c0c24d8b Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sat, 20 Mar 2021 13:44:24 +0100
Subject: [PATCH 0956/2024] acl: update to 2.3.1.

Closes: #29623 [via git-merge-pr]
---
 srcpkgs/acl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/acl/template b/srcpkgs/acl/template
index 3edfcfef82b8..9fa74946a240 100644
--- a/srcpkgs/acl/template
+++ b/srcpkgs/acl/template
@@ -1,6 +1,6 @@
 # Template file for 'acl'
 pkgname=acl
-version=2.2.53
+version=2.3.1
 revision=1
 bootstrap=yes
 build_style=gnu-configure
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://savannah.nongnu.org/projects/acl"
 distfiles="${NONGNU_SITE}/acl/acl-${version}.tar.gz"
-checksum=06be9865c6f418d851ff4494e12406568353b891ffe1f596b34693c387af26c7
+checksum=760c61c68901b37fdd5eefeeaf4c0c7a26bdfdd8ac747a1edff1ce0e243c11af
 
 if [ -z "$CHROOT_READY" ]; then
 	CFLAGS+=" -I${XBPS_MASTERDIR}/usr/include"

From 72861e75f16ca362fa6adacb4cf09f9e423a863c Mon Sep 17 00:00:00 2001
From: Lauren Liberda <laura@selfisekai.rocks>
Date: Wed, 24 Mar 2021 22:10:30 +0100
Subject: [PATCH 0957/2024] gqrx: update to 2.14.4

Closes: #25849 [via git-merge-pr]
---
 srcpkgs/gqrx/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gqrx/template b/srcpkgs/gqrx/template
index 1fe79b02e27f..b1b6597b1ef9 100644
--- a/srcpkgs/gqrx/template
+++ b/srcpkgs/gqrx/template
@@ -1,6 +1,6 @@
 # Template file for 'gqrx'
 pkgname=gqrx
-version=2.12.1
+version=2.14.4
 revision=2
 build_style=cmake
 configure_args="$(vopt_if gr_audio -DLINUX_AUDIO_BACKEND=Gr-audio)
@@ -10,14 +10,14 @@ hostmakedepends="pkg-config qt5-qmake qt5-host-tools python3
 makedepends="boost-devel gnuradio-devel gnuradio-osmosdr-devel
  pulseaudio-devel qt5-svg-devel log4cpp-devel mpir-devel volk-devel
  fftw-devel python3-devel alsa-lib-devel jack-devel gmpxx-devel
- $(vopt_if portaudio portaudio-devel)"
+ qt5-tools $(vopt_if portaudio portaudio-devel)"
 short_desc="Software defined radio receiver powered by GNU Radio and Qt"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="http://gqrx.dk/"
 changelog="https://raw.githubusercontent.com/csete/gqrx/master/resources/news.txt"
 distfiles="https://github.com/csete/gqrx/archive/v${version}.tar.gz"
-checksum=7c626db9f22c3edbe30299a08f7f549b4f30dd83c883595468029a27c3e8fda9
+checksum=aec35c77ebde9c71a5f973c509eec3d6aa2f18a6e052b180fcd9029d88273e5b
 
 build_options="gr_audio portaudio"
 vopt_conflict gr_audio portaudio

From 645b26088e0f326e7c6ee143cb2e9da0652176f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 19 Mar 2021 18:33:46 +0100
Subject: [PATCH 0958/2024] cargo-deny: update to 0.9.1.

Closes: #29596 [via git-merge-pr]
---
 srcpkgs/cargo-deny/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cargo-deny/template b/srcpkgs/cargo-deny/template
index 56fbd4eba258..5ee0066d8cf9 100644
--- a/srcpkgs/cargo-deny/template
+++ b/srcpkgs/cargo-deny/template
@@ -1,7 +1,7 @@
 # Template file for 'cargo-deny'
 pkgname=cargo-deny
-version=0.8.2
-revision=2
+version=0.9.1
+revision=1
 build_style=cargo
 configure_args="--no-default-features"
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"
 homepage="https://github.com/EmbarkStudios/cargo-deny"
 distfiles="https://github.com/EmbarkStudios/cargo-deny/archive/${version}.tar.gz"
-checksum=6e081a843637c78846389c3d2922d0b07d95fd7aae496a87ef0e3bfb33bd4d06
+checksum=3fcb347ed35caf3a3e303c4ec3426fafab53dcc084d83ea5c62e79a600f4ed5f
 
 if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	broken="bitvec crate unimplemented for big endian"

From 22bd001705c1b651f1ca0b9b7cf23d1255ad49e3 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Thu, 8 Apr 2021 21:56:27 +0300
Subject: [PATCH 0959/2024] mesa: update to 21.0.2

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

diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index fd6d0c77b651..0dbe36205d7e 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,6 +1,6 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=21.0.1
+version=21.0.2
 revision=1
 wrksrc="mesa-${version}"
 build_style=meson
@@ -23,7 +23,7 @@ license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
 changelog="https://docs.mesa3d.org/relnotes/${version}.html"
 distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=379fc984459394f2ab2d84049efdc3a659869dc1328ce72ef0598506611712bb
+checksum=46c1dc5bb54a372dee43ec3c067229c299187d5bdadf1402756bbf66a6df5b88
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" -Duse-elf-tls=false"

From 057c6dc4435f402c36c906ad86f612854357c6ea Mon Sep 17 00:00:00 2001
From: Spencer Burris <sburris@posteo.net>
Date: Mon, 15 Mar 2021 18:47:05 -0700
Subject: [PATCH 0960/2024] signal-backup-decode: update to 0.2.3

Closes: #29502 [via git-merge-pr]
---
 srcpkgs/signal-backup-decode/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/signal-backup-decode/template b/srcpkgs/signal-backup-decode/template
index 119546b61ea7..747736adeb5e 100644
--- a/srcpkgs/signal-backup-decode/template
+++ b/srcpkgs/signal-backup-decode/template
@@ -1,7 +1,7 @@
 # Template file for 'signal-backup-decode'
 pkgname=signal-backup-decode
-version=0.2.0
-revision=2
+version=0.2.3
+revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
 makedepends="openssl-devel sqlite-devel"
@@ -9,5 +9,5 @@ short_desc="Decode Signal Android Backups"
 maintainer="Spencer Burris <sburris@posteo.net>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/pajowu/signal-backup-decode"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=9a454bb894963e7f6301bdcd3db2c7978fb0cfb7e6fce3f4f553ccad7f955fe9
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=e7727b6628004cd027e374bcd8a004d8c3e68b3ba03e82ce2c9e04ee58623ed2

From dcf78ea6f6f78b4d964fd46521325ab22281abda Mon Sep 17 00:00:00 2001
From: Nicolas Porcel <nicolasporcel06@gmail.com>
Date: Thu, 5 Sep 2019 01:22:00 +0100
Subject: [PATCH 0961/2024] clisp: enable readline by default

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

diff --git a/srcpkgs/clisp/template b/srcpkgs/clisp/template
index 0bd8d107d041..ee0941a3d581 100644
--- a/srcpkgs/clisp/template
+++ b/srcpkgs/clisp/template
@@ -1,7 +1,7 @@
 # Template file for 'clisp'
 pkgname=clisp
 version=2.49
-revision=5
+revision=6
 # possibly works elsewhere but not in an ancient 2010 release
 archs="x86_64* i686*"
 build_style=configure
@@ -20,6 +20,7 @@ nocross=yes
 lib32disabled=yes
 disable_parallel_build=yes
 build_options="readline"
+build_options_default="readline"
 
 case "$XBPS_TARGET_MACHINE" in
 	i686-musl) broken="*** - MULTIPLE-VALUE-SETQ: variable EXTRA-FILE-TYPES has no value";;

From 004adb5f3dbbbfe8b30c6adc018e3b76ba1186b7 Mon Sep 17 00:00:00 2001
From: radiden <gabriel2012688@gmail.com>
Date: Tue, 6 Apr 2021 00:24:56 +0200
Subject: [PATCH 0962/2024] pandoc: update to 2.11.4.

---
 srcpkgs/pandoc/files/stack.yaml | 26 +++++++++-----------------
 srcpkgs/pandoc/template         | 18 ++++++------------
 2 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/srcpkgs/pandoc/files/stack.yaml b/srcpkgs/pandoc/files/stack.yaml
index 47bf3bb1b5e4..82a5fcaded3f 100644
--- a/srcpkgs/pandoc/files/stack.yaml
+++ b/srcpkgs/pandoc/files/stack.yaml
@@ -1,31 +1,23 @@
-resolver: lts-16.20
+resolver: lts-17.9
 
 packages:
-  - ./pandoc-2.10.1
-  - ./pandoc-citeproc-0.17.0.1
+  - ./pandoc-2.11.4
   - ./pandoc-sidenote-0.20.0
 
 flags:
   pandoc:
     trypandoc: false
     embed_data_files: true
-    static: false
-  pandoc-citeproc:
-    bibutils: true
-    embed_data_files: true
-    unicode_collation: false
-    test_citeproc: false
-    debug: false
 
 extra-deps:
-  - pandoc-types-1.21
+  - pandoc-types-1.22
   - haddock-library-1.9.0
-  - regex-pcre-builtin-0.95.1.2.8.43
-  - hslua-1.1.2
-  - jira-wiki-markup-1.3.2
-  - commonmark-0.1.0.1
-  - commonmark-extensions-0.2.0.0
-  - commonmark-pandoc-0.2.0.0
+  - regex-pcre-builtin-0.95.2.3.8.43
+  - hslua-1.2.0
+  - jira-wiki-markup-1.3.4
+  - commonmark-0.1.1.4
+  - commonmark-extensions-0.2.0.4
+  - commonmark-pandoc-0.2.0.1
 
 ghc-options:
    "$locals": -fhide-source-paths -Wno-missing-home-modules
diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index 7d7fbdc4b72b..ad233dd0aaf3 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -1,34 +1,30 @@
 # Template file for 'pandoc'
 pkgname=pandoc
 # Keep in sync with http://www.stackage.org/lts
-version=2.10.1
-revision=3
-_citeproc_version=0.17.0.1
+version=2.11.4
+revision=1
 _sidenote_version=0.20.0
 _monad_gen_version=0.3.0.1
 create_wrksrc=yes
 build_style=haskell-stack
 make_build_args="
- --flag pandoc:embed_data_files --flag pandoc-citeproc:embed_data_files
- --flag=hslua:system-lua --flag=hslua:pkg-config"
+ --flag pandoc:embed_data_files --flag=hslua:system-lua
+ --flag=hslua:pkg-config"
 hostmakedepends="pkg-config unzip wget"
 makedepends="zlib-devel lua53-devel tar"
-short_desc="Universal converter between markup formats (with citeproc support)"
+short_desc="Universal converter between markup formats"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later, BSD-3-Clause, MIT"
 homepage="http://johnmacfarlane.net/pandoc/"
 distfiles="http://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
- http://hackage.haskell.org/package/${pkgname}-citeproc-${_citeproc_version}/${pkgname}-citeproc-${_citeproc_version}.tar.gz
  https://github.com/jez/${pkgname}-sidenote/archive/${_sidenote_version}.tar.gz \
  https://hackage.haskell.org/package/monad-gen-${_monad_gen_version}/monad-gen-${_monad_gen_version}.tar.gz"
-checksum="938a4c9b0a7ed3de886c73af4052913b0ac9e4aa12b435bd2afd09670bd3229a
- f3e5ce3d1d21c27178f2fc69580750e3ce97fc5f962f2d01f7b6aa2e090c2342
+checksum="d3cfc700a2d5d90133f83ae9d286edbe1144bc6a7748d8d90e4846d6e2331af5
  34ee7f46d6472c04884b1dcb030d701a32b885d9b0d4307d2c0da327a359cb7a
  be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465"
 nocross=yes
 nopie_files="
  /usr/bin/pandoc
- /usr/bin/pandoc-citeproc
  /usr/bin/pandoc-sidenote
 "
 
@@ -38,8 +34,6 @@ post_extract() {
 }
 post_install() {
 	vman pandoc-${version}/man/pandoc.1
-	vman pandoc-citeproc-${_citeproc_version}/man/man1/pandoc-citeproc.1
 	vlicense pandoc-${version}/COPYRIGHT LICENSE.pandoc
-	vlicense pandoc-citeproc-${_citeproc_version}/LICENSE LICENSE.pandoc-citeproc
 	vlicense pandoc-sidenote-${_sidenote_version}/LICENSE LICENSE.pandoc-sidenote
 }

From f4fed718b4b004c9533c3fc616e4e505d8ea7e33 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Sat, 10 Apr 2021 17:25:28 +0200
Subject: [PATCH 0963/2024] python3-typed-ast: update to 1.4.2.

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

diff --git a/srcpkgs/python3-typed-ast/template b/srcpkgs/python3-typed-ast/template
index 7c176c7c3154..8461f830a8cb 100644
--- a/srcpkgs/python3-typed-ast/template
+++ b/srcpkgs/python3-typed-ast/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-typed-ast'
 pkgname=python3-typed-ast
-version=1.4.1
-revision=2
+version=1.4.2
+revision=1
 wrksrc="typed_ast-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="whoami <whoami@systemli.org>"
 license="Apache-2.0"
 homepage="https://github.com/python/typed_ast"
 distfiles="https://github.com/python/typed_ast/archive/${version}.tar.gz"
-checksum=498a6cd88f78e4b2058092ff38c9941d61f4eba2c12b371240ba663f063adf7d
+checksum=be4b75ea880768489e30818267cf920027ed99014001ac428aedd0b31bbfc899
 
 do_patch() {
 	# python3-typed-ast uses the same header name with Python

From 3381046f0a4a5cf760738e18d714683dead1481c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 6 Apr 2021 16:43:23 +0300
Subject: [PATCH 0964/2024] soundconverter: update to 4.0.0.

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

diff --git a/srcpkgs/soundconverter/template b/srcpkgs/soundconverter/template
index 9e933929f971..bfffc3084732 100644
--- a/srcpkgs/soundconverter/template
+++ b/srcpkgs/soundconverter/template
@@ -1,10 +1,10 @@
 # Template file for 'soundconverter'
 pkgname=soundconverter
-version=3.0.2
-revision=2
-build_style=gnu-configure
+version=4.0.0
+revision=1
+build_style=python3-module
 pycompile_dirs="/usr/lib/${pkgname}/python/${pkgname}"
-hostmakedepends="glib intltool pkg-config python3-gobject"
+hostmakedepends="glib intltool pkg-config python3-gobject python3-distutils-extra"
 makedepends="gtk+3-devel gstreamer1-devel"
 depends="desktop-file-utils gst-plugins-good1 gst-plugins-ugly1
  hicolor-icon-theme python3-gobject"
@@ -12,8 +12,8 @@ short_desc="Leading audio file converter for the GNOME Desktop"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://soundconverter.org/"
-distfiles="https://launchpad.net/${pkgname}/trunk/${version}/+download/${pkgname}-${version}.tar.xz"
-checksum=21d0b97bd4800a8e07840cf0ec035fa84a71a10c8cdadf5ea671880805aa68cb
+distfiles="https://launchpad.net/soundconverter/trunk/${version}/+download/soundconverter-${version}.tar.gz"
+checksum=4ad497793e40b321b2e10a363ab360b2b0bf338ff846eee7e00c895293ad4adb
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then

From e6fa4822019075a6bdd7cae09511a567406f92d8 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Wed, 10 Mar 2021 19:34:59 +0100
Subject: [PATCH 0965/2024] cyrus-sasl: remove dependency to main package from
 modules

The various sasl modules do not dependent on any of the tools and
daemons that are included in the main cyrus-sasl package. Drop the
dependency.

Closes: #29383 [via git-merge-pr]
---
 srcpkgs/cyrus-sasl/template | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index 585ac7a0e94a..608049a1d883 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -1,7 +1,7 @@
 # Template file for 'cyrus-sasl'
 pkgname=cyrus-sasl
 version=2.1.27
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-static --enable-shared --enable-checkapop
  --enable-cram --enable-digest --disable-otp --disable-srp
@@ -39,7 +39,6 @@ post_install() {
 }
 
 cyrus-sasl-modules-ldap_package() {
-	depends="cyrus-sasl>=${version}_${revision}"
 	short_desc="Cyrus SASL - pluggable authentication modules (LDAP)"
 	pkg_install() {
 		vmove "usr/lib/sasl2/libldapdb.*"
@@ -47,7 +46,6 @@ cyrus-sasl-modules-ldap_package() {
 }
 
 cyrus-sasl-modules-sql_package() {
-	depends="cyrus-sasl>=${version}_${revision}"
 	short_desc="Cyrus SASL - pluggable authentication modules (SQL)"
 	pkg_install() {
 		vmove "usr/lib/sasl2/libsql.*"
@@ -55,7 +53,6 @@ cyrus-sasl-modules-sql_package() {
 }
 
 cyrus-sasl-modules-gssapi_package() {
-	depends="cyrus-sasl>=${version}_${revision}"
 	short_desc="Cyrus SASL - pluggable authentication modules (GSSAPI)"
 	pkg_install() {
 		vmove "usr/lib/sasl2/libgssapi*"
@@ -63,7 +60,6 @@ cyrus-sasl-modules-gssapi_package() {
 }
 
 cyrus-sasl-modules_package() {
-	depends="cyrus-sasl>=${version}_${revision}"
 	short_desc="Cyrus SASL - pluggable authentication modules"
 	pkg_install() {
 		vmove usr/lib/sasl2

From fb7cf48e4e3dc4efca5ade4a888fd3784e3eb720 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 4 Feb 2021 15:24:12 -0300
Subject: [PATCH 0966/2024] ell: update to 0.39.

Add warnings about ABI stability.
---
 common/shlibs        | 2 +-
 srcpkgs/ell/template | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 8d3c87b4d34e..2e3a395214ca 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1005,7 +1005,7 @@ libgsm.so.1 libgsm-1.0.13_13
 libcgroup.so.1 libcgroup-0.37.1_1
 libxdg-basedir.so.1 libxdg-basedir-1.1.1_1
 libev.so.4 libev-4.04_1
-libell.so.0 ell-0.20_1
+libell.so.0 ell-0.39_1
 libgvnc-1.0.so.0 gtk-vnc-0.4.4_1
 libgtk-vnc-2.0.so.0 gtk-vnc-0.4.4_1
 libyaml-0.so.2 libyaml-0.1.4_1
diff --git a/srcpkgs/ell/template b/srcpkgs/ell/template
index 19634a337aa0..9c798a84e8ae 100644
--- a/srcpkgs/ell/template
+++ b/srcpkgs/ell/template
@@ -1,6 +1,7 @@
 # Template file for 'ell'
+# ell ABI isn't stable! Always test dependants after updates and update common/shlibs
 pkgname=ell
-version=0.36
+version=0.39
 revision=1
 build_style=gnu-configure
 configure_args="--enable-glib"
@@ -12,7 +13,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-2.0-only"
 homepage="https://01.org/ell"
 distfiles="${KERNEL_SITE}/libs/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=2f99e743a235b1c834b19112e4e0283d02da93b863899381466cde47bf159cf6
+checksum=653e2e139e23ed31e03c56c05f15321a9e818e2dca00a315c18d2c7b72f15d08
 # tests depend on kernel features
 make_check=extended
 

From ea74643727bb803908e3a6ce6b47daa1a38c47f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 26 Feb 2021 17:19:50 -0300
Subject: [PATCH 0967/2024] ofono: revbump for ell.

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

diff --git a/srcpkgs/ofono/template b/srcpkgs/ofono/template
index 16695994583a..248e58d9502d 100644
--- a/srcpkgs/ofono/template
+++ b/srcpkgs/ofono/template
@@ -1,7 +1,7 @@
 # Template file for 'ofono'
 pkgname=ofono
 version=1.31
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-bluez4 --enable-external-ell"
 conf_files="/etc/ofono/phonesim.conf /etc/dbus-1/system.d/ofono.conf"

From 5d6e8615acc7e4453729872fc3af9a13a4022ba8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 26 Feb 2021 17:19:43 -0300
Subject: [PATCH 0968/2024] bluez: update to 5.58.

Requested by paper42:
- add logging to services
- add experimental build option
---
 srcpkgs/bluez/files/bluetooth-meshd/log/run |  1 +
 srcpkgs/bluez/files/bluetooth-meshd/run     |  3 ++-
 srcpkgs/bluez/files/bluetoothd/log/run      |  1 +
 srcpkgs/bluez/files/bluetoothd/run          |  3 ++-
 srcpkgs/bluez/template                      | 12 +++++++-----
 5 files changed, 13 insertions(+), 7 deletions(-)
 create mode 120000 srcpkgs/bluez/files/bluetooth-meshd/log/run
 create mode 120000 srcpkgs/bluez/files/bluetoothd/log/run

diff --git a/srcpkgs/bluez/files/bluetooth-meshd/log/run b/srcpkgs/bluez/files/bluetooth-meshd/log/run
new file mode 120000
index 000000000000..3a5b4a586051
--- /dev/null
+++ b/srcpkgs/bluez/files/bluetooth-meshd/log/run
@@ -0,0 +1 @@
+/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/bluez/files/bluetooth-meshd/run b/srcpkgs/bluez/files/bluetooth-meshd/run
index 752dbcc37bf7..2594d5fe56e4 100755
--- a/srcpkgs/bluez/files/bluetooth-meshd/run
+++ b/srcpkgs/bluez/files/bluetooth-meshd/run
@@ -1,3 +1,4 @@
 #!/bin/sh
 sv check dbus >/dev/null || exit 1
-exec /usr/libexec/bluetooth/bluetooth-meshd --nodetach >/dev/null
+exec 2>&1
+exec /usr/libexec/bluetooth/bluetooth-meshd --nodetach
diff --git a/srcpkgs/bluez/files/bluetoothd/log/run b/srcpkgs/bluez/files/bluetoothd/log/run
new file mode 120000
index 000000000000..3a5b4a586051
--- /dev/null
+++ b/srcpkgs/bluez/files/bluetoothd/log/run
@@ -0,0 +1 @@
+/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/bluez/files/bluetoothd/run b/srcpkgs/bluez/files/bluetoothd/run
index 2b96adcdcdc6..860fa4bf80b3 100755
--- a/srcpkgs/bluez/files/bluetoothd/run
+++ b/srcpkgs/bluez/files/bluetoothd/run
@@ -1,3 +1,4 @@
 #!/bin/sh
 sv check dbus >/dev/null || exit 1
-exec /usr/libexec/bluetooth/bluetoothd -n >/dev/null
+exec 2>&1
+exec /usr/libexec/bluetooth/bluetoothd -n
diff --git a/srcpkgs/bluez/template b/srcpkgs/bluez/template
index 80fcf51c85a0..2130b7340580 100644
--- a/srcpkgs/bluez/template
+++ b/srcpkgs/bluez/template
@@ -1,11 +1,12 @@
 # Template file for 'bluez'
 pkgname=bluez
-version=5.55
+version=5.58
 revision=1
 build_style=gnu-configure
 configure_args="--with-udevdir=/usr/lib/udev --disable-systemd
  --enable-sixaxis --enable-threads --enable-library --enable-deprecated
- --enable-external-ell $(vopt_enable mesh) $(vopt_enable nfc)"
+ --enable-external-ell $(vopt_enable mesh) $(vopt_enable nfc)
+ $(vopt_enable experimental)"
 hostmakedepends="automake flex libtool pkg-config"
 makedepends="cups-devel eudev-libudev-devel libglib-devel libical-devel
  readline-devel ell-devel $(vopt_if mesh json-c-devel)"
@@ -14,19 +15,20 @@ maintainer="Doan Tran Cong Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://www.bluez.org/"
 distfiles="${KERNEL_SITE}/bluetooth/$pkgname-$version.tar.xz"
-checksum=8863717113c4897e2ad3271fc808ea245319e6fd95eed2e934fae8e0894e9b88
+checksum=c8065e75a5eb67236849ef68a354b1700540305a8c88ef0a0fd6288f19daf1f1
 conf_files="/etc/bluetooth/main.conf"
 system_groups="bluetooth"
-build_options="mesh nfc"
 patch_args="-Np1"
 
+build_options="mesh nfc experimental"
+
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	makedepends+=" musl-legacy-compat"
 fi
 
 post_patch() {
 	# Use system ell
-	rm -rf ell/*
+	rm -r ell/*
 }
 
 pre_configure() {

From ffefa606a2cb9c0610863c03003cf6eeb95b178a Mon Sep 17 00:00:00 2001
From: Jony <maybe-one-day-ubermensch@protonmail.com>
Date: Tue, 6 Apr 2021 19:36:44 -0700
Subject: [PATCH 0969/2024] vpnc-scripts: update to 20210402.

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

diff --git a/srcpkgs/vpnc-scripts/template b/srcpkgs/vpnc-scripts/template
index 80e2fdedeb7e..c2152391688f 100644
--- a/srcpkgs/vpnc-scripts/template
+++ b/srcpkgs/vpnc-scripts/template
@@ -1,13 +1,13 @@
 # Template file for 'vpnc-scripts'
 pkgname=vpnc-scripts
-version=20200930
+version=20210402
 revision=1
 short_desc="Network configuration scripts for VPNC and OpenConnect"
 maintainer="Jony <maybe-one-day-ubermensch@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://www.infradead.org/openconnect/vpnc-script.html"
 distfiles="ftp://ftp.infradead.org/pub/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=364a00b3ef0f4b036fc2ac4271723da1e9a1648137b65f771d73e04f1215b8ba
+checksum=cd00e831904554c7acbc9cd20e6457c6e787fe52dc2f75d39263a65faccc19f0
 
 do_install() {
 	vinstall vpnc-script 755 usr/libexec/vpnc-scripts

From 14e6f8e3ef92362682a71ee74dd3f164ad476952 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 11 Apr 2021 02:22:36 -0300
Subject: [PATCH 0970/2024] linux5.11: update to 5.11.13.

---
 srcpkgs/linux5.11/files/arm64-dotconfig | 6 +++---
 srcpkgs/linux5.11/template              | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/linux5.11/files/arm64-dotconfig b/srcpkgs/linux5.11/files/arm64-dotconfig
index 2ae2b39dd4ed..293f821d5cbf 100644
--- a/srcpkgs/linux5.11/files/arm64-dotconfig
+++ b/srcpkgs/linux5.11/files/arm64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.11.1 Kernel Configuration
+# Linux/arm64 5.11.13 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-linux-musl-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -228,6 +228,7 @@ CONFIG_USERMODE_DRIVER=y
 # CONFIG_BPF_PRELOAD is not set
 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
@@ -371,6 +372,7 @@ CONFIG_QCOM_FALKOR_ERRATUM_1003=y
 CONFIG_QCOM_FALKOR_ERRATUM_1009=y
 CONFIG_QCOM_QDF2400_ERRATUM_0065=y
 CONFIG_QCOM_FALKOR_ERRATUM_E1041=y
+CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y
 CONFIG_SOCIONEXT_SYNQUACER_PREITS=y
 # end of ARM errata workarounds via the alternatives framework
 
@@ -2115,7 +2117,6 @@ CONFIG_PCIEASPM_DEFAULT=y
 CONFIG_PCIE_PME=y
 CONFIG_PCIE_DPC=y
 CONFIG_PCIE_PTM=y
-# CONFIG_PCIE_BW is not set
 CONFIG_PCIE_EDR=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_MSI_IRQ_DOMAIN=y
@@ -10177,7 +10178,6 @@ CONFIG_RESET_TEGRA_BPMP=y
 CONFIG_GENERIC_PHY=y
 CONFIG_GENERIC_PHY_MIPI_DPHY=y
 CONFIG_PHY_XGENE=m
-CONFIG_USB_LGM_PHY=m
 CONFIG_PHY_SUN4I_USB=m
 CONFIG_PHY_SUN6I_MIPI_DPHY=m
 CONFIG_PHY_SUN9I_USB=m
diff --git a/srcpkgs/linux5.11/template b/srcpkgs/linux5.11/template
index ad0b1ba7361b..61162540a83d 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.12
+version=5.11.13
 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
- ec443b0e6c9c10d94dc25b1662245d6421f75e223e7ea6de51e4f2c465b08164"
+ d38e0f7f732ec95c247182ad1c97dd433e9fbb1619c99f7a0a8a24fddd001c82"
 skip_extraction="patch-${version}.xz"
 python_version=3
 patch_args="-Np1"

From bf45d369f1c36541b072c62fe083b57c6762f023 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 23:10:59 -0700
Subject: [PATCH 0971/2024] cachefilesd: fix license

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

diff --git a/srcpkgs/cachefilesd/template b/srcpkgs/cachefilesd/template
index 67b75a779d34..0100afaeb273 100644
--- a/srcpkgs/cachefilesd/template
+++ b/srcpkgs/cachefilesd/template
@@ -1,19 +1,19 @@
 # Template file for 'cachefilesd'
 pkgname=cachefilesd
 version=0.10.10
-revision=1
+revision=2
 build_style=gnu-makefile
+make_install_args="SBINDIR=/usr/bin BINDIR=/usr/bin"
 short_desc="Userspace daemon acting as a backend for FS-Cache"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://people.redhat.com/~dhowells/fscache/"
 distfiles="http://people.redhat.com/~dhowells/fscache/${pkgname}-${version}.tar.bz2"
-checksum=0d0309851efabd02b7c849f73535b8ad3f831570e83e4f65e42354da18e11a02
-make_install_args="SBINDIR=/usr/bin BINDIR=/usr/bin"
 conf_files="/etc/cachefilesd.conf"
+checksum=0d0309851efabd02b7c849f73535b8ad3f831570e83e4f65e42354da18e11a02
 
-do_configure() {
-	sed -i "s#/sbin/#/usr/bin/#g" cachefilesd.c
+post_patch() {
+	vsed -i "s#/sbin/#/usr/bin/#g" cachefilesd.c
 }
 
 post_install() {

From 755846c5cfb608a9ea0a14b65784da51a8d872a9 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 23:21:18 -0700
Subject: [PATCH 0972/2024] cairo-dock-plugins: fix license

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

diff --git a/srcpkgs/cairo-dock-plugins/template b/srcpkgs/cairo-dock-plugins/template
index 1086ee328e40..7069ed9ed64d 100644
--- a/srcpkgs/cairo-dock-plugins/template
+++ b/srcpkgs/cairo-dock-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'cairo-dock-plugins'
 pkgname=cairo-dock-plugins
 version=3.4.1
-revision=13
+revision=14
 build_style=cmake
 hostmakedepends="gettext pkg-config"
 makedepends="alsa-lib-devel fftw-devel pulseaudio-devel libexif-devel
@@ -10,7 +10,7 @@ makedepends="alsa-lib-devel fftw-devel pulseaudio-devel libexif-devel
 depends="cairo-dock>=${version} upower"
 short_desc="Plugins for cairo-dock"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later, GPL-3.0-or-later"
 homepage="https://launchpad.net/cairo-dock"
 distfiles="http://launchpad.net/cairo-dock-plug-ins/${version%.?}/${version}/+download/cairo-dock-plug-ins-${version}.tar.gz"
 checksum=e09b8e600398749d1f74b26e645b477a1844a3eea02fcadd6877935da3f8639e
@@ -32,7 +32,6 @@ pre_configure() {
 
 cairo-dock-plugins-python3_package() {
 	depends="python3 ${sourcepkg}>=${version}_${revision}"
-	pycompile_module="CDBashApplet.py CairoDock.py CDApplet.py"
 	short_desc+=" - python3 bindings"
 	pkg_install() {
 		vmove ${py3_sitelib}

From af5d91e86c14308a7d421cfbce2d003abc845023 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 23:25:36 -0700
Subject: [PATCH 0973/2024] canto-curses: fix license

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

diff --git a/srcpkgs/canto-curses/template b/srcpkgs/canto-curses/template
index 841369c23e86..b67f9f284f5b 100644
--- a/srcpkgs/canto-curses/template
+++ b/srcpkgs/canto-curses/template
@@ -1,16 +1,15 @@
 # Template file for 'canto-curses'
 pkgname=canto-curses
 version=0.9.9
-revision=6
+revision=7
 build_style=python3-module
+pycompile_dirs="/usr/lib/canto/plugins"
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel ncurses-devel readline-devel"
 depends="canto-next"
-pycompile_module="canto_curses"
-pycompile_dirs="/usr/lib/canto/plugins"
-short_desc="An ncurses frontend for canto-next Atom/RSS feed reader"
+short_desc="Ncurses frontend for canto-next Atom/RSS feed reader"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="https://codezen.org/canto-ng/"
 distfiles="https://github.com/themoken/${pkgname}/archive/v${version}.tar.gz"
 checksum=88db1e4ac71f13f02ffb076a33b290e6c343da669dc54ea771af705b21ea6452

From 63c5fd3035025f204fdf867657beb8ffac5d0b4d Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 23:28:45 -0700
Subject: [PATCH 0974/2024] canto-next: fix license

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

diff --git a/srcpkgs/canto-next/template b/srcpkgs/canto-next/template
index 03eb9deb18eb..8fd497829427 100644
--- a/srcpkgs/canto-next/template
+++ b/srcpkgs/canto-next/template
@@ -1,15 +1,14 @@
 # Template file for 'canto-next'
 pkgname=canto-next
 version=0.9.7
-revision=4
+revision=5
 build_style=python3-module
+pycompile_dirs="/usr/lib/canto/plugins"
 hostmakedepends="python3-setuptools"
 depends="python3-feedparser"
-pycompile_module="canto_next"
-pycompile_dirs="/usr/lib/canto/plugins"
 short_desc="Quick and concise Atom/RSS feed reader daemon"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="https://codezen.org/canto-ng/"
 distfiles="https://github.com/themoken/${pkgname}/archive/v${version}.tar.gz"
 checksum=222d0382c145f81010653fbe1006f61455ed0aeb6c3940145524e633e3567ad5

From c17b8b8a74b532e986e1281542700d0ab5d05474 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 23:30:34 -0700
Subject: [PATCH 0975/2024] cbp2make: fix license

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

diff --git a/srcpkgs/cbp2make/template b/srcpkgs/cbp2make/template
index 30f0e69093d9..4b8736ff6351 100644
--- a/srcpkgs/cbp2make/template
+++ b/srcpkgs/cbp2make/template
@@ -1,12 +1,12 @@
 # Template file for 'cbp2make'
 pkgname=cbp2make
 version=147
-revision=1
+revision=2
 wrksrc="$pkgname-stl-rev${version}-all"
 hostmakedepends="doxygen p7zip"
 short_desc="Makefile generation tool for Code::Blocks IDE"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="http://sourceforge.net/projects/cbp2make/"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/cbp2make-stl-rev${version}-all.tar.7z"
 checksum=1b211abb8de00dc3048fccad6ebd076ab03dcb9f672cdff379de33a1346ed129

From d891f4816c154cb2029907a79ad169d2b289116e Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 23:40:08 -0700
Subject: [PATCH 0976/2024] ccextractor: fix license

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

diff --git a/srcpkgs/ccextractor/template b/srcpkgs/ccextractor/template
index c766b264779e..d4bdf07d6f76 100644
--- a/srcpkgs/ccextractor/template
+++ b/srcpkgs/ccextractor/template
@@ -1,7 +1,7 @@
 # Template file for 'ccextractor'
 pkgname=ccextractor
 version=0.88
-revision=1
+revision=2
 build_wrksrc="linux"
 build_style=gnu-configure
 configure_args="--enable-ocr --enable-hardsubx"
@@ -9,7 +9,7 @@ hostmakedepends="automake pkg-config"
 makedepends="leptonica-devel tesseract-ocr-devel ffmpeg-devel"
 short_desc="Extract subtitles from video streams"
 maintainer="newbluemoon <blaumolch@mailbox.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://www.ccextractor.org/"
 changelog="https://raw.githubusercontent.com/CCExtractor/ccextractor/master/docs/CHANGES.TXT"
 distfiles="https://github.com/CCExtractor/${pkgname}/archive/v${version}.tar.gz"

From 2bda38ad01e522f85ac343ac28f9e6fd6f67f3af Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 23:47:43 -0700
Subject: [PATCH 0977/2024] cdb: fix license

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

diff --git a/srcpkgs/cdb/template b/srcpkgs/cdb/template
index 213b1d1a245a..c95afff379bb 100644
--- a/srcpkgs/cdb/template
+++ b/srcpkgs/cdb/template
@@ -1,11 +1,11 @@
 # Template file for 'cdb'
 pkgname=cdb
 version=0.75
-revision=4
+revision=5
 build_style=gnu-makefile
 short_desc="Constant database utilities"
 maintainer="Lain <lain@waifu.club>"
-license="Public domain"
+license="Public Domain"
 homepage="http://cr.yp.to/cdb.html"
 distfiles="http://cr.yp.to/cdb/cdb-${version}.tar.gz"
 checksum="1919577799a50c080a8a05a1cbfa5fa7e7abc823d8d7df2eeb181e624b7952c5"

From ddc98e168c9cd9056f740802ebdde72631546d32 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 23:56:07 -0700
Subject: [PATCH 0978/2024] cdecl: fix license

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

diff --git a/srcpkgs/cdecl/template b/srcpkgs/cdecl/template
index e4bd82933f81..e120ca3af500 100644
--- a/srcpkgs/cdecl/template
+++ b/srcpkgs/cdecl/template
@@ -1,7 +1,7 @@
 # Template file for 'cdecl'
 pkgname=cdecl
 version=2.5
-revision=5
+revision=6
 wrksrc="${pkgname}-blocks-${version}"
 build_style=gnu-makefile
 make_build_args="-e"
@@ -9,8 +9,8 @@ hostmakedepends="flex"
 makedepends="readline-devel"
 short_desc="Compose C and C++ type declarations"
 maintainer="beefcurtains <beefcurtains@voidlinux.org>"
-license="GPL-3"
-homepage="http://${pkgname}.org/"
+license="Public Domain"
+homepage="http://cdecl.org/"
 distfiles="${homepage}files/${wrksrc}.tar.gz"
 checksum=9ee6402be7e4f5bb5e6ee60c6b9ea3862935bf070e6cecd0ab0842305406f3ac
 CFLAGS="-DUSE_READLINE"

From e82dd798d973da8f78feb2ef188d5a9754576dd3 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 25 Mar 2021 23:56:50 -0700
Subject: [PATCH 0979/2024] cdrdao: fix license

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

diff --git a/srcpkgs/cdrdao/template b/srcpkgs/cdrdao/template
index e2b43bf855fc..f8fae75ab2b3 100644
--- a/srcpkgs/cdrdao/template
+++ b/srcpkgs/cdrdao/template
@@ -1,13 +1,13 @@
 # Template file for 'cdrdao'
 pkgname=cdrdao
 version=1.2.4
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="lame-devel libao-devel libmad-devel libvorbis-devel"
 short_desc="Records audio or data CD-Rs in disk-at-once (DAO) mode"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2..0-or-later"
+license="GPL-2.0-or-later"
 homepage="http://cdrdao.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/cdrdao/${version}/cdrdao-${version}.tar.bz2"
 checksum=358d9cb83370ceaecdc60564cbf14c2ea2636eac60a966e2461c011ba09853b4

From da839c785e1372e162ec200be43d4d68c2b5b971 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 26 Mar 2021 08:23:27 -0700
Subject: [PATCH 0980/2024] chmlib: fix license

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

diff --git a/srcpkgs/chmlib/template b/srcpkgs/chmlib/template
index 7f2eb56ab4a2..a573c27d1499 100644
--- a/srcpkgs/chmlib/template
+++ b/srcpkgs/chmlib/template
@@ -1,12 +1,12 @@
 # Template file for 'chmlib'
 pkgname=chmlib
 version=0.40
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-examples"
 short_desc="Utilities for dealing with Microsoft ITSS/CHM format files"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
+license="LGPL-2.1-or-later"
 homepage="http://www.jedrea.com/chmlib/"
 distfiles="http://www.jedrea.com/${pkgname}/${pkgname}-${version}.tar.bz2"
 checksum=3449d64b0cf71578b2c7e3ddc048d4af3661f44a83941ea074a7813f3a59ffa3
@@ -26,4 +26,3 @@ libchmlib-devel_package() {
 		vmove usr/lib/*.so
 	}
 }
-

From 03b4d5b19c0fd78579a0cbf61bef9899ed724921 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 26 Mar 2021 08:32:34 -0700
Subject: [PATCH 0981/2024] chntpw: fix license

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

diff --git a/srcpkgs/chntpw/template b/srcpkgs/chntpw/template
index 75289c85961f..7ccac88fe06d 100644
--- a/srcpkgs/chntpw/template
+++ b/srcpkgs/chntpw/template
@@ -1,12 +1,12 @@
 # Template file for 'chntpw'
 pkgname=chntpw
 version=140201
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="unzip"
 short_desc="Offline Windows Password and Registry Editor"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-only, LGPL-2.1-only"
 homepage="http://pogostick.net/~pnh/ntpasswd/"
 distfiles="http://pogostick.net/~pnh/ntpasswd/${pkgname}-source-${version}.zip"
 checksum=96e20905443e24cba2f21e51162df71dd993a1c02bfa12b1be2d0801a4ee2ccc

From 76cdd55bc957527ed36c9cf1a8e8583acbd73c5c Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 26 Mar 2021 08:57:43 -0700
Subject: [PATCH 0982/2024] cksfv: fix license

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

diff --git a/srcpkgs/cksfv/template b/srcpkgs/cksfv/template
index 864fe357e126..78f61f3f2579 100644
--- a/srcpkgs/cksfv/template
+++ b/srcpkgs/cksfv/template
@@ -1,11 +1,12 @@
+# Template file for 'cksfv'
 pkgname=cksfv
 version=1.3.14
-revision=2
+revision=3
 build_style=configure
+short_desc="SFV checksum utility (simple file verification)"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://zakalwe.fi/~shd/foss/cksfv/"
-short_desc="SFV checksum utility (simple file verification)"
 distfiles="http://zakalwe.fi/~shd/foss/cksfv/files/${pkgname}-${version}.tar.gz"
 checksum=010facce85b317b7b9f952c84cd59ce03476a2b685db33a49b6ea0d1b38378ea
 

From 4138a8b87f7eaba4c568e0934614832be57dc1f8 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 26 Mar 2021 09:09:09 -0700
Subject: [PATCH 0983/2024] clustalw: fix license

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

diff --git a/srcpkgs/clustalw/template b/srcpkgs/clustalw/template
index 77fb0be93c62..5c048024e402 100644
--- a/srcpkgs/clustalw/template
+++ b/srcpkgs/clustalw/template
@@ -1,12 +1,11 @@
 # Template file for 'clustalw'
 pkgname=clustalw
 version=2.1
-revision=1
+revision=2
 build_style=gnu-configure
 short_desc="Bioinformatics program for multiple sequence alignment"
 maintainer="Simon Whelan <si.whelan@gmail.com>"
-license="LGPL-v3"
+license="LGPL-3.0-or-later"
 homepage="http://clustal.org"
-distfiles="http://www.clustal.org/download/current/clustalw-2.1.tar.gz"
+distfiles="http://www.clustal.org/download/current/clustalw-${version}.tar.gz"
 checksum=e052059b87abfd8c9e695c280bfba86a65899138c82abccd5b00478a80f49486
-

From 12ff8063cf4675873a04360f3127cd03b03b5796 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 26 Mar 2021 10:36:36 -0700
Subject: [PATCH 0984/2024] connman-ncurses: fix license

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

diff --git a/srcpkgs/connman-ncurses/template b/srcpkgs/connman-ncurses/template
index 8ba2028a5f28..5fd4b33b08fc 100644
--- a/srcpkgs/connman-ncurses/template
+++ b/srcpkgs/connman-ncurses/template
@@ -1,7 +1,7 @@
 # Template file for 'connman-ncurses'
 pkgname=connman-ncurses
 version=1.0
-revision=4
+revision=5
 wrksrc="connman-json-client-${version}"
 build_style=gnu-configure
 hostmakedepends="automake autoconf pkg-config json-c-devel ncurses-devel dbus-devel"
@@ -9,7 +9,7 @@ makedepends="json-c-devel ncurses-devel dbus-devel"
 depends="dbus connman"
 short_desc="Simple ncurses-based UI for ConnMan"
 maintainer="Sergei Akhmatdinov <sakhmatd@riseup.net>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://github.com/eurogiciel-oss/connman-json-client"
 distfiles="https://github.com/eurogiciel-oss/connman-json-client/archive/v${version}.tar.gz"
 checksum=724604787b51cd3bd2ba5d2291f5f2efe0558a1ec78d92d3c92ebc78f6c63219

From 66fd1ed0cc8cf80b02816fa8e03ab0941ea9636e Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 26 Mar 2021 10:36:44 -0700
Subject: [PATCH 0985/2024] connman-ui: fix license

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

diff --git a/srcpkgs/connman-ui/template b/srcpkgs/connman-ui/template
index fdd0fa5d20c0..8aaafad5b55a 100644
--- a/srcpkgs/connman-ui/template
+++ b/srcpkgs/connman-ui/template
@@ -1,15 +1,15 @@
 # Template file for 'connman-ui'
 pkgname=connman-ui
 version=0.0.20150622
-revision=2
+revision=3
 _gitrev=fce0af94e121bde77c7fa2ebd6a319f0180c5516
 wrksrc=${pkgname}-${_gitrev}
 build_style=gnu-configure
 hostmakedepends="automake libtool intltool glib-devel pkg-config"
 makedepends="dbus-devel glib-devel gtk+3-devel"
-short_desc="A full-featured GTK based trayicon UI for ConnMan"
+short_desc="Full-featured GTK based trayicon UI for ConnMan"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="https://github.com/tbursztyka/connman-ui"
 distfiles="${homepage}/archive/${_gitrev}.tar.gz>${pkgname}-${version}.tar.gz"
 checksum=12ac39f1d4c9e3f54ede6c1d1ebc2dbd6d31cdb74516cb5080f9860499d0a1ee

From f04cdb8ec42e6ee434a7226dc282275caabb990f Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 26 Mar 2021 11:28:42 -0700
Subject: [PATCH 0986/2024] cparser: fix license

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

diff --git a/srcpkgs/cparser/template b/srcpkgs/cparser/template
index d77478ac42a3..d56c074d648c 100644
--- a/srcpkgs/cparser/template
+++ b/srcpkgs/cparser/template
@@ -1,13 +1,13 @@
 # Template file for 'cparser'
 pkgname=cparser
 version=1.22.0
-revision=2
+revision=3
 wrksrc="cparser-cparser-${version}"
 makedepends="libfirm-devel"
 depends="gcc"
 short_desc="C99 parser (with GNU extensions) and libfirm frontend"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://libfirm.org/"
 distfiles="https://github.com/MatzeB/cparser/archive/cparser-${version}.tar.gz"
 checksum=0965aa23d8ed7d4cce309806fec2d2c18ad20a74a084340baed0dc874b24175b

From 2bd194bfa09ce5c37ffe60dec7af47bc97b94366 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 26 Mar 2021 23:31:09 -0700
Subject: [PATCH 0987/2024] cppdb: fix license

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

diff --git a/srcpkgs/cppdb/template b/srcpkgs/cppdb/template
index cf5194e6f507..d09016575384 100644
--- a/srcpkgs/cppdb/template
+++ b/srcpkgs/cppdb/template
@@ -1,16 +1,19 @@
 # Template file for 'cppdb'
 pkgname=cppdb
 version=0.3.1
-revision=1
+revision=2
 build_style=cmake
 makedepends="libpqxx-devel"
 short_desc="SQL Connectivity Library"
 maintainer="Asaf Ohayon <asaf@sysbind.co.il>"
-license="LGPL-3"
+license="MIT"
 homepage="http://cppcms.com/sql/cppdb/"
 distfiles="${SOURCEFORGE_SITE}/cppcms/cppdb/${version}/cppdb-${version}.tar.bz2"
 checksum=d60eef5a732d8f84ef5e4a2845a8cefc543a6c75bf3782589c2cf6aa150b992e
 
+post_install() {
+	vlicense MIT.txt LICENSE
+}
 
 cppdb-devel_package() {
 	short_desc+=" - development files"

From 148947e3a939d628e23a85e148b3f01856774fcb Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Fri, 26 Mar 2021 23:34:47 -0700
Subject: [PATCH 0988/2024] cproto: fix license

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

diff --git a/srcpkgs/cproto/template b/srcpkgs/cproto/template
index df279033a6ee..7c1e844d2b85 100644
--- a/srcpkgs/cproto/template
+++ b/srcpkgs/cproto/template
@@ -1,12 +1,12 @@
 # Template file for 'cproto'
 pkgname=cproto
 version=4.7o
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="flex"
 short_desc="Generates function prototypes and variable declarations from C code"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="Public domain"
+license="Public Domain"
 homepage="http://invisible-island.net/cproto/cproto.html"
 distfiles="ftp://ftp.invisible-island.net/cproto/cproto-${version}.tgz"
 checksum=c76b0b72064e59709459bb7d75d6ec929f77ce5ae7f2610d169ba0fa20ccb44f

From 97653e8da314c4a58e045aa574239b54590259a1 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 27 Mar 2021 10:11:24 -0700
Subject: [PATCH 0989/2024] cpufrequtils: fix license

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

diff --git a/srcpkgs/cpufrequtils/template b/srcpkgs/cpufrequtils/template
index 77c7d335a91d..f29bb4155f6c 100644
--- a/srcpkgs/cpufrequtils/template
+++ b/srcpkgs/cpufrequtils/template
@@ -1,7 +1,7 @@
 # Template file for 'cpufrequtils'
 pkgname=cpufrequtils
 version=008
-revision=12
+revision=13
 _commit=a2f0c39d5f21596bb9f5223e895c0ff210b265d0
 wrksrc="${pkgname}-${_commit}"
 build_style=gnu-makefile
@@ -10,7 +10,7 @@ make_install_args="mandir=/usr/share/man"
 hostmakedepends="gettext"
 short_desc="Userspace tools for the Linux kernel cpufreq subsystem"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="https://git.kernel.org/pub/scm/linux/kernel/git/brodo/cpufrequtils.git"
 distfiles="${homepage}/snapshot/${pkgname}-${_commit}.tar.gz"
 checksum=53b0fd1092e2053d31f4707ae0485f0d09b7faafcfac0e53da06c28ecfe23c95

From f3c8e770d082faba5119cfff827697ade25738ff Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 27 Mar 2021 10:15:48 -0700
Subject: [PATCH 0990/2024] cpulimit: fix license

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

diff --git a/srcpkgs/cpulimit/template b/srcpkgs/cpulimit/template
index 4857387f4e81..9fbf6eccf66c 100644
--- a/srcpkgs/cpulimit/template
+++ b/srcpkgs/cpulimit/template
@@ -1,11 +1,11 @@
 # Template file for 'cpulimit'
 pkgname=cpulimit
 version=0.2
-revision=2
+revision=3
 build_style=gnu-makefile
 short_desc="Tool to limit the CPU usage of a process"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://github.com/opsengine/cpulimit"
 distfiles="https://github.com/opsengine/${pkgname}/archive/v${version}.tar.gz"
 checksum=64312f9ac569ddcadb615593cd002c94b76e93a0d4625d3ce1abb49e08e2c2da

From 342515c3e9324fb0bf7b0d51314c746291160d7f Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 27 Mar 2021 10:24:24 -0700
Subject: [PATCH 0991/2024] crack-attack: fix license

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

diff --git a/srcpkgs/crack-attack/template b/srcpkgs/crack-attack/template
index 422e369b84c6..df266ded665a 100644
--- a/srcpkgs/crack-attack/template
+++ b/srcpkgs/crack-attack/template
@@ -1,7 +1,7 @@
 # Template file for 'crack-attack'
 pkgname=crack-attack
 version=1.1.14
-revision=9
+revision=10
 wrksrc="$pkgname-$version"
 create_wrksrc=yes
 build_wrksrc="$wrksrc"
@@ -13,7 +13,7 @@ makedepends="gtk+-devel SDL_mixer-devel libfreeglut-devel glu-devel
 depends="desktop-file-utils"
 short_desc="Tetris Attack clone"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2.0-or-later,custom"
+license="GPL-2.0-or-later, custom:music-sound-copyright"
 homepage="http://www.nongnu.org/crack-attack/"
 distfiles="http://kojipkgs.fedoraproject.org/packages/${pkgname}/${version}/28.fc21/src/${pkgname}-${version}-28.fc21.src.rpm"
 checksum=6fb2ad5a1dcdc590fcbeb4d1925a7e55f1af27780a5550cded280475d2c08b1d

From 3b3bc5c278a563c3d84c4980443669c72d7fc7ae Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 27 Mar 2021 10:27:10 -0700
Subject: [PATCH 0992/2024] crossguid: fix license

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

diff --git a/srcpkgs/crossguid/template b/srcpkgs/crossguid/template
index 135e8d404035..c846590103fa 100644
--- a/srcpkgs/crossguid/template
+++ b/srcpkgs/crossguid/template
@@ -1,15 +1,15 @@
 # Template file for 'crossguid'
 pkgname=crossguid
 version=0.2.2
-revision=1
+revision=2
+build_style=cmake
+makedepends="libuuid-devel"
 short_desc="Lightweight cross platform C++ GUID/UUID library (git $_gitshort)"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-3"
+license="MIT"
 homepage="https://github.com/graeme-hill/crossguid"
 distfiles="$homepage/archive/v$version.tar.gz"
-makedepends="libuuid-devel"
 checksum=48321928473c682b0cdc7e17bbd3390f79f4b98ab22fef3b81a852dda81fd195
-build_style=cmake
 
 do_install() {
 	vlicense LICENSE

From ac2ee3068fd3f7bc8dd4f3b43a12f1802be2a7de Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 27 Mar 2021 10:42:18 -0700
Subject: [PATCH 0993/2024] cvm: fix license

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

diff --git a/srcpkgs/cvm/template b/srcpkgs/cvm/template
index ecee255ba856..06ef23cc8002 100644
--- a/srcpkgs/cvm/template
+++ b/srcpkgs/cvm/template
@@ -1,13 +1,13 @@
 # Template file for 'cvm'
 pkgname=cvm
 version=0.97
-revision=2
+revision=3
 build_style=gnu-makefile
-makedepends="bglibs-devel"
 hostmakedepends="libtool"
+makedepends="bglibs-devel"
 short_desc="Credential Validation Modules"
 maintainer="bougyman <bougyman@voidlinux.org>"
-license="GPL-3"
+license="GPL-2.0-or-later"
 homepage="http://untroubled.org/cvm/"
 distfiles="http://untroubled.org/cvm/cvm-${version}.tar.gz"
 checksum=82e7751d63cc2ae91457e28b5326885beb1d082d4f0695f4fdaac5ffa70a0c47

From 014cada037bcc4c1f203e99bf5459c19d88ecd52 Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Sat, 10 Apr 2021 15:27:49 -0300
Subject: [PATCH 0994/2024] salt: update to 3003.

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

diff --git a/srcpkgs/salt/template b/srcpkgs/salt/template
index 7f5386a77182..abac7da405f3 100644
--- a/srcpkgs/salt/template
+++ b/srcpkgs/salt/template
@@ -1,6 +1,6 @@
 # Template file for 'salt'
 pkgname=salt
-version=3002.5
+version=3003
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="http://saltstack.org/"
 changelog="https://docs.saltstack.com/en/latest/topics/releases/${version}.html"
 distfiles="${PYPI_SITE}/s/salt/salt-${version}.tar.gz"
-checksum=c8ab404335104351066ec1bcc42278aa77e24aaacc308603939d75aba05519af
+checksum=c4689733dfe738cf287e31cb3fdd3cb8d1606295202b18d8e66d48d372d5ca77
 conf_files="
  /etc/salt/cloud.providers.d/digitalocean.conf
  /etc/salt/cloud.providers.d/vsphere.conf

From 231fbc30fba4973e53e1a717a2353abc053e4c2b Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 11 Apr 2021 09:40:48 +0200
Subject: [PATCH 0995/2024] linux5.4: update to 5.4.111.

---
 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 da4e54344f58..1b2543f16e2a 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.110
+version=5.4.111
 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=d0f6978440e8a4b266cb1847405a764bca83667541b9e4cdbbc161fb0dd9b228
+checksum=21626132658dc34cb41b7aa7b80ecf83751890a71ac1a63d77aea9d488271a03
 python_version=3
 patch_args="-Np1"
 

From a77ab45a051161bf84ab462295d328a71f8708bf Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 11 Apr 2021 09:43:15 +0200
Subject: [PATCH 0996/2024] linux4.19: update to 4.19.186.

---
 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 5cac6f099dd0..abbc9c9ed08e 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.185
+version=4.19.186
 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=1689d78212997dae44b24bf037bc842d11d88e974d524af66f7864e5a8508597
+checksum=d8c5d7844214510e85ceb9f5236f27f63fc03535a143f3aaa0c1677a8f92e631
 python_version=2 #unverified
 patch_args="-Np1"
 

From 2a4e1ad2512fe2e0a4b0530316d68d413e38a335 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 8 Mar 2021 00:14:06 +0100
Subject: [PATCH 0997/2024] libupnp: update to 1.14.4.

also switch to github upstream.
---
 srcpkgs/libupnp/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libupnp/template b/srcpkgs/libupnp/template
index 9adb5f00da65..b13c99374a98 100644
--- a/srcpkgs/libupnp/template
+++ b/srcpkgs/libupnp/template
@@ -1,15 +1,15 @@
 # Template file for 'libupnp'
 pkgname=libupnp
-version=1.14.0
+version=1.14.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 short_desc="Portable Open Source UPnP Development Kit"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
-homepage="http://pupnp.sourceforge.net/"
-distfiles="${SOURCEFORGE_SITE}/pupnp/$pkgname-$version.tar.bz2"
-checksum=ecb23d4291968c8a7bdd4eb16fc2250dbacc16b354345a13342d67f571d35ceb
+homepage="https://pupnp.github.io/pupnp/"
+distfiles="https://github.com/pupnp/pupnp/releases/download/release-$version/$pkgname-$version.tar.bz2"
+checksum=cd649ef53070e9b88680f730ed5b3f919658582d43dd315a2ed8b6105c6fbe63
 
 CFLAGS="-D_FILE_OFFSET_BITS=64"
 

From 0aef1e4b7c863aea4a6cb6eb14aef6693ab0c935 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 10 Apr 2021 17:06:00 +0200
Subject: [PATCH 0998/2024] openradtool: update to 0.12.6.

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

diff --git a/srcpkgs/openradtool/template b/srcpkgs/openradtool/template
index e1c588acae49..a04b3e7ec1a7 100644
--- a/srcpkgs/openradtool/template
+++ b/srcpkgs/openradtool/template
@@ -1,6 +1,6 @@
 # Template file for 'openradtool'
 pkgname=openradtool
-version=0.12.5
+version=0.12.6
 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=f74d4cb1f72124a6581e57392ca46b851870ebf0928addc71d6db90fe43992ee
+checksum=fec033245ad9371292f92eb87fce77e3e1d6b67ca131dcd181d36dc8df201023
 
 post_install() {
 	sed -n '2,16p' main.c >LICENSE

From 32aa37cb444bd405c091a531f995f2f7b141d548 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 11 Apr 2021 00:59:38 +0200
Subject: [PATCH 0999/2024] harfbuzz: update to 2.8.0.

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

diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index 1a1506276997..62ea9a3ffda3 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -1,6 +1,6 @@
 # Template file for 'harfbuzz'
 pkgname=harfbuzz
-version=2.7.4
+version=2.8.0
 revision=1
 build_style=meson
 build_helper=gir
@@ -14,7 +14,7 @@ license="MIT"
 homepage="http://www.freedesktop.org/wiki/Software/HarfBuzz/"
 changelog="https://github.com/harfbuzz/harfbuzz/raw/master/NEWS"
 distfiles="https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz"
-checksum=6ad11d653347bd25d8317589df4e431a2de372c0cf9be3543368e07ec23bb8e7
+checksum=a1079fd021adaf5683351f34587a255975cc3bcadba31246ae40ebebb95ecd42
 
 post_install() {
 	vlicense COPYING LICENSE

From 947581cd6a37dff3184a3ef973875aab69deea2f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 11 Apr 2021 17:06:42 +0200
Subject: [PATCH 1000/2024] alttab: update to 1.6.0.

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

diff --git a/srcpkgs/alttab/template b/srcpkgs/alttab/template
index 66d8da9af66d..42a9961687ef 100644
--- a/srcpkgs/alttab/template
+++ b/srcpkgs/alttab/template
@@ -1,17 +1,20 @@
 # Template file for 'alttab'
 pkgname=alttab
-version=1.5.0
+version=1.6.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXft-devel libXmu-devel libXrandr-devel
  libXrender-devel libpng-devel libXpm-devel uthash"
+checkdepends="procps-ng xvfb-run xeyes xprop"
 short_desc="Task switcher for minimalistic window managers"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/sagb/alttab"
 distfiles="https://github.com/sagb/alttab/archive/v${version}.tar.gz"
-checksum=d170425a34d1a92cf0eb5ba7306bf77729a6c04f211593cc5fdd8a0ab583a280
+checksum=9d362266a490a969b6398ccef1514dca2668c38c4b824bb11c8d16923bcb58ee
+
+make_check=no # needs cnee/xnee which is not packaged
 
 CFLAGS="-fcommon"
 

From a601cf34051bda25f2dc12384e87c80e6e697378 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 11 Apr 2021 17:24:59 +0200
Subject: [PATCH 1001/2024] binwalk: update to 2.3.1.

---
 srcpkgs/binwalk/patches/fallback-version.patch | 14 ++++++++++++++
 srcpkgs/binwalk/template                       |  8 ++++----
 2 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/binwalk/patches/fallback-version.patch

diff --git a/srcpkgs/binwalk/patches/fallback-version.patch b/srcpkgs/binwalk/patches/fallback-version.patch
new file mode 100644
index 000000000000..b319bfebb5e0
--- /dev/null
+++ b/srcpkgs/binwalk/patches/fallback-version.patch
@@ -0,0 +1,14 @@
+--- src/binwalk/core/version.py.orig
++++ src/binwalk/core/version.py
+@@ -1,6 +1,10 @@
+ try:
+     from importlib import metadata
+-    get_version = lambda : metadata.version("binwalk")
++    def get_version():
++        try:
++            return metadata.version("binwalk")
++        except metadata.PackageNotFoundError:
++            return "unknown"
+ except ImportError:
+     try:
+         # Running on pre-3.8 Python; use importlib-metadata package
diff --git a/srcpkgs/binwalk/template b/srcpkgs/binwalk/template
index fa2328e7ae0a..6c61fff87aeb 100644
--- a/srcpkgs/binwalk/template
+++ b/srcpkgs/binwalk/template
@@ -1,18 +1,18 @@
 # Template file for 'binwalk'
 pkgname=binwalk
-version=2.2.0
-revision=3
+version=2.3.1
+revision=1
 build_style=python3-module
 pycompile_module="binwalk"
 hostmakedepends="python3"
 depends="python3"
-checkdepends="python3-nose"
+checkdepends="python3-coverage python3-nose"
 short_desc="Easy tool for analyzing/reversing/extracting firmware images"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/ReFirmLabs/binwalk"
 distfiles="https://github.com/ReFirmLabs/binwalk/archive/v${version}.tar.gz"
-checksum=f5495f0e4c5575023d593f7c087c367675df6aeb7f4d9a2966e49763924daa27
+checksum=7ec9d8fcb8686f4060d37e1096669e3ed8ce1194c91ad80199622448bcc01b19
 
 post_extract() {
 	vsed -i -e 's;/etc/bash_completion.d/%s;%s.bash;' setup.py

From 22ab7d6dd8ba4dc2393d3516d63c9354541036ca Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 11 Apr 2021 18:40:23 +0200
Subject: [PATCH 1002/2024] zbar: ignore prerelases.

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

diff --git a/srcpkgs/zbar/update b/srcpkgs/zbar/update
new file mode 100644
index 000000000000..e797246e05a6
--- /dev/null
+++ b/srcpkgs/zbar/update
@@ -0,0 +1 @@
+ignore='*.*.9?'

From 0e5be01ef9378e85657695aa5829187ad8053da9 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 10 Apr 2021 22:04:27 +0200
Subject: [PATCH 1003/2024] cdogs-sdl: update to 0.9.1.

---
 srcpkgs/cdogs-sdl-data     |  1 -
 srcpkgs/cdogs-sdl/template | 12 +++---------
 2 files changed, 3 insertions(+), 10 deletions(-)
 delete mode 120000 srcpkgs/cdogs-sdl-data

diff --git a/srcpkgs/cdogs-sdl-data b/srcpkgs/cdogs-sdl-data
deleted file mode 120000
index c95cdde7057a..000000000000
--- a/srcpkgs/cdogs-sdl-data
+++ /dev/null
@@ -1 +0,0 @@
-cdogs-sdl
\ No newline at end of file
diff --git a/srcpkgs/cdogs-sdl/template b/srcpkgs/cdogs-sdl/template
index 8b5ef0911afb..add7d111a21d 100644
--- a/srcpkgs/cdogs-sdl/template
+++ b/srcpkgs/cdogs-sdl/template
@@ -1,7 +1,7 @@
 # Template file for 'cdogs-sdl'
 pkgname=cdogs-sdl
-version=0.7.3
-revision=2
+version=0.9.1
+revision=1
 build_style=cmake
 configure_args="-DCDOGS_DATA_DIR=/usr/share/cdogs/"
 hostmakedepends="pkg-config"
@@ -13,16 +13,10 @@ license="GPL-2.0-or-later"
 homepage="http://cxong.github.io/cdogs-sdl/"
 distfiles="https://github.com/cxong/cdogs-sdl/archive/${version}.tar.gz"
 checksum=0a19a619dd02f647d680b245abc97359e04cdc4231a61b86397a37100907195c
+replaces="cdogs-sdl-data<=0.7.3"
 
 CFLAGS="-fcommon"
 
 pre_configure() {
 	vsed -i CMakeLists.txt -e "s; -Werror;;"
 }
-
-cdogs-sdl-data_package() {
-	short_desc+=" - data"
-	pkg_install() {
-		vmove usr/share/cdogs
-	}
-}

From e2a1d349f68ba13b16072d7c82b4ed019e1689da Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 11 Apr 2021 20:40:04 +0200
Subject: [PATCH 1004/2024] graphene: update to 1.10.6.

also fix comparision error.

ref: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/3976#note_1079639

closes #30125.
---
 ...x-comparision-in-graphene_ray_intersect_box.patch | 12 ++++++++++++
 srcpkgs/graphene/template                            |  8 ++++----
 2 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/graphene/patches/0001-fix-comparision-in-graphene_ray_intersect_box.patch

diff --git a/srcpkgs/graphene/patches/0001-fix-comparision-in-graphene_ray_intersect_box.patch b/srcpkgs/graphene/patches/0001-fix-comparision-in-graphene_ray_intersect_box.patch
new file mode 100644
index 000000000000..083146f9243e
--- /dev/null
+++ b/srcpkgs/graphene/patches/0001-fix-comparision-in-graphene_ray_intersect_box.patch
@@ -0,0 +1,12 @@
+diff --git src/graphene-ray.c src/graphene-ray.c
+index 66c3393..9151300 100644
+--- src/graphene-ray.c
++++ src/graphene-ray.c
+@@ -563,7 +563,7 @@ graphene_ray_intersect_box (const graphene_ray_t *r,
+ #else
+   if (ty_min > tx_min || fpclassify (tx_min) == FP_NAN)
+     tx_min = ty_min;
+-  if (ty_max > tx_max || fpclassify (tx_max) == FP_NAN)
++  if (ty_max < tx_max || fpclassify (tx_max) == FP_NAN)
+     tx_max = ty_max;
+ #endif
diff --git a/srcpkgs/graphene/template b/srcpkgs/graphene/template
index e868239bfa08..db7ca1f7563d 100644
--- a/srcpkgs/graphene/template
+++ b/srcpkgs/graphene/template
@@ -1,11 +1,11 @@
 # Template file for 'graphene'
 pkgname=graphene
-version=1.10.2
+version=1.10.6
 revision=1
 build_style=meson
 build_helper="gir"
-configure_args="-Dtests=false -Dbenchmarks=false
- -Dintrospection=$(vopt_if gir true false)"
+configure_args="-Dbenchmarks=false -Dinstalled_tests=false
+ -Dintrospection=$(vopt_if gir enabled disabled) -Dsse2=true"
 hostmakedepends="pkg-config"
 makedepends="libglib-devel"
 short_desc="Thin layer of types for graphic libraries"
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/ebassi/graphene"
 distfiles="${GNOME_SITE}/graphene/${version%.*}/graphene-${version}.tar.xz"
-checksum=e97de8208f1aac4f913d4fa71ab73a7034e807186feb2abe55876e51c425a7f6
+checksum=80ae57723e4608e6875626a88aaa6f56dd25df75024bd16e9d77e718c3560b25
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*) configure_args+=" -Darm_neon=false" ;;

From 2792b85debb0dd16594cbc59acc95dd5c2465dfa Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 12 Apr 2021 00:00:43 +0200
Subject: [PATCH 1005/2024] mozjs78: update to 78.9.0.

---
 srcpkgs/mozjs78/patches/build-non-jit-32bit.patch | 14 --------------
 srcpkgs/mozjs78/template                          |  4 ++--
 2 files changed, 2 insertions(+), 16 deletions(-)
 delete mode 100644 srcpkgs/mozjs78/patches/build-non-jit-32bit.patch

diff --git a/srcpkgs/mozjs78/patches/build-non-jit-32bit.patch b/srcpkgs/mozjs78/patches/build-non-jit-32bit.patch
deleted file mode 100644
index f2cf04d79aca..000000000000
--- a/srcpkgs/mozjs78/patches/build-non-jit-32bit.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-On 32-bit systems without JIT, the GC doesn't like 4-byte alignment,
-so enforce a stricter one.
-
---- a/js/src/jit/none/MacroAssembler-none.h
-+++ b/js/src/jit/none/MacroAssembler-none.h
-@@ -100,7 +100,7 @@ static constexpr Register WasmTlsReg{Registers::invalid_reg};
- static constexpr Register WasmJitEntryReturnScratch{Registers::invalid_reg};
- 
- static constexpr uint32_t ABIStackAlignment = 4;
--static constexpr uint32_t CodeAlignment = sizeof(void*);
-+static constexpr uint32_t CodeAlignment = 8;
- static constexpr uint32_t JitStackAlignment = 8;
- static constexpr uint32_t JitStackValueAlignment =
-     JitStackAlignment / sizeof(Value);
diff --git a/srcpkgs/mozjs78/template b/srcpkgs/mozjs78/template
index ebfb51801916..7b437946b196 100644
--- a/srcpkgs/mozjs78/template
+++ b/srcpkgs/mozjs78/template
@@ -1,6 +1,6 @@
 # Template file for 'mozjs78'
 pkgname=mozjs78
-version=78.2.0
+version=78.9.0
 revision=1
 wrksrc="firefox-${version}"
 build_wrksrc=js/src
@@ -16,7 +16,7 @@ maintainer="q66 <daniel@octaforge.org>"
 license="MPL-2.0"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
-checksum=965ccfcbb8c0aa97639911997c54be0fcf896fd388b03138952089af675ea918
+checksum=8e03ac1dfc5ac804c8b13a529414a9387e0425e545bb2f4462d74c3175e64864
 patch_args="-Np1"
 
 CXXFLAGS="-Wno-class-memaccess"

From 29165adc5c833a661832b4c13de408940dbd61f8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 12 Apr 2021 00:07:12 +0200
Subject: [PATCH 1006/2024] mozjs78: port build-non-jit-32bit patch

---
 srcpkgs/mozjs78/patches/build-non-jit-32bit.patch | 14 ++++++++++++++
 srcpkgs/mozjs78/template                          |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/mozjs78/patches/build-non-jit-32bit.patch

diff --git a/srcpkgs/mozjs78/patches/build-non-jit-32bit.patch b/srcpkgs/mozjs78/patches/build-non-jit-32bit.patch
new file mode 100644
index 000000000000..e3938fe8780c
--- /dev/null
+++ b/srcpkgs/mozjs78/patches/build-non-jit-32bit.patch
@@ -0,0 +1,14 @@
+On 32-bit systems without JIT, the GC doesn't like 4-byte alignment,
+so enforce a stricter one.
+
+--- js/src/jit/none/MacroAssembler-none.h.orig	2021-04-12 00:05:00.691183973 +0200
++++ js/src/jit/none/MacroAssembler-none.h	2021-04-12 00:05:10.336183909 +0200
+@@ -100,7 +100,7 @@ static constexpr Register WasmTlsReg{Reg
+ static constexpr Register WasmJitEntryReturnScratch{Registers::invalid_reg};
+ 
+ static constexpr uint32_t ABIStackAlignment = 4;
+-static constexpr uint32_t CodeAlignment = 16;
++static constexpr uint32_t CodeAlignment = 8;
+ static constexpr uint32_t JitStackAlignment = 8;
+ static constexpr uint32_t JitStackValueAlignment =
+     JitStackAlignment / sizeof(Value);
diff --git a/srcpkgs/mozjs78/template b/srcpkgs/mozjs78/template
index 7b437946b196..ee443e7a64c8 100644
--- a/srcpkgs/mozjs78/template
+++ b/srcpkgs/mozjs78/template
@@ -1,7 +1,7 @@
 # Template file for 'mozjs78'
 pkgname=mozjs78
 version=78.9.0
-revision=1
+revision=2
 wrksrc="firefox-${version}"
 build_wrksrc=js/src
 build_style=gnu-configure

From 5a20f203232d5601dbc21713ed3676bb693ae991 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 11 Apr 2021 17:45:06 -0500
Subject: [PATCH 1007/2024] cdogs-sdl: fix checksum

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

diff --git a/srcpkgs/cdogs-sdl/template b/srcpkgs/cdogs-sdl/template
index add7d111a21d..e2783fff55d3 100644
--- a/srcpkgs/cdogs-sdl/template
+++ b/srcpkgs/cdogs-sdl/template
@@ -12,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://cxong.github.io/cdogs-sdl/"
 distfiles="https://github.com/cxong/cdogs-sdl/archive/${version}.tar.gz"
-checksum=0a19a619dd02f647d680b245abc97359e04cdc4231a61b86397a37100907195c
+checksum=fee87e90371e6c8f679e75a3628d82b863a67250bd822c672a4017f6a078eb56
 replaces="cdogs-sdl-data<=0.7.3"
 
 CFLAGS="-fcommon"

From 983da5c87a62cebab6cdb48a32783c4d76af563c Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 11 Apr 2021 18:01:36 -0500
Subject: [PATCH 1008/2024] cdogs-sdl: fix build

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

diff --git a/srcpkgs/cdogs-sdl/template b/srcpkgs/cdogs-sdl/template
index e2783fff55d3..d653cc0dcbca 100644
--- a/srcpkgs/cdogs-sdl/template
+++ b/srcpkgs/cdogs-sdl/template
@@ -4,8 +4,9 @@ version=0.9.1
 revision=1
 build_style=cmake
 configure_args="-DCDOGS_DATA_DIR=/usr/share/cdogs/"
-hostmakedepends="pkg-config"
-makedepends="SDL2-devel SDL2_mixer-devel SDL2_image-devel SDL2_net-devel"
+hostmakedepends="pkg-config python3-protobuf protobuf26"
+makedepends="SDL2-devel SDL2_mixer-devel SDL2_image-devel SDL2_net-devel
+ gtk+3-devel protobuf-devel"
 depends="cdogs-sdl-data>=${version}_${revision}"
 short_desc="Classic overhead run-and-gun game"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 999f4bedec14ef5a5289965aa0a665008bb368fb Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Sat, 10 Apr 2021 23:07:46 +0200
Subject: [PATCH 1009/2024] MultiMarkdown: remove /usr/{LICENSE,README}.txt

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

diff --git a/srcpkgs/MultiMarkdown/template b/srcpkgs/MultiMarkdown/template
index 96d153d87297..75bd1e04e476 100644
--- a/srcpkgs/MultiMarkdown/template
+++ b/srcpkgs/MultiMarkdown/template
@@ -1,7 +1,7 @@
 # Template file for 'MultiMarkdown'
 pkgname=MultiMarkdown
 version=6.6.0
-revision=1
+revision=2
 wrksrc="$pkgname-6-$version"
 build_style=cmake
 hostmakedepends="perl"
@@ -18,5 +18,6 @@ post_install() {
 	mv ${DESTDIR}/usr/bin/markdown ${DESTDIR}/usr/bin/multimarkdown-markdown
 	# Avoid conflict with mtools
 	mv ${DESTDIR}/usr/bin/mmd  ${DESTDIR}/usr/bin/multimarkdown-mmd
+	rm ${DESTDIR}/usr/{LICENSE,README}.txt
 	vlicense LICENSE
 }

From 8f3419a0f9f492b7ed71dfa9d4be71ee973e8aeb 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, 12 Apr 2021 07:46:06 +0700
Subject: [PATCH 1010/2024] Haru: build versioned SONAME

---
 common/shlibs                          |  2 +-
 srcpkgs/Haru/patches/Add-license.patch | 40 --------------------------
 srcpkgs/Haru/template                  | 15 +++++-----
 3 files changed, 9 insertions(+), 48 deletions(-)
 delete mode 100644 srcpkgs/Haru/patches/Add-license.patch

diff --git a/common/shlibs b/common/shlibs
index 2e3a395214ca..98b28735c4c6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3158,7 +3158,7 @@ libembb_mtapi_c.so embb-devel-1.0.0_1
 libembb_mtapi_network_c.so embb-devel-1.0.0_1
 libembb_base_cpp.so embb-devel-1.0.0_1
 libembb_base_c.so embb-devel-1.0.0_1
-libhpdf.so Haru-devel-2.3.0_1
+libhpdf-2.3.0.so Haru-2.3.0_3
 libKF5Contacts.so.5 kcontacts-5.63.0_1
 libKF5AkonadiPrivate.so.5 akonadi5-17.12.0_1
 libKF5AkonadiCore.so.5 akonadi5-17.12.0_1
diff --git a/srcpkgs/Haru/patches/Add-license.patch b/srcpkgs/Haru/patches/Add-license.patch
deleted file mode 100644
index 367048748f4e..000000000000
--- a/srcpkgs/Haru/patches/Add-license.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 24443b76f4daf74c21307044e81b4942bd4e586a Mon Sep 17 00:00:00 2001
-From: Maciej Klemarczyk <m.klemarczyk+git@live.com>
-Date: Sun, 28 Jun 2015 12:05:05 +0200
-Subject: [PATCH 4/4] Missing LICENSE file was created
-
-File was created based on license provided by README file.
----
- LICENCE | 20 ++++++++++++++++++++
- 1 file changed, 20 insertions(+)
- create mode 100644 LICENSE
-
-diff --git LICENSE LICENSE
-new file mode 100644
-index 0000000..bdf271e
---- /dev/null
-+++ LICENSE
-@@ -0,0 +1,20 @@
-+
-+Copyright (C) 1999-2006 Takeshi Kanno
-+Copyright (C) 2007-2009 Antony Dovgal
-+
-+This software is provided 'as-is', without any express or implied warranty.
-+
-+In no event will the authors be held liable for any damages arising from the 
-+use of this software.
-+
-+Permission is granted to anyone to use this software for any purpose,including 
-+commercial applications, and to alter it and redistribute it freely, subject 
-+to the following restrictions:
-+
-+ 1. The origin of this software must not be misrepresented; you must not claim 
-+    that you wrote the original software. If you use this software in a 
-+    product, an acknowledgment in the product documentation would be 
-+    appreciated but is not required.
-+ 2. Altered source versions must be plainly marked as such, and must not be 
-+    misrepresented as being the original software.
-+ 3. This notice may not be removed or altered from any source distribution.
--- 
-2.24.0
-
diff --git a/srcpkgs/Haru/template b/srcpkgs/Haru/template
index c343c70ec5de..80db1e0e89f4 100644
--- a/srcpkgs/Haru/template
+++ b/srcpkgs/Haru/template
@@ -1,19 +1,20 @@
 # Template file for 'Haru'
 pkgname=Haru
 version=2.3.0
-revision=2
+revision=3
 wrksrc="libharu-RELEASE_${version//./_}"
-build_style=cmake
+build_style=gnu-configure
+hostmakedepends="automake libtool"
 makedepends="zlib-devel libpng-devel"
 short_desc="Free, cross platform, open source library for generating PDF files"
 maintainer="Florian Eich <flrn@nrmncr.net>"
-license="ZLIB/LIBPNG"
+license="Zlib"
 homepage="http://libharu.org/"
 distfiles="https://github.com/libharu/libharu/archive/RELEASE_${version//./_}.tar.gz"
 checksum=8f9e68cc5d5f7d53d1bc61a1ed876add1faf4f91070dbc360d8b259f46d9a4d2
 
-post_install() {
-	vlicense LICENSE
+pre_configure() {
+	make -f build.mk
 }
 
 Haru-devel_package() {
@@ -21,7 +22,7 @@ Haru-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/lib/*.a
-		vmove usr/lib/*.so
+		vmove "usr/lib/*.a"
+		vmove usr/lib/libhpdf.so
 	}
 }

From ae11a18a5f656d5dafc4e002724401cda7ebedf6 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, 12 Apr 2021 07:48:25 +0700
Subject: [PATCH 1011/2024] python3-anytree:  build with setuptools_scm

While we're at it, remove /usr/LICENSE (paper42).

Close: #30134
---
 srcpkgs/python3-anytree/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-anytree/template b/srcpkgs/python3-anytree/template
index e767018e6331..8f1f4a2d8f30 100644
--- a/srcpkgs/python3-anytree/template
+++ b/srcpkgs/python3-anytree/template
@@ -1,14 +1,19 @@
 # Template file for 'python3-anytree'
 pkgname=python3-anytree
 version=2.8.0
-revision=2
+revision=3
 wrksrc="anytree-${version}"
 build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm"
 depends="python3-six"
+checkdepends="python3-six python3-coverage python3-nose graphviz"
 short_desc="Powerful and lightweight Python tree data structure"
 maintainer="q66 <daniel@octaforge.org>"
 license="Apache-2.0"
 homepage="https://github.com/c0fec0de/anytree"
 distfiles="${PYPI_SITE}/a/anytree/anytree-${version}.tar.gz"
 checksum=3f0f93f355a91bc3e6245319bf4c1d50e3416cc7a35cc1133c1ff38306bbccab
+
+post_install() {
+	rm ${DESTDIR}/usr/LICENSE
+}

From 82d34f9a58b2e502a09072991d4965d661f59cc1 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Sun, 11 Apr 2021 22:31:23 +0200
Subject: [PATCH 1012/2024] lazygit: update to 0.27.4.

Closes: #30166 [via git-merge-pr]
---
 srcpkgs/lazygit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lazygit/template b/srcpkgs/lazygit/template
index 3caebf1d10f2..c725652ba15f 100644
--- a/srcpkgs/lazygit/template
+++ b/srcpkgs/lazygit/template
@@ -1,6 +1,6 @@
 # Template file for 'lazygit'
 pkgname=lazygit
-version=0.26.1
+version=0.27.4
 revision=1
 build_style=go
 go_import_path=github.com/jesseduffield/lazygit
@@ -12,7 +12,7 @@ maintainer="Nathan Owens <ndowens@artixlinux.org>"
 license="MIT"
 homepage="https://github.com/jesseduffield/lazygit"
 distfiles="https://github.com/jesseduffield/lazygit/archive/v${version}.tar.gz"
-checksum=7bfda18345993206d4d388ea0370e9b54af0354d37f4a64803461889b361d547
+checksum=8036c9b9539599fe9c112ed46d6234b3139a9dddc188b05cfa3bccfdb01422ca
 
 post_install() {
 	vlicense LICENSE

From ae019fcefd0f30098b47a44cc2deb03a787ad172 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Sun, 11 Apr 2021 20:52:52 +0200
Subject: [PATCH 1013/2024] just: update to 0.9.0.

Closes: #30163 [via git-merge-pr]
---
 srcpkgs/just/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/just/template b/srcpkgs/just/template
index d4266e9f158b..e351ac32ad68 100644
--- a/srcpkgs/just/template
+++ b/srcpkgs/just/template
@@ -1,6 +1,6 @@
 # Template file for 'just'
 pkgname=just
-version=0.8.4
+version=0.9.0
 revision=1
 build_style=cargo
 short_desc="Just a command runner"
@@ -9,7 +9,7 @@ license="CC0-1.0"
 homepage="https://github.com/casey/just"
 changelog="https://raw.githubusercontent.com/casey/just/master/CHANGELOG.md"
 distfiles="https://github.com/casey/just/archive/v${version}.tar.gz"
-checksum=7aee472e4b70e62e89d7d5185493a3c680aeae4cc323c842e4c5b9b8af47040a
+checksum=877fdd517722ec1a554b046e1a9fd112f3503d91211702895c5ba12b29dcbcc6
 
 # Fix failing test
 pre_check() {

From 5cd95420c66248adea6fff6f9f6d879857d8c801 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sun, 11 Apr 2021 19:43:30 +0200
Subject: [PATCH 1014/2024] btfs: update to 2.24.

Closes: #30162 [via git-merge-pr]
---
 srcpkgs/btfs/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/btfs/template b/srcpkgs/btfs/template
index 78af3c6bcc97..a41afd1e2db5 100644
--- a/srcpkgs/btfs/template
+++ b/srcpkgs/btfs/template
@@ -1,7 +1,7 @@
 # Template file for 'btfs'
 pkgname=btfs
-version=2.23
-revision=2
+version=2.24
+revision=1
 build_style=gnu-configure
 hostmakedepends="automake pkg-config"
 makedepends="boost-devel fuse-devel libcurl-devel libtorrent-rasterbar-devel"
@@ -11,7 +11,7 @@ maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/johang/btfs"
 distfiles="https://github.com/johang/btfs/archive/v${version}.tar.gz"
-checksum=2832817ea3aa73ff7af60a547736d0a681111816d95b76a999935b6f90491fa6
+checksum=d71ddefe3c572e05362542a0d9fd0240d8d4e1578ace55a8b3245176e7fd8935
 
 pre_configure() {
 	autoreconf -fi

From c4f11f9379a6eab735ac01d8f16258c41937267e Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sun, 11 Apr 2021 13:15:58 +0200
Subject: [PATCH 1015/2024] stagit: update to 0.9.5.

Closes: #30159 [via git-merge-pr]
---
 srcpkgs/stagit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/stagit/template b/srcpkgs/stagit/template
index 415761dc7e2f..89c5a8cb177c 100644
--- a/srcpkgs/stagit/template
+++ b/srcpkgs/stagit/template
@@ -1,6 +1,6 @@
 # Template file for 'stagit'
 pkgname=stagit
-version=0.9.4
+version=0.9.5
 revision=1
 build_style=gnu-makefile
 make_install_args="MANPREFIX=/usr/share/man"
@@ -10,7 +10,7 @@ maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="MIT"
 homepage="https://codemadness.org/git/stagit/log.html"
 distfiles="https://codemadness.org/releases/stagit/${pkgname}-${version}.tar.gz"
-checksum=8889ab13fa345729cdc3cc92c8fdce10d49f6660f39a60def7646c86d8a61300
+checksum=025a17c7be3a4e98a2319efc4eb6329e9ea6a778b2b24b0eb97a342ece9bb039
 LDFLAGS="-lgit2"
 
 post_install() {

From 966d07faa085447b831db773e4e75bf9f22bd667 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sun, 11 Apr 2021 13:17:15 +0200
Subject: [PATCH 1016/2024] acpica-utils: update to 20210331.

Closes: #30158 [via git-merge-pr]
---
 srcpkgs/acpica-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/acpica-utils/template b/srcpkgs/acpica-utils/template
index 6bcf51414cf1..bf2f0df5d93d 100644
--- a/srcpkgs/acpica-utils/template
+++ b/srcpkgs/acpica-utils/template
@@ -1,6 +1,6 @@
 # Template file for 'acpica-utils'
 pkgname=acpica-utils
-version=20210105
+version=20210331
 revision=1
 archs="i686* x86_64* aarch64*"
 wrksrc="acpica-unix-${version}"
@@ -10,7 +10,7 @@ maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="GPL-2.0-only, BSD-3-Clause"
 homepage="https://www.acpica.org/"
 distfiles="https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz"
-checksum=a9be7b749025e60f93fde2fe531bfe0d84a33641d3e0c9b0f6049f996dbb1ff8
+checksum=b49237a2c3df58b57310612ec3a6ebee69e1a525b5efeec7152faf32a03b7068
 
 do_build() {
 	vsed -e 's/-Werror//g' \

From c42c08c2400dc58dec8add24d030ddf4dba4046c Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sun, 11 Apr 2021 13:16:20 +0200
Subject: [PATCH 1017/2024] sqlite: update to 3.35.4.

Closes: #30156 [via git-merge-pr]
---
 srcpkgs/sqlite/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sqlite/template b/srcpkgs/sqlite/template
index 84116b6e638d..52a9f0d3e298 100644
--- a/srcpkgs/sqlite/template
+++ b/srcpkgs/sqlite/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlite'
 pkgname=sqlite
-version=3.35.3
+version=3.35.4
 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=ecbccdd440bdf32c0e1bb3611d635239e3b5af268248d130d0445a32daf0274b
+checksum=7771525dff0185bfe9638ccce23faa0e1451757ddbda5a6c853bb80b923a512d
 
 CFLAGS="-DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_COLUMN_METADATA \
  -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE -DSQLITE_ENABLE_JSON1 \

From d1aa5446805f1a2c825d5b4d0b6b997a310728f6 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sun, 11 Apr 2021 13:17:35 +0200
Subject: [PATCH 1018/2024] file: update to 5.40.

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

diff --git a/srcpkgs/file/template b/srcpkgs/file/template
index 83d62af699a4..0818250c798c 100644
--- a/srcpkgs/file/template
+++ b/srcpkgs/file/template
@@ -1,6 +1,6 @@
 # Template file for 'file'
 pkgname=file
-version=5.39
+version=5.40
 revision=1
 bootstrap=yes
 build_style=gnu-configure
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="http://www.darwinsys.com/file/"
 distfiles="https://astron.com/pub/file/file-${version}.tar.gz"
-checksum=f05d286a76d9556243d0cb05814929c2ecf3a5ba07963f8f70bfaaa70517fad1
+checksum=167321f43c148a553f68a0ea7f579821ef3b11c27b8cbe158e4df897e4a5dd57
 
 if [ -z "$CHROOT_READY" ]; then
 	# libseccomp's default=auto

From c0f24e8cee92a9103a2b1c6cf7f287b7ea61857a Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sun, 11 Apr 2021 13:19:56 +0200
Subject: [PATCH 1019/2024] irssi: update to 1.2.3.

Closes: #30152 [via git-merge-pr]
---
 srcpkgs/irssi/patches/glib-2-63.patch | 40 ---------------------------
 srcpkgs/irssi/template                |  6 ++--
 2 files changed, 3 insertions(+), 43 deletions(-)
 delete mode 100644 srcpkgs/irssi/patches/glib-2-63.patch

diff --git a/srcpkgs/irssi/patches/glib-2-63.patch b/srcpkgs/irssi/patches/glib-2-63.patch
deleted file mode 100644
index 669b04d9a6a3..000000000000
--- a/srcpkgs/irssi/patches/glib-2-63.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-https://github.com/irssi/irssi/releases/download/1.2.2/glib-2-63.patch
-
-From a0544571a80196e5b7705f56e6e2cbcdf7b4d80e Mon Sep 17 00:00:00 2001
-From: ailin-nemui <ailin-nemui@users.noreply.github.com>
-Date: Thu, 23 Apr 2020 21:45:15 +0200
-Subject: [PATCH] manually handle NUL unicode in g_utf8_get_next_char_validated
-
-A change in GLib 2.63 broke some assumptions in Irssi that the null-byte
-NUL / U+0000 is a valid Unicode character. This would occur when the
-user types Ctrl+Space. As a result, the input loop never manages to
-process the NUL-byte (and any other user input that follows, ever).
-
-This patch adds a manual check that properly advances the input loop if
-GLib returns -2 (incomplete character) despite the length being positive
-and a NUL is in first position.
-
-Fixes #1180
-https://gitlab.gnome.org/GNOME/glib/-/merge_requests/967
-https://gitlab.gnome.org/GNOME/glib/-/issues/2093
----
- src/fe-text/term-terminfo.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/fe-text/term-terminfo.c b/src/fe-text/term-terminfo.c
-index 5235f72d2..78496a64f 100644
---- src/fe-text/term-terminfo.c
-+++ src/fe-text/term-terminfo.c
-@@ -672,7 +672,11 @@ void term_stop(void)
- 
- static int input_utf8(const unsigned char *buffer, int size, unichar *result)
- {
--	unichar c = g_utf8_get_char_validated((char *)buffer, size);
-+	unichar c = g_utf8_get_char_validated((char *) buffer, size);
-+
-+	/* GLib >= 2.63 do not accept Unicode NUL anymore */
-+	if (c == (unichar) -2 && *buffer == 0 && size > 0)
-+		c = 0;
- 
- 	switch (c) {
- 	case (unichar)-1:
diff --git a/srcpkgs/irssi/template b/srcpkgs/irssi/template
index 4d8df6bfd24f..b47640ec94d9 100644
--- a/srcpkgs/irssi/template
+++ b/srcpkgs/irssi/template
@@ -1,7 +1,7 @@
 # Template file for 'irssi'
 pkgname=irssi
-version=1.2.2
-revision=7
+version=1.2.3
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static --with-proxy --enable-true-color
  --with-otr --with-perl=module"
@@ -15,7 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.irssi.org"
 distfiles="https://github.com/irssi/irssi/releases/download/${version}/irssi-${version}.tar.gz"
-checksum=53182861d4d2be6db35fa7e3f0524a64d2a54a374307574dab5f5362bfea563c
+checksum=29cbb746d7e57591d8fcf799406fb28cb7c2d734bc4288cbb8b4c4e05cf99c25
 
 LDFLAGS="-lncursesw"
 

From e69945b005f3bd3d2da247499ada83b52dc01a7c Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sun, 11 Apr 2021 13:19:25 +0200
Subject: [PATCH 1020/2024] fetchmail: update to 6.4.18.

Closes: #30151 [via git-merge-pr]
---
 srcpkgs/fetchmail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

From 50e6f5e6cef0cb656e7115897a837e45dd870990 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sun, 11 Apr 2021 13:19:06 +0200
Subject: [PATCH 1021/2024] libassuan: update to 2.5.5.

Closes: #30150 [via git-merge-pr]
---
 srcpkgs/libassuan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libassuan/template b/srcpkgs/libassuan/template
index 11c7f184e75c..c74d8b9b39f0 100644
--- a/srcpkgs/libassuan/template
+++ b/srcpkgs/libassuan/template
@@ -1,6 +1,6 @@
 # Template file for 'libassuan'
 pkgname=libassuan
-version=2.5.4
+version=2.5.5
 revision=1
 build_style=gnu-configure
 configure_args="--with-libgpg-error-prefix=${XBPS_CROSS_BASE}/usr"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnupg.org/related_software/libassuan"
 distfiles="https://www.gnupg.org/ftp/gcrypt/libassuan/libassuan-${version}.tar.bz2"
-checksum=c080ee96b3bd519edd696cfcebdecf19a3952189178db9887be713ccbcb5fbf0
+checksum=8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4
 
 libassuan-devel_package() {
 	depends="libgpg-error-devel ${sourcepkg}>=${version}_${revision}"

From 75fd407323eafcc574fa6644b117b407632e2fa6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sun, 11 Apr 2021 13:02:14 +0200
Subject: [PATCH 1022/2024] ccls: update to 0.20210330.

Closes: #30149 [via git-merge-pr]
---
 srcpkgs/ccls/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ccls/template b/srcpkgs/ccls/template
index 2b0d8a4b94ec..f2fcebc6b016 100644
--- a/srcpkgs/ccls/template
+++ b/srcpkgs/ccls/template
@@ -1,6 +1,6 @@
 # Template file for 'ccls'
 pkgname=ccls
-version=0.20201219
+version=0.20210330
 revision=1
 build_style=cmake
 hostmakedepends="clang-tools-extra"
@@ -10,7 +10,7 @@ maintainer="Nathan Owens <ndowens@artixlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/MaskRay/ccls"
 distfiles="https://github.com/MaskRay/ccls/archive/${version}.tar.gz"
-checksum=edd3435bc7e55d9e5dc931932f9c98275a6a28d1ab1f66416110e029f3f2882a
+checksum=28c228f49dfc0f23cb5d581b7de35792648f32c39f4ca35f68ff8c9cb5ce56c2
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 3566089c204b2456615916cd0f2d36c20573aff9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sun, 11 Apr 2021 12:54:00 +0200
Subject: [PATCH 1023/2024] hcloud: update to 1.22.1.

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

diff --git a/srcpkgs/hcloud/template b/srcpkgs/hcloud/template
index d5eb343c9338..d07198b9ded4 100644
--- a/srcpkgs/hcloud/template
+++ b/srcpkgs/hcloud/template
@@ -1,19 +1,18 @@
 # Template file for 'hcloud'
 pkgname=hcloud
-version=1.22.0
+version=1.22.1
 revision=1
 wrksrc="cli-${version}"
 build_style=go
 go_import_path=github.com/hetznercloud/cli
 go_package=github.com/hetznercloud/cli/cmd/hcloud
 go_ldflags="-X github.com/hetznercloud/cli.Version=${version}"
-hostmakedepends="git"
 short_desc="Command-line interface for Hetzner Cloud"
 maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="MIT"
 homepage="https://github.com/hetznercloud/cli"
 distfiles="https://github.com/hetznercloud/cli/archive/v${version}.tar.gz"
-checksum=fec0f1ae490ed4e1079138661fffcbf489544c460f631a6a4e5910d3645dad86
+checksum=6b43ad74ec243484c7c1dd1d7cb2d6f1231f596a2ea4753bf81087f5b8dcf1c2
 
 post_install() {
 	vlicense LICENSE

From eee2593e999f8d1d17673f777f7e092c7573e560 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sun, 11 Apr 2021 09:28:58 +0300
Subject: [PATCH 1024/2024] json-glib: update to 1.6.2.

Closes: #30144 [via git-merge-pr]
---
 srcpkgs/json-glib/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/json-glib/template b/srcpkgs/json-glib/template
index a96132e145e3..4a3c611826a7 100644
--- a/srcpkgs/json-glib/template
+++ b/srcpkgs/json-glib/template
@@ -1,6 +1,6 @@
 # Template file for 'json-glib'
 pkgname=json-glib
-version=1.6.0
+version=1.6.2
 revision=1
 build_style=meson
 build_helper="gir"
@@ -8,11 +8,11 @@ configure_args="-Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="pkg-config glib-devel"
 makedepends="libglib-devel"
 short_desc="JSON parser for GLib-based libraries and applications"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="http://live.gnome.org/JsonGlib"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0d7c67602c4161ea7070fab6c5823afd9bd7f7bc955f652a50d3753b08494e73
+checksum=a33d66c6d038bda46b910c6c6d59c4e15db014e363dc997a0414c2e07d134f24
 
 # Package build options
 build_options="gir"

From d827c5f263032a9258efa58dc8857bfc61326a4b Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 12 Apr 2021 02:20:41 +0300
Subject: [PATCH 1025/2024] libtorrent-rasterbar: update to 1.2.13.

Closes: #30172 [via git-merge-pr]
---
 srcpkgs/libtorrent-rasterbar/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index 8cef116f9aff..1fe9b88327c7 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -1,8 +1,8 @@
 # Template file for 'libtorrent-rasterbar'
 # Breaks ABI/API without changing soname, revbump all dependants
 pkgname=libtorrent-rasterbar
-version=1.2.12
-revision=2
+version=1.2.13
+revision=1
 build_style=cmake
 configure_args="-DCMAKE_CXX_STANDARD=11 -Dbuild_examples=ON -Dbuild_tools=ON
  -Dpython-bindings=ON"
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://libtorrent.org/"
 distfiles="https://github.com/arvidn/libtorrent/releases/download/v${version}/${pkgname}-${version}.tar.gz"
-checksum=c3744ac9fa41f6e6ebf79538a2ea678df76a2cbbaf3ac6ae2c05455314e5cce8
+checksum=976d2771ffcd564f08a63351e9c22e842aaa8cd29f6f7fe25d169c038a844e85
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -Dbuild_tests=ON"

From b00b8d3c66b261d3929174bd232a6cf95cbd6442 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 12 Apr 2021 01:13:05 +0300
Subject: [PATCH 1026/2024] librsync: update to 2.3.2, add changelog and
 checkdepends.

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

diff --git a/srcpkgs/librsync/template b/srcpkgs/librsync/template
index 80583aa90f49..c5576cd0e48a 100644
--- a/srcpkgs/librsync/template
+++ b/srcpkgs/librsync/template
@@ -1,16 +1,18 @@
 # Template file for 'librsync'
 pkgname=librsync
-version=2.3.1
+version=2.3.2
 revision=1
 build_style=cmake
 hostmakedepends="perl"
 makedepends="zlib-devel bzip2-devel popt-devel"
+checkdepends="which perl"
 short_desc="Library that implements the rsync remote-delta algorithm (rdiff)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://librsync.sourceforge.net/"
+changelog="https://librsync.github.io/md_NEWS.html"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz"
-checksum=dbd7eb643665691bdf4009174461463737b19b4814b789baad62914cabfe4569
+checksum=ef8ce23df38d5076d25510baa2cabedffbe0af460d887d86c2413a1c2b0c676f
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -C disableRuntimeTests.cmake"

From 6aa518f208ae84e05a4fe10a6290b0b4a3fc4797 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 12 Apr 2021 01:01:42 +0300
Subject: [PATCH 1027/2024] fotoxx: update to 21.40, add dcraw as runtime
 dependency.

Closes: #30169 [via git-merge-pr]
---
 srcpkgs/fotoxx/template | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/fotoxx/template b/srcpkgs/fotoxx/template
index b2aff4b41061..a3c968fcdef0 100644
--- a/srcpkgs/fotoxx/template
+++ b/srcpkgs/fotoxx/template
@@ -1,19 +1,19 @@
 # Template file for 'fotoxx'
 pkgname=fotoxx
-version=20.19
+version=21.40
 revision=1
 wrksrc=fotoxx
 build_style=gnu-makefile
 make_use_env=yes
 hostmakedepends="pkg-config"
 makedepends="libchamplain-devel libraw-devel"
-depends="desktop-file-utils exiftool xdg-utils"
+depends="desktop-file-utils exiftool xdg-utils dcraw"
 short_desc="Free open source program for image editing and collection management"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.kornelix.net/fotoxx/fotoxx.html"
 distfiles="https://www.kornelix.net/downloads/downloads/fotoxx-${version}.tar.gz"
-checksum=4c9216d4612641151ca75e3f6fd74521a8dcfbb0a14d765b73d2ff62eed37a3e
+checksum=0c16597053ce8e186fb8163839f4f4ed44548bf00e43e88951f4346a9dbbb620
 
 CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/champlain-0.12"
 
@@ -24,8 +24,3 @@ fi
 case "$XBPS_TARGET_LIBC" in
 	musl) makedepends+=" libexecinfo-devel"
 esac
-
-post_install() {
-	rm -rv ${DESTDIR}/usr/share/doc/fotoxx/{changelog.gz,copyright,fotoxx.man} \
-		  ${DESTDIR}/usr/share/appdata
-}

From d300efc89e3792c9903af092cc044cb941513029 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 12 Apr 2021 00:44:52 +0300
Subject: [PATCH 1028/2024] dutree: update to 0.2.17.

Closes: #30168 [via git-merge-pr]
---
 srcpkgs/dutree/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dutree/template b/srcpkgs/dutree/template
index 4bf082f3b7d5..70155936776a 100644
--- a/srcpkgs/dutree/template
+++ b/srcpkgs/dutree/template
@@ -1,6 +1,6 @@
 # Template file for 'dutree'
 pkgname=dutree
-version=0.2.16
+version=0.2.17
 revision=1
 build_style=cargo
 short_desc="Tool to analyze file system usage written in Rust"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/nachoparker/dutree"
 distfiles="https://github.com/nachoparker/dutree/archive/v${version}.tar.gz"
-checksum=288e52f897785a03cae48eac581faf7d3743d36152f152ba25b8847528bf0a5f
+checksum=c88f2328c4e6cf96a0222efbe2a5c6d2de8cd0de0ebf01deb1f5fe81b5f8518e
 
 pre_build() {
 	# default version too old for ppc musl systems

From 31e455507df7200cdaf83e363fdc6fd2e24c126b Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Thu, 1 Apr 2021 00:18:32 +0200
Subject: [PATCH 1029/2024] blackbox_exporter: update to 0.18.0.

Closes: #30138 [via git-merge-pr]
---
 srcpkgs/blackbox_exporter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/blackbox_exporter/template b/srcpkgs/blackbox_exporter/template
index 4f6ca705e981..3000f9beb65f 100644
--- a/srcpkgs/blackbox_exporter/template
+++ b/srcpkgs/blackbox_exporter/template
@@ -1,6 +1,6 @@
 # Template file for 'blackbox_exporter'
 pkgname=blackbox_exporter
-version=0.16.0
+version=0.18.0
 revision=1
 build_style=go
 go_import_path="github.com/prometheus/blackbox_exporter"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://prometheus.io"
 changelog="https://github.com/prometheus/blackbox_exporter/releases"
 distfiles="https://github.com/prometheus/blackbox_exporter/archive/v${version}.tar.gz"
-checksum=6ebfd9f590286004dacf3c93b3aa3e3c560d6f1e5994f72c180e5af94fdd0099
+checksum=b41f1301c991c0d0011652e2093588521925d1960c6f7649f96edecbf1aadfb8
 
 system_accounts="_bbox_exporter"
 

From c218b8acdb61cd147f7c3f33ef8788ea9f4d9efd Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Thu, 1 Apr 2021 00:18:14 +0200
Subject: [PATCH 1030/2024] node_exporter: update to 1.1.2.

Closes: #30137 [via git-merge-pr]
---
 srcpkgs/node_exporter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/node_exporter/template b/srcpkgs/node_exporter/template
index 5397c01ff4dc..5f2855d6c6c3 100644
--- a/srcpkgs/node_exporter/template
+++ b/srcpkgs/node_exporter/template
@@ -1,6 +1,6 @@
 # Template file for 'node_exporter'
 pkgname=node_exporter
-version=1.0.1
+version=1.1.2
 revision=1
 build_style=go
 go_import_path="github.com/prometheus/node_exporter"
@@ -15,7 +15,7 @@ license="Apache-2.0"
 homepage="https://prometheus.io/"
 changelog="https://raw.githubusercontent.com/prometheus/node_exporter/master/CHANGELOG.md"
 distfiles="https://github.com/prometheus/node_exporter/archive/v${version}.tar.gz"
-checksum=a841bf3e236376840be9e1d8e6c4a38196be6f3957b0982d1c7970a5e416b0ad
+checksum=edb40c783bd5767f174b916c89a768496ccae0f74811ba1d03c57c32cd250bbd
 python_version=3
 
 system_accounts="_node_exporter"

From 02a50d5c7d7f2e668b3bd1713a0d6efad8d858c8 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, 12 Apr 2021 08:18:37 +0700
Subject: [PATCH 1031/2024] embb: fix cmake, shared libs location

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

diff --git a/common/shlibs b/common/shlibs
index 98b28735c4c6..865ebcbe799d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3153,11 +3153,11 @@ libGammu.so.8 gammu-1.39.0_1
 libz3.so z3-4.6.0_2
 libngspice.so.0 ngspice-27_2
 libvulkan.so.1 vulkan-loader-1.0.57.0_1
-libembb_mtapi_cpp.so embb-devel-1.0.0_1
-libembb_mtapi_c.so embb-devel-1.0.0_1
-libembb_mtapi_network_c.so embb-devel-1.0.0_1
-libembb_base_cpp.so embb-devel-1.0.0_1
-libembb_base_c.so embb-devel-1.0.0_1
+libembb_mtapi_cpp.so embb-1.0.0_3
+libembb_mtapi_c.so embb-1.0.0_3
+libembb_mtapi_network_c.so embb-1.0.0_3
+libembb_base_cpp.so embb-1.0.0_3
+libembb_base_c.so embb-1.0.0_3
 libhpdf-2.3.0.so Haru-2.3.0_3
 libKF5Contacts.so.5 kcontacts-5.63.0_1
 libKF5AkonadiPrivate.so.5 akonadi5-17.12.0_1
diff --git a/srcpkgs/embb/template b/srcpkgs/embb/template
index 0906831c53e3..d6a239cc3374 100644
--- a/srcpkgs/embb/template
+++ b/srcpkgs/embb/template
@@ -1,9 +1,10 @@
 # Template file for 'embb'
 pkgname=embb
 version=1.0.0
-revision=2
+revision=3
 build_style=cmake
-configure_args="-DUSE_C11_AND_CXX11=ON -DBUILD_SHARED_LIBS=ON -DBUILD_TESTS=OFF -DINSTALL_PREFIX=/usr"
+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-Clause"
@@ -13,6 +14,8 @@ checksum=a392c710df719bbb1513dd9a6835ab9d73494d7355a47f17e818179fea64dcc8
 
 post_install() {
 	vlicense COPYING.md
+	vmkdir usr/lib/cmake
+	mv ${DESTDIR}/usr/CMake/* ${DESTDIR}/usr/lib/cmake
 }
 
 embb-devel_package() {
@@ -20,8 +23,8 @@ embb-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/lib/*.a
-		vmove usr/lib/*.so
+		vmove usr/lib/cmake
+		vmove "usr/lib/*.a"
 	}
 }
 

From 7edeb04bce3c81e0d455fee813fa4ff945859e13 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, 12 Apr 2021 08:32:48 +0700
Subject: [PATCH 1032/2024] mozjs78: fix new patch

---
 srcpkgs/mozjs78/patches/build-non-jit-32bit.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mozjs78/patches/build-non-jit-32bit.patch b/srcpkgs/mozjs78/patches/build-non-jit-32bit.patch
index e3938fe8780c..a1ba0bd86621 100644
--- a/srcpkgs/mozjs78/patches/build-non-jit-32bit.patch
+++ b/srcpkgs/mozjs78/patches/build-non-jit-32bit.patch
@@ -1,8 +1,8 @@
 On 32-bit systems without JIT, the GC doesn't like 4-byte alignment,
 so enforce a stricter one.
 
---- js/src/jit/none/MacroAssembler-none.h.orig	2021-04-12 00:05:00.691183973 +0200
-+++ js/src/jit/none/MacroAssembler-none.h	2021-04-12 00:05:10.336183909 +0200
+--- a/js/src/jit/none/MacroAssembler-none.h
++++ b/js/src/jit/none/MacroAssembler-none.h
 @@ -100,7 +100,7 @@ static constexpr Register WasmTlsReg{Reg
  static constexpr Register WasmJitEntryReturnScratch{Registers::invalid_reg};
  

From 597435115449f45d11cacdb942ead5ea37420bfe 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, 12 Apr 2021 08:42:29 +0700
Subject: [PATCH 1033/2024] Haru: fix cross build

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

diff --git a/srcpkgs/Haru/template b/srcpkgs/Haru/template
index 80db1e0e89f4..d1207b72b881 100644
--- a/srcpkgs/Haru/template
+++ b/srcpkgs/Haru/template
@@ -13,6 +13,11 @@ homepage="http://libharu.org/"
 distfiles="https://github.com/libharu/libharu/archive/RELEASE_${version//./_}.tar.gz"
 checksum=8f9e68cc5d5f7d53d1bc61a1ed876add1faf4f91070dbc360d8b259f46d9a4d2
 
+if [ "$CROSS_BUILD" ]; then
+	configure_args="--with-zlib=${XBPS_CROSS_BASE}/usr"
+	configure_args+=" --with-png=${XBPS_CROSS_BASE}/usr"
+fi
+
 pre_configure() {
 	make -f build.mk
 }

From 72b517679940da85a8ac9ad1c415a99a36befd49 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 11 Apr 2021 21:29:26 -0400
Subject: [PATCH 1034/2024] python3-tifffile: update to 2021.4.8.

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

diff --git a/srcpkgs/python3-tifffile/template b/srcpkgs/python3-tifffile/template
index 821635e7d88c..f09d1d9d33c6 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.31
+version=2021.4.8
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/cgohlke/tifffile"
 changelog="https://raw.githubusercontent.com/cgohlke/tifffile/master/CHANGES.rst"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=82ce2f4f4d49415e95ae03f839f84eae4018435051106a1223e8b85d1a27b6f4
+checksum=449d05149e2dd3c0c2195d9a2ccd719c53840a516f82634e7dee1b5195f9d3c1
 # Tests require unpackaged fsspec
 make_check=no
 

From 01fda20b5f9555c36fda726479db012e39192812 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 11 Apr 2021 21:30:36 -0400
Subject: [PATCH 1035/2024] python3-breathe: update to 4.29.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 c4c3550b3a68..2c041b141f2a 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.28.0
+version=4.29.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=6948cf4700582c5b7115940367c87f74fbc4510b0a7db67fbcb5165181a784ad
+checksum=5fc965cfd248c01909a4ba78f3d7130d85e08b6f373b5224f4fc682cbfd760b4
 
 post_install() {
 	vlicense LICENSE

From a4366faedca2a3a072c61b5d3db4eae19ed6cb7a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 11 Apr 2021 21:35:00 -0400
Subject: [PATCH 1036/2024] protobuf26: update to 3.15.8.

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

diff --git a/srcpkgs/protobuf26/template b/srcpkgs/protobuf26/template
index 8e8cfbe6bece..8eac1187676b 100644
--- a/srcpkgs/protobuf26/template
+++ b/srcpkgs/protobuf26/template
@@ -1,6 +1,6 @@
 # Template file for 'protobuf26'
 pkgname=protobuf26
-version=3.15.7
+version=3.15.8
 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=efdd6b932a2c0a88a90c4c80f88e4b2e1bf031e7514dbb5a5db5d0bf4f295504
+checksum=0cbdc9adda01f6d2facc65a22a2be5cecefbefe5a09e5382ee8879b522c04441
 
 # Switch to versioned package
 conflicts="protobuf18>=0 protobuf23>=0 protobuf24>=0 protobuf25>=0"

From 46c0c908e67266af7e8b258d79aa5f4773208528 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 11 Apr 2021 21:38:51 -0400
Subject: [PATCH 1037/2024] python3-protobuf: update to 3.15.8.

---
 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 1a61e9218f75..33d8fa57a3ee 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.7
+version=3.15.8
 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=2d03fc2591543cd2456d0b72230b50c4519546a8d379ac6fd3ecd84c6df61e5d
+checksum=0277f62b1e42210cafe79a71628c1d553348da81cbd553402a7f7549c50b11d0
 
 build_options="cppext"
 build_options_default="cppext"

From 6910594f50d9ae8f56a408b9dd6ec49f8621cfde Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 11 Apr 2021 21:46:47 -0400
Subject: [PATCH 1038/2024] python3-hypothesis: update to 6.9.0.

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

diff --git a/srcpkgs/python3-hypothesis/template b/srcpkgs/python3-hypothesis/template
index 4f80d7b05c89..f66e8e3ddc19 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.9
+version=6.9.0
 revision=1
 wrksrc="hypothesis-hypothesis-python-${version}"
 build_wrksrc=hypothesis-python
@@ -15,7 +15,7 @@ license="MPL-2.0"
 homepage="https://hypothesis.works/"
 changelog="https://hypothesis.readthedocs.io/en/latest/changes.html"
 distfiles="https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-${version}.tar.gz"
-checksum=41147c391beab58898eb11296f3edc5d1b5dc7d58041f1bc3517e1d59414cbef
+checksum=c44ee0355477012d4fad8650aff95bfcb6346a21ea8248010ee915c30eff462a
 
 do_check() {
 	# Manually run the tests that tox considers part of the "full" suite,

From b0b9a0f3023ec49db365b286c80ef44af508dbea Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 12 Apr 2021 13:43:19 +0200
Subject: [PATCH 1039/2024] cdogs-sdl: fix broken dependencies

---
 srcpkgs/cdogs-sdl/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/cdogs-sdl/template b/srcpkgs/cdogs-sdl/template
index d653cc0dcbca..a0cf7dafd7b8 100644
--- a/srcpkgs/cdogs-sdl/template
+++ b/srcpkgs/cdogs-sdl/template
@@ -1,13 +1,12 @@
 # Template file for 'cdogs-sdl'
 pkgname=cdogs-sdl
 version=0.9.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DCDOGS_DATA_DIR=/usr/share/cdogs/"
 hostmakedepends="pkg-config python3-protobuf protobuf26"
 makedepends="SDL2-devel SDL2_mixer-devel SDL2_image-devel SDL2_net-devel
  gtk+3-devel protobuf-devel"
-depends="cdogs-sdl-data>=${version}_${revision}"
 short_desc="Classic overhead run-and-gun game"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"

From 70bfdca7c154d1517ab5795a2237e86679882980 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Sun, 11 Apr 2021 12:27:18 +1000
Subject: [PATCH 1040/2024] libnpupnp: update to 4.1.3

Closes: #30141 [via git-merge-pr]
---
 srcpkgs/libnpupnp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libnpupnp/template b/srcpkgs/libnpupnp/template
index d709bb6c8632..16c0d5b6cc57 100644
--- a/srcpkgs/libnpupnp/template
+++ b/srcpkgs/libnpupnp/template
@@ -1,6 +1,6 @@
 # Template file for 'libnpupnp'
 pkgname=libnpupnp
-version=4.1.2
+version=4.1.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="amak <amak.git@outlook.com>"
 license="BSD-3-Clause"
 homepage="https://www.lesbonscomptes.com/upmpdcli/npupnp-doc/libnpupnp.html"
 distfiles="https://www.lesbonscomptes.com/upmpdcli/downloads/libnpupnp-${version}.tar.gz"
-checksum=8b59b730b39daeb46ad89021d7fbfe7c5a2a71cd0f85bb537d593c8a82746981
+checksum=74703d49be52d29b52f59342ec7359178b127568399551d9d3f56bb7950fcc02
 
 post_install() {
 	vlicense COPYING

From 8c79db0eac1644c089ea61f94e54352e5c3a25ba Mon Sep 17 00:00:00 2001
From: Daxot <filohin.pavel@yandex.ru>
Date: Mon, 12 Apr 2021 12:54:05 +0300
Subject: [PATCH 1041/2024] nicotine+: update to 3.0.4

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

diff --git a/srcpkgs/nicotine+/template b/srcpkgs/nicotine+/template
index fd1284c4a5f7..6f28e7582c58 100644
--- a/srcpkgs/nicotine+/template
+++ b/srcpkgs/nicotine+/template
@@ -1,6 +1,6 @@
 # Template file for 'nicotine+'
 pkgname=nicotine+
-version=3.0.2
+version=3.0.4
 revision=1
 wrksrc="nicotine-plus-${version}"
 build_style=python3-module
@@ -11,4 +11,4 @@ maintainer="doggone <doggone@airmail.cc>"
 license="GPL-3.0-or-later"
 homepage="https://nicotine-plus.org"
 distfiles="https://github.com/Nicotine-Plus/nicotine-plus/archive/${version}.tar.gz"
-checksum=a2a50a442e1dee035aa5825ef7b590c1c457bddba17e5a4abe6466113f5a4af1
+checksum=f0af2d45e7b2672e2c431a199f4faf0aee18da79f8d9aff9833cde6368192032

From 087cf5c131d2d2c5f1a725a60414d3aeaa55029b Mon Sep 17 00:00:00 2001
From: Michal Tvrznik <emporeor@gmail.com>
Date: Mon, 12 Apr 2021 09:40:29 +0200
Subject: [PATCH 1042/2024] emptty: update to 0.5.1.

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

diff --git a/srcpkgs/emptty/template b/srcpkgs/emptty/template
index 402733e1b2a2..3a0ac68bceb6 100644
--- a/srcpkgs/emptty/template
+++ b/srcpkgs/emptty/template
@@ -1,6 +1,6 @@
 # Template file for 'emptty'
 pkgname=emptty
-version=0.5.0
+version=0.5.1
 revision=1
 build_style=go
 go_import_path=github.com/tvrzna/emptty
@@ -10,7 +10,7 @@ maintainer="xXR01I1Xx <xxr01i1xx@tuta.io>"
 license="MIT"
 homepage="https://github.com/tvrzna/emptty"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=30fd606e9f2c00c923d6fc5d28774d2454e70f999aee57ff29de73eed824f384
+checksum=798819b7d320df6ced703b5878564c3a2544638babc7666a5c8391c26976c704
 conf_files="/etc/emptty/conf /etc/pam.d/emptty"
 
 post_install() {

From 343d86ef0de1d2cf89d9cfc3cdd38110e1d9d6fa Mon Sep 17 00:00:00 2001
From: Gustavo Costa <gusbemacbe@gmail.com>
Date: Mon, 12 Apr 2021 00:12:05 -0300
Subject: [PATCH 1043/2024] adwaita-plus: update to 6.1

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

diff --git a/srcpkgs/adwaita-plus/template b/srcpkgs/adwaita-plus/template
index 5d8611835163..5d603894af3b 100644
--- a/srcpkgs/adwaita-plus/template
+++ b/srcpkgs/adwaita-plus/template
@@ -1,13 +1,13 @@
 # Template file for 'adwaita-plus'
 pkgname=adwaita-plus
-version=5.0
+version=6.1
 revision=2
 short_desc="Modern third-party icons theme based on GNOME's Adwaita"
 maintainer="Gustavo Costa <gusbemacbe@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Bonandry/adwaita-plus"
 distfiles="https://github.com/Bonandry/${pkgname}/archive/v${version}.tar.gz"
-checksum=c83a867a713b7ec0fe01c95fa2b1118ef97e8bdb62bc4467f317ea8c611b50d1
+checksum=f8c791754110b7b9c19f50fb19f5344ad0a50e5834ca25a1161312eacfbf027b
 
 do_install() {
 	vmkdir usr/share/icons

From 5f10ba313fc54749feb17f4d38f6a2cdb88bd848 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 12 Apr 2021 18:28:39 +0200
Subject: [PATCH 1044/2024] removed-packages: add subpkgs of shiboken2,
 python3-pyside2

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

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 3dee863e0d27..163647c10e49 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=41
+revision=42
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -190,11 +190,13 @@ replaces="
  libfcitx-qt-devel<=4.2.9.8_1
  libgksu<=2.0.12_5
  libglib-static<=2.58.3_5
+ libpyside-python3<=5.15.0_2
  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
+ libshiboken-python3<=5.15.0_3
  livewallpaper<=0.5.0_2
  llvm3.9<=3.9.1_5
  lprng<=3.8.C_1
@@ -241,6 +243,10 @@ replaces="
  python3-Django<=3.0.7_2
  python3-cloudscraper<=1.2.52_1
  python3-pyPEG2<=2.15.2_7
+ python3-pyenet<=5.15.0_2
+ python3-pyside<=5.15.0_2
+ python3-pyside-phonon<=5.15.0_2
+ python3-shiboken<=5.15.0_3
  qimageblitz<=0.0.6_4
  qucs<=0.0.19_2
  qupzilla1<=1.8.9_16

From 237e2ce52003be0351b5d9fc359d3d7a319fcd0f Mon Sep 17 00:00:00 2001
From: reback00 <reback00@protonmail.com>
Date: Mon, 12 Apr 2021 10:06:53 +0600
Subject: [PATCH 1045/2024] New package: pnpm-6.0.1

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

diff --git a/srcpkgs/pnpm/template b/srcpkgs/pnpm/template
new file mode 100644
index 000000000000..6d7ecfe1ce8b
--- /dev/null
+++ b/srcpkgs/pnpm/template
@@ -0,0 +1,30 @@
+# Template file for 'pnpm'
+pkgname=pnpm
+version=6.0.1
+revision=1
+build_style=fetch
+hostmakedepends="nodejs jq"
+depends="nodejs"
+short_desc="Fast, disk space efficient package manager"
+maintainer="reback00 <reback00@protonmail.com>"
+license="MIT"
+homepage="https://pnpm.js.org/"
+distfiles="https://registry.npmjs.org/${pkgname}/-/${pkgname}-${version}.tgz"
+checksum=6e390217ab6250f85d28cb0135620e3b0526a849dda7fb7c54f092c1b6bd465c
+python_version=3
+
+do_install() {
+	npm install -g --user root --prefix "${DESTDIR}/usr" "${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}-${version}.tgz"
+	local _npmdir="${DESTDIR}/usr/lib/node_modules/${pkgname}"
+
+	# Sort and cleanup package.json
+	jq '.|=with_entries(select(.key|test("_.+")|not))' "$_npmdir/package.json" > "$_npmdir/package.json"
+	chmod 644 "$_npmdir/package.json"
+
+	# Delete JS SourceMaps
+	find "${DESTDIR}/usr/lib" -depth -name '*.map' -delete
+
+	vlicense "$_npmdir/LICENSE"
+	vdoc "$_npmdir/README.md"
+	rm -rf "${DESTDIR}/usr/etc" "$_npmdir/LICENSE" "$_npmdir/README.md"
+}

From e90c20d0e84da54b040c5ed730200b2beff48d45 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 12 Apr 2021 10:42:02 -0500
Subject: [PATCH 1046/2024] gef: update to 2021.04.

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

diff --git a/srcpkgs/gef/template b/srcpkgs/gef/template
index 9188044d9c9a..679b30deb6bb 100644
--- a/srcpkgs/gef/template
+++ b/srcpkgs/gef/template
@@ -1,6 +1,6 @@
 # Template file for 'gef'
 pkgname=gef
-version=2021.01
+version=2021.04
 revision=1
 pycompile_dirs="usr/share/gef"
 depends="keystone-python3 capstone-python3 unicorn-python3 python3-Ropper"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://gef.readthedocs.io/en/master/"
 distfiles="https://github.com/hugsy/gef/archive/${version}.tar.gz"
-checksum=59e9c2327a66f125c625affa727feaf43aaf8bf9da0cf1025f428ec8851b1f64
+checksum=43e1f08d230dccc44d22dc723df65f26afabfbd277ae81de04664738ea388703
 python_version="3"
 
 do_install() {

From cd904b7329351a95f20fd10c1223e79dba88c96a Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Mon, 12 Apr 2021 21:01:01 +0200
Subject: [PATCH 1047/2024] vscode: update to 1.55.1

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

diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index 58a277841efa..b3d037f65314 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.55.0
+version=1.55.1
 revision=1
 _electronver=9.4.1
 hostmakedepends="pkg-config python nodejs yarn tar git"
@@ -11,7 +11,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=5a208d6cfaf35ea4d098c858faf2dff14092d74534c1b5966df87f1d5be24ef0
+checksum=6fe56f9328ded06b38b29de4f545fc82007006cac18bdea8961637e25025d4a2
 patch_args="-Np1"
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then

From f72b017da368cf64b73b575de90b40c064a0a4af Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 11 Apr 2021 16:11:00 -0500
Subject: [PATCH 1048/2024] wine: update to 6.6.

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

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

From 0d684ccb9194e391a6094ef99aed2cbfdb00d2f9 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 12 Apr 2021 20:39:43 -0500
Subject: [PATCH 1049/2024] wine: broken on musl for now

---
 srcpkgs/wine/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 5b0d64f18e2e..0fbe8f22637a 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -64,6 +64,10 @@ if [ "$XBPS_LIBC" = "glibc" ]; then
 	hostmakedepends+=" prelink"
 fi
 
+if [ "$XBPS_LIBC" = "musl" ]; then
+	broken="undefined reference to `ns_name_skip'"
+fi
+
 _wine_libexec="/usr/libexec/wine"
 nopie_files="${_wine_libexec}/wine${_wine_suffix}"
 

From 438a94373da4d904fd88803155eedf015c99f2e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 13 Apr 2021 02:06:49 -0300
Subject: [PATCH 1050/2024] wine: fix musl build.

They started using the undocumented and glibc specific ns_name_skip
function, so vendor that function in as a static function; it's luckily
simple enough.
---
 srcpkgs/wine/patches/musl-ns_name_skip.patch | 48 ++++++++++++++++++++
 srcpkgs/wine/template                        |  4 --
 2 files changed, 48 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/wine/patches/musl-ns_name_skip.patch

diff --git a/srcpkgs/wine/patches/musl-ns_name_skip.patch b/srcpkgs/wine/patches/musl-ns_name_skip.patch
new file mode 100644
index 000000000000..3246959f9bbb
--- /dev/null
+++ b/srcpkgs/wine/patches/musl-ns_name_skip.patch
@@ -0,0 +1,48 @@
+diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c
+index ac52147..0f8c2ef 100644
+--- wine-6.6/dlls/dnsapi/libresolv.c
++++ wine-6.6/dlls/dnsapi/libresolv.c
+@@ -57,6 +57,43 @@
+ 
+ WINE_DEFAULT_DEBUG_CHANNEL(dnsapi);
+ 
++/* code from glibc's resolv/ns_name.c, with errno setting removed */
++/*%
++ *	Advance *ptrptr to skip over the compressed name it points at.
++ *
++ * return:
++ *\li	0 on success, -1 (with errno set) on failure.
++ */
++#ifndef __GLIBC__
++static int
++ns_name_skip(const u_char **ptrptr, const u_char *eom)
++{
++	const u_char *cp;
++	u_int n;
++
++	cp = *ptrptr;
++	while (cp < eom && (n = *cp++) != 0) {
++		/* Check for indirection. */
++		switch (n & NS_CMPRSFLGS) {
++		case 0:			/*%< normal case, n == len */
++			cp += n;
++			continue;
++		case NS_CMPRSFLGS:	/*%< indirection */
++			cp++;
++			break;
++		default:		/*%< illegal type */
++			return (-1);
++		}
++		break;
++	}
++	if (cp > eom) {
++		return (-1);
++	}
++	*ptrptr = cp;
++	return (0);
++}
++#endif
++
+ static const char *debugstr_type( unsigned short type )
+ {
+     const char *str;
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 0fbe8f22637a..5b0d64f18e2e 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -64,10 +64,6 @@ if [ "$XBPS_LIBC" = "glibc" ]; then
 	hostmakedepends+=" prelink"
 fi
 
-if [ "$XBPS_LIBC" = "musl" ]; then
-	broken="undefined reference to `ns_name_skip'"
-fi
-
 _wine_libexec="/usr/libexec/wine"
 nopie_files="${_wine_libexec}/wine${_wine_suffix}"
 

From fd95dbc0d8b893b378e43c35a4c98623393e2543 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 13 Apr 2021 10:37:33 +0200
Subject: [PATCH 1051/2024] python3-boto3: update to 1.17.49.

---
 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 93abe914cbf3..c376eedc533b 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.47
+version=1.17.49
 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=841ba34d61296a30128e16e987f66a999aea555f45d7fad9e85eb27f98ab05be
+checksum=08c4ee7dbcf5814555aeb2fed8496ab4165b8e3878acf2fcfd81f8d233f78ada
 
 post_install() {
 	vlicense LICENSE

From 96824e66e205e887966f7560f0bd97b264ac14ae Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 13 Apr 2021 10:38:10 +0200
Subject: [PATCH 1052/2024] apk-tools: update to 2.12.5.

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

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

From dce47849a56aa6678dd41e2a793fe027771fc43d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 13 Apr 2021 10:38:34 +0200
Subject: [PATCH 1053/2024] minify: update to 2.9.16.

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

diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template
index 29df03334904..14ae97e4b1f2 100644
--- a/srcpkgs/minify/template
+++ b/srcpkgs/minify/template
@@ -1,6 +1,6 @@
 # Template file for 'minify'
 pkgname=minify
-version=2.9.15
+version=2.9.16
 revision=1
 build_style=go
 go_import_path="github.com/tdewolff/minify/v2"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/tdewolff/minify"
 distfiles="https://github.com/tdewolff/minify/archive/v${version}.tar.gz"
-checksum=c05839ae2aa0aa13c2321bcea2df9aaed4dd52d85e7a3564b0313409e8bba074
+checksum=5bc765bf1a1ac641217b7921d3110fa8c5a5739b710a2077f16073b990fe46ff
 
 post_install() {
 	vlicense LICENSE

From 06d919a2c269f7f2c48050525c1e26a46f9b2b40 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Tue, 13 Apr 2021 01:46:22 +0200
Subject: [PATCH 1054/2024] New package: neochat-1.1.1,
 kquickimageeditor-0.1.3.

---
 srcpkgs/kquickimageeditor-devel    |  1 +
 srcpkgs/kquickimageeditor/template | 26 ++++++++++++++++++++++++++
 srcpkgs/neochat/template           | 22 ++++++++++++++++++++++
 3 files changed, 49 insertions(+)
 create mode 120000 srcpkgs/kquickimageeditor-devel
 create mode 100644 srcpkgs/kquickimageeditor/template
 create mode 100644 srcpkgs/neochat/template

diff --git a/srcpkgs/kquickimageeditor-devel b/srcpkgs/kquickimageeditor-devel
new file mode 120000
index 000000000000..acc5eacd1d75
--- /dev/null
+++ b/srcpkgs/kquickimageeditor-devel
@@ -0,0 +1 @@
+kquickimageeditor
\ No newline at end of file
diff --git a/srcpkgs/kquickimageeditor/template b/srcpkgs/kquickimageeditor/template
new file mode 100644
index 000000000000..2073799689de
--- /dev/null
+++ b/srcpkgs/kquickimageeditor/template
@@ -0,0 +1,26 @@
+# Template file for 'kquickimageeditor'
+pkgname=kquickimageeditor
+version=0.1.3
+revision=1
+build_style=cmake
+hostmakedepends="cmake extra-cmake-modules qt5-qmake qt5-host-tools"
+makedepends="qt5-declarative-devel"
+short_desc="QML image editing components"
+maintainer="Justin Jagieniak <justin@jagieniak.net>"
+license="LGPL-2.1-or-later, BSD-2-Clause, CC0-1.0"
+homepage="https://invent.kde.org/libraries/kquickimageeditor"
+distfiles="${KDE_SITE}/kquickimageeditor/${version%.*}/$pkgname-$version.tar.xz"
+checksum=5b13f8e53bc7ea960b24064948f3d28bfb39f47529d5fa63a2090a047465c1ea
+
+post_install() {
+	vlicense LICENSES/BSD-2-Clause.txt
+}
+
+kquickimageeditor-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/lib/cmake
+		vmove usr/lib/qt5/mkspecs
+	}
+}
diff --git a/srcpkgs/neochat/template b/srcpkgs/neochat/template
new file mode 100644
index 000000000000..d057c3e9e9f2
--- /dev/null
+++ b/srcpkgs/neochat/template
@@ -0,0 +1,22 @@
+# Template file for 'neochat'
+pkgname=neochat
+version=1.1.1
+revision=1
+build_style=cmake
+hostmakedepends="extra-cmake-modules gettext pkg-config qt5-qmake
+ qt5-host-tools kcoreaddons kconfig AppStream"
+makedepends="kdbusaddons-devel kquickimageeditor-devel libQuotient-devel
+ qtkeychain-qt5-devel qt5-quickcontrols2-devel qt5-declarative-devel
+ qt5-multimedia-devel qt5-svg-devel kirigami2-devel ki18n-devel cmark-devel
+ knotifications-devel kconfig-devel kcoreaddons-devel"
+depends="kquickimageeditor kitemmodels"
+short_desc="Client for matrix from KDE"
+maintainer="Justin Jagieniak <justin@jagieniak.net>"
+license="GPL-3.0-only, GPL-3.0-or-later, GPL-2.0-or-later, BSD-2-Clause"
+homepage="https://apps.kde.org/en/neochat"
+distfiles="${KDE_SITE}/neochat/$version/neochat-$version.tar.xz"
+checksum=dcaecf35fadffe298d849955b39f5d193161df6d6388ce402b4207a24b06757b
+
+post_install() {
+	vlicense LICENSES/BSD-2-Clause.txt
+}

From 2d85c076fd4b4336cf35cdf5804651cb63df4041 Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Tue, 13 Apr 2021 10:57:13 -0400
Subject: [PATCH 1055/2024] EmptyEpsilon: update to 2021.03.31.

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

diff --git a/srcpkgs/EmptyEpsilon/template b/srcpkgs/EmptyEpsilon/template
index c20280877634..f191433eec50 100644
--- a/srcpkgs/EmptyEpsilon/template
+++ b/srcpkgs/EmptyEpsilon/template
@@ -1,10 +1,10 @@
 # Template file for 'EmptyEpsilon'
 pkgname=EmptyEpsilon
-_ver_major=2020
-_ver_minor=11
-_ver_patch=23
+_ver_major=2021
+_ver_minor=03
+_ver_patch=31
 version="${_ver_major}.${_ver_minor}.${_ver_patch}"
-revision=3
+revision=1
 wrksrc="EmptyEpsilon-EE-${version}"
 build_style=cmake
 configure_args="-DSERIOUS_PROTON_DIR=$XBPS_BUILDDIR/SeriousProton-EE-${version}
@@ -20,5 +20,5 @@ license="GPL-2.0-only"
 homepage="https://daid.github.io/EmptyEpsilon/"
 distfiles="https://github.com/daid/EmptyEpsilon/archive/EE-${version}.tar.gz
  https://github.com/daid/SeriousProton/archive/EE-${version}.tar.gz>SP-${version}.tar.gz"
-checksum="339df2f3b57135663cb7bd253d7e157c3c5d457137bc6ed4c9651f48e8e6bf0c
- 7552ab3b2a82735401aba2215ae5bcae5fa2c9946b709ff77e0c2cc5a60abc23"
+checksum="c1c4f11fefe1afac6076c795e8785c7507a297ba3f7f2be9ed30c97b1e93cb24
+ 62ab03dc904bd10f017fff338e55ec97c86f0bc3903a18d6c44285b86776a2d7"

From d90e691ff395dffcb49df5c090c17840a8c2d46c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 13 Apr 2021 16:57:28 +0200
Subject: [PATCH 1056/2024] xorg-server: update to 1.20.11.

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

diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 780738711835..7832f45ff7e6 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,7 +1,7 @@
 # Template file for 'xorg-server'
 pkgname=xorg-server
-version=1.20.10
-revision=4
+version=1.20.11
+revision=1
 build_style=meson
 configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
  -Dxvfb=true -Dhal=false -Dudev=true -Dxkb_dir=/usr/share/X11/xkb
@@ -25,7 +25,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT, BSD-3-Clause"
 homepage="https://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.bz2"
-checksum=977420c082450dc808de301ef56af4856d653eea71519a973c3490a780cb7c99
+checksum=914c796e3ffabe1af48071d40ccc85e92117c97a9082ed1df29e4d64e3c34c49
 lib32disabled=yes
 provides="xserver-abi-extension-10_1 xserver-abi-input-24_1
  xserver-abi-video-24_1 xf86-video-modesetting-1_1"

From 07e870f34aabc475a4b3f0fce7ceb89656852135 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Tue, 13 Apr 2021 16:17:51 +0200
Subject: [PATCH 1057/2024] man-pages: don't remove xattr syscall pages

Those are not longer provided by attr-devel, and this prevents the xattr
family of syscall man-pages from getting included in the man-pages devel
package.
---
 srcpkgs/man-pages/template | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/srcpkgs/man-pages/template b/srcpkgs/man-pages/template
index f9f7e9a144a7..c5cc250ad353 100644
--- a/srcpkgs/man-pages/template
+++ b/srcpkgs/man-pages/template
@@ -1,7 +1,7 @@
 # Template file for 'man-pages'
 pkgname=man-pages
 version=5.11
-revision=1
+revision=2
 short_desc="Linux Documentation Project (LDP) manual pages"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
@@ -34,9 +34,6 @@ do_install() {
 	# mdocml
 	rm -f man7/man.7
 	rm -f man7/mdoc.7
-	# attr-devel
-	rm -f man5/attr.5
-	rm -f man2/*xattr.2
 	# openssl-devel
 	mv man3/rand.3 man3/glibc-rand.3
 	mv man3/err.3 man3/glibc-err.3

From 679e3d0c1ea2e5065360a826adfd97cb4be8feba Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Tue, 13 Apr 2021 13:52:25 +0200
Subject: [PATCH 1058/2024] unrar: update to 6.0.5.

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

diff --git a/srcpkgs/unrar/template b/srcpkgs/unrar/template
index f3a6ceded883..a4478ba38330 100644
--- a/srcpkgs/unrar/template
+++ b/srcpkgs/unrar/template
@@ -1,6 +1,6 @@
 # Template file for 'unrar'
 pkgname=unrar
-version=6.0.4
+version=6.0.5
 revision=1
 wrksrc=unrar
 short_desc="Unarchiver for .rar files (non-free version)"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="custom:freeware"
 homepage="https://www.rarlab.com/rar_add.htm"
 distfiles="https://www.rarlab.com/rar/unrarsrc-${version}.tar.gz"
-checksum=130197e495d6e2c2ee790a5beee123edeed642508be13f0159672e5397aca6c1
+checksum=7e34064c9e97464462c81aed80c25619149f71d4900995021780787f51dd63f0
 repository=nonfree
 
 do_build() {

From 93ee0a2a052055ddadcba4dd08de23bd3b996818 Mon Sep 17 00:00:00 2001
From: DirectorX <DirectorX@users.noreply.github.com>
Date: Tue, 13 Apr 2021 16:44:33 +0300
Subject: [PATCH 1059/2024] hydroxide: update to 0.2.18.

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

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

From 31b4b356f46e86426192052d8ca37e208a832820 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Tue, 13 Apr 2021 12:20:15 +0300
Subject: [PATCH 1060/2024] exa: update to 0.10.1

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

diff --git a/srcpkgs/exa/template b/srcpkgs/exa/template
index ea3ad487fa43..fd5d7266f589 100644
--- a/srcpkgs/exa/template
+++ b/srcpkgs/exa/template
@@ -1,6 +1,6 @@
 # Template file for 'exa'
 pkgname=exa
-version=0.10.0
+version=0.10.1
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config libgit2-devel"
@@ -11,8 +11,8 @@ license="MIT"
 homepage="https://the.exa.website/"
 distfiles="https://github.com/ogham/exa/archive/v${version}.tar.gz
  https://github.com/ogham/exa/releases/download/v${version}/exa-accoutrements-v${version}.zip"
-checksum="27420f7b805941988399d63f388be4f6077eee94a505bf01c2fb0e7d15cbf78d
- c1ab340af63e64bc3fd854c03f6161aa240a533e928688036a7d4544aecabc05"
+checksum="ff0fa0bfc4edef8bdbbb3cabe6fdbd5481a71abbbcc2159f402dea515353ae7c
+ 531596a1ef2a757c7728087529528150e6eb52bb8224fe575aa00a5f1b762849"
 
 post_extract() {
 	mkdir -p accoutrements

From 402430c7d83ad5fce7d2ca024a582946981c60ad Mon Sep 17 00:00:00 2001
From: K M J <Menten@noreply.codeberg.org>
Date: Tue, 13 Apr 2021 13:18:44 +0200
Subject: [PATCH 1061/2024] distrobuilder: update to 1.2.

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

diff --git a/srcpkgs/distrobuilder/template b/srcpkgs/distrobuilder/template
index a6847d085e25..fd58594e1748 100644
--- a/srcpkgs/distrobuilder/template
+++ b/srcpkgs/distrobuilder/template
@@ -1,6 +1,6 @@
 # Template file for 'distrobuilder'
 pkgname=distrobuilder
-version=1.1
+version=1.2
 revision=1
 wrksrc="distrobuilder-distrobuilder-${version}"
 build_style=go
@@ -13,4 +13,4 @@ maintainer="Robert Lowry <bobertlo@gmail.com>"
 license="Apache-2.0"
 homepage="https://linuxcontainers.org/distrobuilder/introduction/"
 distfiles="https://github.com/lxc/distrobuilder/archive/distrobuilder-${version}.tar.gz"
-checksum=a21b41f7d4030b923d7ea3840f90ff6912f6474e516140f488b87c8dfe970bbc
+checksum=c60f8cee78a9ed6b4606a3849f1bc3288f5e80651b7c59ea62c5dd8aae3e9e45

From 951e999bfef0b355df92db657c4b069d47de1fa6 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 13 Apr 2021 11:32:50 +0300
Subject: [PATCH 1062/2024] rssguard: update to 3.9.2.

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

diff --git a/srcpkgs/rssguard/template b/srcpkgs/rssguard/template
index df1ccd7ede93..88f7d36d6b31 100644
--- a/srcpkgs/rssguard/template
+++ b/srcpkgs/rssguard/template
@@ -1,6 +1,6 @@
 # Template file for 'rssguard'
 pkgname=rssguard
-version=3.9.1
+version=3.9.2
 revision=1
 build_style=qmake
 configure_args="CONFIG+=release LRELEASE_EXECUTABLE=lrelease-qt5 USE_WEBENGINE=false"
@@ -12,7 +12,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="GPL-3.0-only"
 homepage="https://github.com/martinrotter/rssguard"
 distfiles="https://github.com/martinrotter/rssguard/archive/${version}.tar.gz"
-checksum=312468a21a370159b0e10f6814071f6182314e196f2930402ffc307871e36fbf
+checksum=05eb628ff085ff10056289fd83b5e3b0583c19e3711795ade024bdfe71de5d97
 
 post_install() {
 	# Install rssguard icon manually

From af30fa11a026c92c0db0527db1f75c70fbf71a86 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Mon, 12 Apr 2021 23:23:09 +0300
Subject: [PATCH 1063/2024] monero: update to 0.17.2.0

---
 srcpkgs/monero/patches/march_cross.patch      | 16 +++++++++-------
 srcpkgs/monero/patches/system-miniupnpc.patch |  7 +++----
 srcpkgs/monero/template                       |  6 +++---
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/monero/patches/march_cross.patch b/srcpkgs/monero/patches/march_cross.patch
index 1c086feee419..a1276013b00d 100644
--- a/srcpkgs/monero/patches/march_cross.patch
+++ b/srcpkgs/monero/patches/march_cross.patch
@@ -1,11 +1,13 @@
---- CMakeLists.txt	2017-09-22 19:22:04.735657685 +0200
-+++ CMakeLists.txt	2017-09-22 19:20:08.164169125 +0200
-@@ -388,7 +388,7 @@
-   include(TestCXXAcceptsFlag)
-   set(ARCH native CACHE STRING "CPU to build for: -march value or 'default' to not pass -march at all")
+diff --git CMakeLists.txt CMakeLists.txt
+index 953707657..394e8cb32 100644
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -581,7 +581,7 @@ else()
+     set_default_arch()
+   endif()
    message(STATUS "Building on ${CMAKE_SYSTEM_PROCESSOR} for ${ARCH}")
-+  if(ARCH STREQUAL "default" OR CMAKE_CROSSCOMPILING)
 -  if(ARCH STREQUAL "default")
++  if(ARCH STREQUAL "default" OR CMAKE_CROSSCOMPILING)
      set(ARCH_FLAG "")
    elseif(PPC64LE)
-     set(ARCH_FLAG "-mcpu=${ARCH}")
+     set(ARCH_FLAG "-mcpu=power8")
diff --git a/srcpkgs/monero/patches/system-miniupnpc.patch b/srcpkgs/monero/patches/system-miniupnpc.patch
index 79b2e4d842c8..607162d8a54d 100644
--- a/srcpkgs/monero/patches/system-miniupnpc.patch
+++ b/srcpkgs/monero/patches/system-miniupnpc.patch
@@ -1,7 +1,6 @@
 --- CMakeLists.txt
 +++ CMakeLists.txt
-@@ -430,6 +430,14 @@ include_directories("${CMAKE_CURRENT_BINARY_DIR}/translations")
- 
+@@ -527,5 +527,13 @@ include_directories("${CMAKE_CURRENT_BINARY_DIR}/translations")
  add_subdirectory(external)
  
 +# Final setup for miniupnpc
@@ -19,9 +18,9 @@ diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
 index 9b21705e..76340a22 100644
 --- src/p2p/net_node.inl
 +++ src/p2p/net_node.inl
-@@ -49,9 +49,16 @@
- #include "storages/levin_abstract_invoke2.h"
+@@ -61,9 +61,16 @@ #include "storages/levin_abstract_invoke2.h"
  #include "cryptonote_core/cryptonote_core.h"
+ #include "net/parse.h"
  
 -#include <miniupnp/miniupnpc/miniupnpc.h>
 -#include <miniupnp/miniupnpc/upnpcommands.h>
diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index 45072e81b820..3617a446f098 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -1,7 +1,7 @@
 # Template file for 'monero'
 pkgname=monero
-version=0.17.1.9
-revision=2
+version=0.17.2.0
+revision=1
 _randomx_version="1.1.8"
 # the revision monero uses as a submodule for the specific version
 _rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
@@ -23,7 +23,7 @@ distfiles="https://github.com/monero-project/monero/archive/v${version}.tar.gz
  https://github.com/tevador/RandomX/archive/v${_randomx_version}.tar.gz
  https://github.com/Tencent/rapidjson/archive/${_rapidjson_gitrev}.tar.gz
  https://github.com/monero-project/supercop/archive/${_supercop_gitrev}.tar.gz"
-checksum="efedac6d9a64488f57e5237cb6199b56d819c8315f529af5142a9e41fcfcac91
+checksum="5e9bd2e565a57b4ae9f0d851704725b2e0b18c4a94051e56d5deae4e74727496
  f982a12d18b1d260bef2a1d3c46ae4902975fbf63abb38ca6413c96d1778db3a
  44b007d419ac21b6affec58991e865ee572346ead19b73cf1c3e4e11c7a81273
  b973b9d8269ec4d97c3c3443f0dad96d09f72b1b30e616e0947557adbdbb03f7"

From ac7c0677879ae3e9282e261d151efe05b9e8718c Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Mon, 12 Apr 2021 23:55:35 +0300
Subject: [PATCH 1064/2024] monero-gui: update to 0.17.2.0

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

diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 6ed3b0f5ce6a..16d2926d770a 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,8 +1,8 @@
 # Template file for 'monero-gui'
 pkgname=monero-gui
-version=0.17.1.9
-revision=2
-_monero_version=0.17.1.9
+version=0.17.2.0
+revision=1
+_monero_version=0.17.2.0
 _randomx_version="1.1.8"
 # the revision monero uses as a submodule for the specific version
 _rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
@@ -26,8 +26,8 @@ distfiles="https://github.com/monero-project/monero-gui/archive/v${version}.tar.
  https://github.com/Tencent/rapidjson/archive/${_rapidjson_gitrev}.tar.gz
  https://github.com/monero-project/supercop/archive/${_supercop_gitrev}.tar.gz
  https://github.com/dlbeer/quirc/archive/${_quirc_gitrev}.tar.gz"
-checksum="3a924b4e08b557d93337a0c05826a9fa95e5cf8c503aff0ecb3676be45db1d14
- efedac6d9a64488f57e5237cb6199b56d819c8315f529af5142a9e41fcfcac91
+checksum="00fbadca8090b85781b66b9cf54c36926ba9502ea5ce8e375a4342993b4ce907
+ 5e9bd2e565a57b4ae9f0d851704725b2e0b18c4a94051e56d5deae4e74727496
  f982a12d18b1d260bef2a1d3c46ae4902975fbf63abb38ca6413c96d1778db3a
  44b007d419ac21b6affec58991e865ee572346ead19b73cf1c3e4e11c7a81273
  b973b9d8269ec4d97c3c3443f0dad96d09f72b1b30e616e0947557adbdbb03f7

From 78cc45aa6e9e76d38626b3dad7a6aac986cf5743 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 12 Apr 2021 22:20:17 -0500
Subject: [PATCH 1065/2024] stunnel: update to 5.59.

---
 srcpkgs/stunnel/patches/patch-src_ctx_c.patch | 41 -------------------
 srcpkgs/stunnel/patches/patch-src_ssl_c.patch | 13 ------
 .../stunnel/patches/patch-src_verify_c.patch  | 13 ------
 srcpkgs/stunnel/template                      | 37 +++--------------
 4 files changed, 5 insertions(+), 99 deletions(-)
 delete mode 100644 srcpkgs/stunnel/patches/patch-src_ctx_c.patch
 delete mode 100644 srcpkgs/stunnel/patches/patch-src_ssl_c.patch
 delete mode 100644 srcpkgs/stunnel/patches/patch-src_verify_c.patch

diff --git a/srcpkgs/stunnel/patches/patch-src_ctx_c.patch b/srcpkgs/stunnel/patches/patch-src_ctx_c.patch
deleted file mode 100644
index 2fdcdbacca10..000000000000
--- a/srcpkgs/stunnel/patches/patch-src_ctx_c.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-$OpenBSD: patch-src_ctx_c,v 1.7 2018/02/23 10:26:56 sthen Exp $
-Index: src/ctx.c
---- src/ctx.c.orig
-+++ src/ctx.c
-@@ -93,7 +93,7 @@ NOEXPORT int ui_retry();
- /* session callbacks */
- NOEXPORT int sess_new_cb(SSL *, SSL_SESSION *);
- NOEXPORT SSL_SESSION *sess_get_cb(SSL *,
--#if OPENSSL_VERSION_NUMBER>=0x10100000L
-+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-     const
- #endif
-     unsigned char *, int, int *);
-@@ -295,7 +295,8 @@ NOEXPORT int matches_wildcard(char *servername, char *
- 
- #ifndef OPENSSL_NO_DH
- 
--#if OPENSSL_VERSION_NUMBER<0x10100000L
-+#if OPENSSL_VERSION_NUMBER<0x10100000L || \
-+    (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
- NOEXPORT STACK_OF(SSL_CIPHER) *SSL_CTX_get_ciphers(const SSL_CTX *ctx) {
-     return ctx->cipher_list;
- }
-@@ -398,7 +399,7 @@ NOEXPORT int ecdh_init(SERVICE_OPTIONS *section) {
- /**************************************** initialize OpenSSL CONF */
- 
- NOEXPORT int conf_init(SERVICE_OPTIONS *section) {
--#if OPENSSL_VERSION_NUMBER>=0x10002000L
-+#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
-     SSL_CONF_CTX *cctx;
-     NAME_LIST *curr;
-     char *cmd, *param;
-@@ -907,7 +908,7 @@ NOEXPORT int sess_new_cb(SSL *ssl, SSL_SESSION *sess) 
- }
- 
- NOEXPORT SSL_SESSION *sess_get_cb(SSL *ssl,
--#if OPENSSL_VERSION_NUMBER>=0x10100000L
-+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-         const
- #endif
-         unsigned char *key, int key_len, int *do_copy) {
diff --git a/srcpkgs/stunnel/patches/patch-src_ssl_c.patch b/srcpkgs/stunnel/patches/patch-src_ssl_c.patch
deleted file mode 100644
index a2ca0c16c77a..000000000000
--- a/srcpkgs/stunnel/patches/patch-src_ssl_c.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_ssl_c,v 1.8 2018/04/14 09:05:14 tb Exp $
-Index: src/ssl.c
---- src/ssl.c.orig
-+++ src/ssl.c
-@@ -51,7 +51,7 @@ int index_ssl_cli, index_ssl_ctx_opt;
- int index_session_authenticated, index_session_connect_address;
- 
- int ssl_init(void) { /* init TLS before parsing configuration file */
--#if OPENSSL_VERSION_NUMBER>=0x10100000L
-+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-     OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS |
-         OPENSSL_INIT_LOAD_CRYPTO_STRINGS | OPENSSL_INIT_LOAD_CONFIG, NULL);
- #else
diff --git a/srcpkgs/stunnel/patches/patch-src_verify_c.patch b/srcpkgs/stunnel/patches/patch-src_verify_c.patch
deleted file mode 100644
index f4ee8c595dc8..000000000000
--- a/srcpkgs/stunnel/patches/patch-src_verify_c.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_verify_c,v 1.6 2017/09/12 16:15:24 gsoares Exp $
-Index: src/verify.c
---- src/verify.c.orig
-+++ src/verify.c
-@@ -353,7 +353,7 @@ NOEXPORT int cert_check_local(X509_STORE_CTX *callback
-     cert=X509_STORE_CTX_get_current_cert(callback_ctx);
-     subject=X509_get_subject_name(cert);
- 
--#if OPENSSL_VERSION_NUMBER<0x10100006L
-+#if OPENSSL_VERSION_NUMBER<0x10100006L || defined(LIBRESSL_VERSION_NUMBER)
- #define X509_STORE_CTX_get1_certs X509_STORE_get1_certs
- #endif
-     /* modern API allows retrieving multiple matching certificates */
diff --git a/srcpkgs/stunnel/template b/srcpkgs/stunnel/template
index 54ecff002a05..e5e9636b2e66 100644
--- a/srcpkgs/stunnel/template
+++ b/srcpkgs/stunnel/template
@@ -1,49 +1,22 @@
 # Template file for 'stunnel'
 pkgname=stunnel
-version=5.46
-revision=5
+version=5.59
+revision=1
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="perl"
 makedepends="openssl-devel"
-checkdepends="nmap procps-ng"
+checkdepends="nmap procps-ng iproute2"
 short_desc="SSL encryption wrapper"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.stunnel.org/"
 changelog="https://www.stunnel.org/sdf_ChangeLog.html"
-distfiles="https://www.stunnel.org/downloads/archive/5.x/${pkgname}-${version}.tar.gz"
-checksum=76aab48c28743d78e4b2f6b2dfe49994b6ca74126046c179444f699fae7a84c7
+distfiles="https://www.stunnel.org/downloads/stunnel-${version}.tar.gz"
+checksum=137776df6be8f1701f1cd590b7779932e123479fb91e5192171c16798815ce9f
 
 post_install() {
 	rm ${DESTDIR}/usr/share/man/man8/stunnel.??.8
 	vsconf tools/stunnel.conf-sample
 	rm -r ${DESTDIR}/etc/stunnel ${DESTDIR}/usr/share/doc/stunnel
 }
-
-# REMARKS:
-# What. A. Pain. What a total pain.
-# Using the archive is the only way to get builds to keep working after the
-# new version is out. LibreSSL patches for stunnel 5.35 don't yet work. Not
-# enough is made conditional.
-# --
-# It is important to note that upstream has expressly refused to support
-# LibreSSL.
-# --
-# Significant thanks to the OpenBSD project for creating patch sets for 5.37
-# One thing OpenBSD does that we don't do here is add a _stunnel user/group and
-# modify the configuration samples to chroot and use this by default.
-# As of 5.38 the signature expected for the CRYPTO_set_mem_functions seems to
-# be out of line with what openssl provides.
-# LibreSSL wants 'void (*)(void *)' but argument is of type 'void (*)(void *, const char *, int)'
-# This is probably not a security problem. EDIT: Well, it would break. Badly.
-# --
-# As of 5.39_2 the code now doesn't use above function call if using LibreSSL,
-# and a different call to SSL_CTX_sess_set_get_cb gets a const unsigned char *
-# instead of an unsigned char *
-# --
-# As of 5.41_1 there are only two sorts of code warnings:
-# conversion 'long int' from 'long unsigned int' for what appear to be flags
-# and SSL_SESSION* (*)(struct ssl_st *, unsigned char *, int, int*) expected
-# got SSL_SESSION* (*)(struct ssl_st *, const unsigned char *, int, int*)
-# These are not being considered issues.

From 1e7f79681eb16dd3c4fe09b8b487f9a2556087d6 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 13 Apr 2021 10:29:12 -0500
Subject: [PATCH 1066/2024] pahole: update to 1.21.

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

diff --git a/srcpkgs/pahole/template b/srcpkgs/pahole/template
index 184b67b95286..d3b720d72f24 100644
--- a/srcpkgs/pahole/template
+++ b/srcpkgs/pahole/template
@@ -1,7 +1,7 @@
 # Template file for 'pahole'
 pkgname=pahole
-version=1.20
-revision=2
+version=1.21
+revision=1
 wrksrc="dwarves-${version}"
 build_style=cmake
 configure_args="-D__LIB=lib"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-only"
 homepage="http://git.kernel.org/?p=devel/pahole/pahole.git;a=summary"
 distfiles="https://fedorapeople.org/~acme/dwarves/dwarves-${version}.tar.xz"
-checksum=a0dbda45ce83c0bf21eba78c44b4fd72560a970285fbb3e4f88375015aab6f06
+checksum=33a8bed6c0e1a5889578e01d1afed3f752353dc087d8bda36d258fe83e42a476
 
 case $XBPS_TARGET_MACHINE in
 	*-musl) makedepends+=" musl-obstack-devel argp-standalone"

From a5d73ab4f4efe0c3cab685a72c725bfae7dd0900 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 14 Mar 2021 19:24:18 +0100
Subject: [PATCH 1067/2024] New package: electron12-12.0.1

---
 .../chromium-default-pthread-stacksize.patch  |   29 +
 .../musl-patches/chromium-musl-crashpad.patch |   23 +
 .../musl-patches/chromium-musl-fixes.patch    |  202 +
 .../musl-patches/chromium-musl-hacks.patch    |   22 +
 .../musl-patches/chromium-musl-libc++.patch   |   55 +
 .../musl-patches/chromium-musl-sandbox.patch  |   92 +
 .../musl-patches/chromium-musl-sync.patch     |   30 +
 .../musl-patches/chromium-no-mallinfo.patch   |   54 +
 .../musl-patches/chromium-resolver.patch      |   38 +
 .../chromium-xxx-ppc64le-support.patch        |  190 +
 .../patches/chromium-88-glibc-2.33.patch      |  144 +
 ...chromium-89-AXTreeSerializer-include.patch |   25 +
 ...-add-dependency-on-opus-in-webcodecs.patch |   43 +
 .../patches/chromium-89-dawn-include.patch    |   28 +
 .../patches/chromium-89-quiche-dcheck.patch   |   29 +
 .../patches/chromium-89-skia-CropRect.patch   |   38 +
 ...mium-89-x11-ozone-fix-two-edge-cases.patch |  135 +
 .../patches/chromium-browser-size_t.patch     |   10 +
 .../files/patches/chromium-libc_malloc.patch  |   26 +
 ...-v8-monotonic-pthread-cont_timedwait.patch |   24 +
 .../files/patches/chromium-no-execinfo.patch  |   72 +
 .../patches/chromium-no-getcontext.patch      |   27 +
 .../patches/chromium-sandbox-membarrier.patch |   10 +
 .../chromium-sandbox-sched_getparam.patch     |   20 +
 .../files/patches/chromium-sndio.patch        |  886 ++++
 .../patches/chromium-system-nodejs.patch      |   22 +
 .../files/patches/chromium-time64.patch       |   51 +
 .../patches/chromium-webrtc-include.patch     |   10 +
 .../files/patches/chromium-webrtc-r0.patch    |   33 +
 .../patches/chromium-webrtc-size_t.patch      |   10 +
 .../patches/chromium-xxx-ppc64le-libvpx.patch |   72 +
 .../chromium-xxx-ppc64le-support.patch        | 3635 +++++++++++++++++
 .../chromium-xxx-ppc64le-swiftshader.patch    |   18 +
 ...a-script-to-list-patch-targets.patch.patch |   42 +
 .../patches/electron-Build-fixes.patch.patch  |   47 +
 ...ectron-dont-assume-python-is-python2.patch |   17 +
 ...lectron-exclude-content-test-patches.patch |   10 +
 .../sndio-files/audio_manager_openbsd.cc      |  148 +
 .../files/sndio-files/audio_manager_openbsd.h |   65 +
 .../files/sndio-files/sndio_input.cc          |  200 +
 .../files/sndio-files/sndio_input.h           |   91 +
 .../files/sndio-files/sndio_output.cc         |  183 +
 .../files/sndio-files/sndio_output.h          |   86 +
 ...a_audio_linux_audio_manager_linux.cc.patch |   43 +
 ...src_3rdparty_chromium_media_BUILD.gn.patch |   12 +
 ...dparty_chromium_media_audio_BUILD.gn.patch |   23 +
 ...ty_chromium_media_media__options.gni.patch |   12 +
 srcpkgs/electron12/template                   |  369 ++
 srcpkgs/electron12/update                     |    2 +
 49 files changed, 7453 insertions(+)
 create mode 100644 srcpkgs/electron12/files/musl-patches/chromium-default-pthread-stacksize.patch
 create mode 100644 srcpkgs/electron12/files/musl-patches/chromium-musl-crashpad.patch
 create mode 100644 srcpkgs/electron12/files/musl-patches/chromium-musl-fixes.patch
 create mode 100644 srcpkgs/electron12/files/musl-patches/chromium-musl-hacks.patch
 create mode 100644 srcpkgs/electron12/files/musl-patches/chromium-musl-libc++.patch
 create mode 100644 srcpkgs/electron12/files/musl-patches/chromium-musl-sandbox.patch
 create mode 100644 srcpkgs/electron12/files/musl-patches/chromium-musl-sync.patch
 create mode 100644 srcpkgs/electron12/files/musl-patches/chromium-no-mallinfo.patch
 create mode 100644 srcpkgs/electron12/files/musl-patches/chromium-resolver.patch
 create mode 100644 srcpkgs/electron12/files/musl-patches/chromium-xxx-ppc64le-support.patch
 create mode 100644 srcpkgs/electron12/files/patches/chromium-88-glibc-2.33.patch
 create mode 100644 srcpkgs/electron12/files/patches/chromium-89-AXTreeSerializer-include.patch
 create mode 100644 srcpkgs/electron12/files/patches/chromium-89-add-dependency-on-opus-in-webcodecs.patch
 create mode 100644 srcpkgs/electron12/files/patches/chromium-89-dawn-include.patch
 create mode 100644 srcpkgs/electron12/files/patches/chromium-89-quiche-dcheck.patch
 create mode 100644 srcpkgs/electron12/files/patches/chromium-89-skia-CropRect.patch
 create mode 100644 srcpkgs/electron12/files/patches/chromium-89-x11-ozone-fix-two-edge-cases.patch
 create mode 100644 srcpkgs/electron12/files/patches/chromium-browser-size_t.patch
 create mode 100644 srcpkgs/electron12/files/patches/chromium-libc_malloc.patch
 create mode 100644 srcpkgs/electron12/files/patches/chromium-musl-v8-monotonic-pthread-cont_timedwait.patch
 create mode 100644 srcpkgs/electron12/files/patches/chromium-no-execinfo.patch
 create mode 100644 srcpkgs/electron12/files/patches/chromium-no-getcontext.patch
 create mode 100644 srcpkgs/electron12/files/patches/chromium-sandbox-membarrier.patch
 create mode 100644 srcpkgs/electron12/files/patches/chromium-sandbox-sched_getparam.patch
 create mode 100644 srcpkgs/electron12/files/patches/chromium-sndio.patch
 create mode 100644 srcpkgs/electron12/files/patches/chromium-system-nodejs.patch
 create mode 100644 srcpkgs/electron12/files/patches/chromium-time64.patch
 create mode 100644 srcpkgs/electron12/files/patches/chromium-webrtc-include.patch
 create mode 100644 srcpkgs/electron12/files/patches/chromium-webrtc-r0.patch
 create mode 100644 srcpkgs/electron12/files/patches/chromium-webrtc-size_t.patch
 create mode 100644 srcpkgs/electron12/files/patches/chromium-xxx-ppc64le-libvpx.patch
 create mode 100644 srcpkgs/electron12/files/patches/chromium-xxx-ppc64le-support.patch
 create mode 100644 srcpkgs/electron12/files/patches/chromium-xxx-ppc64le-swiftshader.patch
 create mode 100644 srcpkgs/electron12/files/patches/electron-Add-a-script-to-list-patch-targets.patch.patch
 create mode 100644 srcpkgs/electron12/files/patches/electron-Build-fixes.patch.patch
 create mode 100644 srcpkgs/electron12/files/patches/electron-dont-assume-python-is-python2.patch
 create mode 100644 srcpkgs/electron12/files/patches/electron-exclude-content-test-patches.patch
 create mode 100644 srcpkgs/electron12/files/sndio-files/audio_manager_openbsd.cc
 create mode 100644 srcpkgs/electron12/files/sndio-files/audio_manager_openbsd.h
 create mode 100644 srcpkgs/electron12/files/sndio-files/sndio_input.cc
 create mode 100644 srcpkgs/electron12/files/sndio-files/sndio_input.h
 create mode 100644 srcpkgs/electron12/files/sndio-files/sndio_output.cc
 create mode 100644 srcpkgs/electron12/files/sndio-files/sndio_output.h
 create mode 100644 srcpkgs/electron12/files/sndio-patches/media_audio_linux_audio_manager_linux.cc.patch
 create mode 100644 srcpkgs/electron12/files/sndio-patches/src_3rdparty_chromium_media_BUILD.gn.patch
 create mode 100644 srcpkgs/electron12/files/sndio-patches/src_3rdparty_chromium_media_audio_BUILD.gn.patch
 create mode 100644 srcpkgs/electron12/files/sndio-patches/src_3rdparty_chromium_media_media__options.gni.patch
 create mode 100644 srcpkgs/electron12/template
 create mode 100644 srcpkgs/electron12/update

diff --git a/srcpkgs/electron12/files/musl-patches/chromium-default-pthread-stacksize.patch b/srcpkgs/electron12/files/musl-patches/chromium-default-pthread-stacksize.patch
new file mode 100644
index 000000000000..16e4d21e6ed8
--- /dev/null
+++ b/srcpkgs/electron12/files/musl-patches/chromium-default-pthread-stacksize.patch
@@ -0,0 +1,29 @@
+--- base/threading/platform_thread_linux.cc.orig
++++ base/threading/platform_thread_linux.cc
+@@ -99 +99,2 @@ size_t GetDefaultThreadStackSize(const p
+-  return 0;
++  // use 8mb like glibc to avoid running out of space
++  return (1 << 23);
+--- chrome/app/shutdown_signal_handlers_posix.cc.orig
++++ chrome/app/shutdown_signal_handlers_posix.cc
+@@ -184,11 +184,19 @@
+   g_shutdown_pipe_read_fd = pipefd[0];
+   g_shutdown_pipe_write_fd = pipefd[1];
+ #if !defined(ADDRESS_SANITIZER)
++# if defined(__GLIBC__)
+   const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2;
++# else
++  const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2 * 8; // match up musls 2k PTHREAD_STACK_MIN with glibcs 16k
++# endif
+ #else
+   // ASan instrumentation bloats the stack frames, so we need to increase the
+   // stack size to avoid hitting the guard page.
++# if defined(__GLIBC__)
+   const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4;
++# else
++  const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4 * 8; // match up musls 2k PTHREAD_STACK_MIN with glibcs 16k
++# endif
+ #endif
+   ShutdownDetector* detector = new ShutdownDetector(
+       g_shutdown_pipe_read_fd, shutdown_callback, task_runner);
+
diff --git a/srcpkgs/electron12/files/musl-patches/chromium-musl-crashpad.patch b/srcpkgs/electron12/files/musl-patches/chromium-musl-crashpad.patch
new file mode 100644
index 000000000000..03a0c06f3ca6
--- /dev/null
+++ b/srcpkgs/electron12/files/musl-patches/chromium-musl-crashpad.patch
@@ -0,0 +1,23 @@
+--- third_party/crashpad/crashpad/util/linux/ptracer.cc
++++ third_party/crashpad/crashpad/util/linux/ptracer.cc
+@@ -26,6 +26,7 @@
+ 
+ #if defined(ARCH_CPU_X86_FAMILY)
+ #include <asm/ldt.h>
++#include <asm/ptrace-abi.h>
+ #endif
+ 
+ namespace crashpad {
+
+--- third_party/crashpad/crashpad/compat/linux/sys/ptrace.h
++++ third_party/crashpad/crashpad/compat/linux/sys/ptrace.h
+@@ -17,7 +17,9 @@
+ 
+ #include_next <sys/ptrace.h>
+ 
++#if defined(__GLIBC__)
+ #include <sys/cdefs.h>
++#endif
+ 
+ // https://sourceware.org/bugzilla/show_bug.cgi?id=22433
+ #if !defined(PTRACE_GET_THREAD_AREA) && !defined(PT_GET_THREAD_AREA) && \
diff --git a/srcpkgs/electron12/files/musl-patches/chromium-musl-fixes.patch b/srcpkgs/electron12/files/musl-patches/chromium-musl-fixes.patch
new file mode 100644
index 000000000000..aec60fd62092
--- /dev/null
+++ b/srcpkgs/electron12/files/musl-patches/chromium-musl-fixes.patch
@@ -0,0 +1,202 @@
+--- ./third_party/lss/linux_syscall_support.h.orig
++++ ./third_party/lss/linux_syscall_support.h
+@@ -1127,6 +1127,12 @@
+ #ifndef __NR_fallocate
+ #define __NR_fallocate          285
+ #endif
++
++#undef __NR_pread
++#define __NR_pread __NR_pread64
++#undef __NR_pwrite
++#define __NR_pwrite __NR_pwrite64
++
+ /* End of x86-64 definitions                                                 */
+ #elif defined(__mips__)
+ #if _MIPS_SIM == _MIPS_SIM_ABI32
+--- ./third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h.orig
++++ ./third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
+@@ -37,6 +37,10 @@
+ #include "common/memory.h"
+ #include "google_breakpad/common/minidump_format.h"
+ 
++#if !defined(__GLIBC__)
++	#define _libc_fpstate _fpstate
++#endif
++
+ namespace google_breakpad {
+ 
+ // Wraps platform-dependent implementations of accessors to ucontext_t structs.
+--- ./third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h.orig
++++ ./third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h
+@@ -36,6 +36,7 @@
+ #include <elf.h>
+ #include <link.h>
+ #include <stddef.h>
++#include <limits.h>
+ 
+ #include "common/memory_range.h"
+ 
+--- ./sandbox/linux/suid/process_util.h.orig
++++ ./sandbox/linux/suid/process_util.h
+@@ -11,6 +11,14 @@
+ #include <stdbool.h>
+ #include <sys/types.h>
+ 
++// Some additional functions
++# define TEMP_FAILURE_RETRY(expression) \
++	(__extension__			\
++	 ({ long int __result;		\
++	  do __result = (long int) (expression); \
++	  while (__result == -1L && errno == EINTR); \
++	  __result; }))
++
+ // This adjusts /proc/process/oom_score_adj so the Linux OOM killer
+ // will prefer certain process types over others. The range for the
+ // adjustment is [-1000, 1000], with [0, 1000] being user accessible.
+--- ./sandbox/linux/seccomp-bpf/trap.cc.orig	2020-04-12 08:26:40.184159217 -0400
++++ ./sandbox/linux/seccomp-bpf/trap.cc	2020-04-12 08:46:16.737191222 -0400
+@@ -174,7 +174,7 @@
+   // If the version of glibc doesn't include this information in
+   // siginfo_t (older than 2.17), we need to explicitly copy it
+   // into an arch_sigsys structure.
+-  memcpy(&sigsys, &info->_sifields, sizeof(sigsys));
++  memcpy(&sigsys, &info->__sifields, sizeof(sigsys));
+ #endif
+ 
+ #if defined(__mips__)
+--- ./third_party/ffmpeg/libavutil/cpu.c.orig
++++ ./third_party/ffmpeg/libavutil/cpu.c
+@@ -38,7 +38,6 @@
+ #include <sys/param.h>
+ #endif
+ #include <sys/types.h>
+-#include <sys/sysctl.h>
+ #endif
+ #if HAVE_UNISTD_H
+ #include <unistd.h>
+diff --git a/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc b/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
+--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig	2021-03-10 07:23:00.145810088 -0500
++++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc	2021-03-10 10:57:19.405962671 -0500
+@@ -55,7 +55,9 @@
+ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // of lacros-chrome is complete.
+ #if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if defined(__GLIBC__)
+ #include <gnu/libc-version.h>
++#endif
+ 
+ #include "base/linux_util.h"
+ #include "base/strings/string_split.h"
+@@ -316,7 +318,7 @@
+ void RecordLinuxGlibcVersion() {
+ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // of lacros-chrome is complete.
+-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if defined(__GLIBC__) || BUILDFLAG(IS_CHROMEOS_LACROS)
+   base::Version version(gnu_get_libc_version());
+ 
+   UMALinuxGlibcVersion glibc_version_result = UMA_LINUX_GLIBC_NOT_PARSEABLE;
+--- services/device/serial/serial_io_handler_posix.cc.orig	2019-07-03 10:57:32.568171835 -0400
++++ services/device/serial/serial_io_handler_posix.cc	2019-07-03 10:57:16.867983031 -0400
+@@ -6,6 +6,7 @@
+ 
+ #include <sys/ioctl.h>
+ #include <termios.h>
++#include <asm-generic/ioctls.h>
+ 
+ #include <algorithm>
+ #include <utility>
+diff --git a/third_party/ots/include/opentype-sanitiser.h b/third_party/ots/include/opentype-sanitiser.h
+--- third_party/ots/include/opentype-sanitiser.h
++++ third_party/ots/include/opentype-sanitiser.h
+@@ -20,6 +20,7 @@ typedef unsigned __int64 uint64_t;
+ #define htonl(x) _byteswap_ulong (x)
+ #define htons(x) _byteswap_ushort (x)
+ #else
++#include <sys/types.h>
+ #include <arpa/inet.h>
+ #include <stdint.h>
+ #endif
+--- ./base/logging.cc.orig	2021-01-20 12:09:54.227038757 -0500
++++ ./base/logging.cc	2021-01-20 12:24:32.600301351 -0500
+@@ -557,8 +557,7 @@
+ 
+ LogMessage::~LogMessage() {
+   size_t stack_start = stream_.tellp();
+-#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && !defined(__UCLIBC__) && \
+-    !defined(OS_AIX)
++#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && defined(__GLIBC__)
+   if (severity_ == LOGGING_FATAL && !base::debug::BeingDebugged()) {
+     // Include a stack trace on a fatal, unless a debugger is attached.
+     base::debug::StackTrace stack_trace;
+--- ./third_party/blink/renderer/platform/wtf/stack_util.cc.orig
++++ ./third_party/blink/renderer/platform/wtf/stack_util.cc
+@@ -28,7 +28,7 @@
+ // FIXME: On Mac OSX and Linux, this method cannot estimate stack size
+ // correctly for the main thread.
+ 
+-#elif defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
++#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
+     defined(OS_FUCHSIA)
+   // pthread_getattr_np() can fail if the thread is not invoked by
+   // pthread_create() (e.g., the main thread of blink_unittests).
+@@ -96,7 +96,7 @@
+ }
+ 
+ void* GetStackStart() {
+-#if defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
+     defined(OS_FUCHSIA)
+   pthread_attr_t attr;
+   int error;
+--- ./net/dns/dns_config_service_posix.cc.orig
++++ ./net/dns/dns_config_service_posix.cc
+@@ -122,7 +122,7 @@
+   ConfigParsePosixResult result;
+   config->unhandled_options = false;
+ // TODO(fuchsia): Use res_ninit() when it's implemented on Fuchsia.
+-#if defined(OS_OPENBSD) || defined(OS_FUCHSIA)
++#if defined(OS_OPENBSD) || defined(OS_FUCHSIA) || defined(_GNU_SOURCE)
+   // Note: res_ninit in glibc always returns 0 and sets RES_INIT.
+   // res_init behaves the same way.
+   memset(&_res, 0, sizeof(_res));
+--- third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Signals.inc.orig	2019-06-18 11:51:17.000000000 -0400
++++ third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Signals.inc	2019-07-03 12:32:50.938758186 -0400
+@@ -25,7 +25,7 @@
+ #include "llvm/Support/raw_ostream.h"
+ #include <algorithm>
+ #include <string>
+-#if HAVE_EXECINFO_H
++#if HAVE_EXECINFO_H && defined(__GLIBC__)
+ # include <execinfo.h>         // For backtrace().
+ #endif
+ #if HAVE_SIGNAL_H
+@@ -52,6 +52,7 @@
+ #include <unwind.h>
+ #else
+ #undef HAVE__UNWIND_BACKTRACE
++#undef HAVE_BACKTRACE
+ #endif
+ #endif
+ 
+--- third_party/nasm/nasmlib/realpath.c.orig	2019-07-03 12:23:05.021949895 -0400
++++ third_party/nasm/nasmlib/realpath.c	2019-07-03 12:24:24.246862665 -0400
+@@ -49,7 +49,7 @@
+ 
+ #include "nasmlib.h"
+ 
+-#ifdef HAVE_CANONICALIZE_FILE_NAME
++#if defined(__GLIBC__)
+ 
+ /*
+  * GNU-specific, but avoids the realpath(..., NULL)
+--- mojo/public/cpp/platform/named_platform_channel_posix.cc.orig	2020-07-19 13:26:10.696171063 -0400
++++ mojo/public/cpp/platform/named_platform_channel_posix.cc	2020-07-19 13:26:43.680151714 -0400
+@@ -5,6 +5,7 @@
+ #include "mojo/public/cpp/platform/named_platform_channel.h"
+ 
+ #include <errno.h>
++#include <string.h>
+ #include <sys/socket.h>
+ #include <sys/un.h>
+ #include <unistd.h>
diff --git a/srcpkgs/electron12/files/musl-patches/chromium-musl-hacks.patch b/srcpkgs/electron12/files/musl-patches/chromium-musl-hacks.patch
new file mode 100644
index 000000000000..edc1b060dfb0
--- /dev/null
+++ b/srcpkgs/electron12/files/musl-patches/chromium-musl-hacks.patch
@@ -0,0 +1,22 @@
+--- base/debug/stack_trace.cc.orig	2018-12-08 14:11:25.303475116 +0100
++++ base/debug/stack_trace.cc	2018-12-08 18:00:43.874946999 +0100
+@@ -229,7 +229,7 @@
+ }
+ std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const {
+   std::stringstream stream;
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+   OutputToStreamWithPrefix(&stream, prefix_string);
+ #endif
+   return stream.str();
+--- net/socket/udp_socket_posix.cc.orig	2019-07-03 13:13:46.034342649 -0400
++++ net/socket/udp_socket_posix.cc	2019-07-03 13:23:53.117081909 -0400
+@@ -1194,7 +1194,7 @@
+     msg_iov->push_back({const_cast<char*>(buffer->data()), buffer->length()});
+   msgvec->reserve(buffers.size());
+   for (size_t j = 0; j < buffers.size(); j++)
+-    msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, nullptr, 0, 0}, 0});
++    msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, 0, 0, 0}, 0});
+   int result = HANDLE_EINTR(Sendmmsg(fd, &msgvec[0], buffers.size(), 0));
+   SendResult send_result(0, 0, std::move(buffers));
+   if (result < 0) {
diff --git a/srcpkgs/electron12/files/musl-patches/chromium-musl-libc++.patch b/srcpkgs/electron12/files/musl-patches/chromium-musl-libc++.patch
new file mode 100644
index 000000000000..088d80fad52b
--- /dev/null
+++ b/srcpkgs/electron12/files/musl-patches/chromium-musl-libc++.patch
@@ -0,0 +1,55 @@
+diff --git a/buildtools/third_party/libc++/trunk/include/locale b/buildtools/third_party/libc++/trunk/include/locale
+index d29a2dc..53998bc 100644
+--- buildtools/third_party/libc++/trunk/include/locale
++++ buildtools/third_party/libc++/trunk/include/locale
+@@ -11,6 +11,15 @@
+ #ifndef _LIBCPP_LOCALE
+ #define _LIBCPP_LOCALE
+ 
++// musl doesn't define _l (with locale) variants of functions, as it only supports UTF-8.
++// we can simply make macros that will call the non-localated ones if we're using musl, or rather not-using something that has the _l ones.
++// couldn't find anything glibc #defines when it creates strtoull_l (that it doesn't undefine a few lines later), so let's test against glibc and glibc-likes.
++// almost all glibc-likes define __GNU_LIBRARY__ for compatibility
++#ifndef __GNU_LIBRARY__
++#define strtoull_l(A, B, C, LOC) strtoull(A,B,C)
++#define strtoll_l(A, B, C, LOC) strtoll(A,B,C)
++#endif
++
+ /*
+     locale synopsis
+ 
+diff --git a/buildtools/third_party/libc++/trunk/src/locale.cpp b/buildtools/third_party/libc++/trunk/src/locale.cpp
+index 4163c2c..3d1902a 100644
+--- a/buildtools/third_party/libc++/trunk/src/locale.cpp
++++ buildtools/third_party/libc++/trunk/src/locale.cpp
+@@ -1028,11 +1028,11 @@ ctype<char>::do_narrow(const char_type* low, const char_type* high, char dfault,
+     return low;
+ }
+ 
+-#if defined(__EMSCRIPTEN__)
++//#if defined(__EMSCRIPTEN__)
+ extern "C" const unsigned short ** __ctype_b_loc();
+ extern "C" const int ** __ctype_tolower_loc();
+ extern "C" const int ** __ctype_toupper_loc();
+-#endif
++//#endif
+ 
+ #ifdef _LIBCPP_PROVIDES_DEFAULT_RUNE_TABLE
+ const ctype<char>::mask*
+@@ -1136,12 +1136,10 @@ ctype<char>::classic_table()  _NOEXCEPT
+ #elif defined(_AIX)
+     return (const unsigned int *)__lc_ctype_ptr->obj->mask;
+ #else
+-    // Platform not supported: abort so the person doing the port knows what to
+-    // fix
+-# warning  ctype<char>::classic_table() is not implemented
+-    printf("ctype<char>::classic_table() is not implemented\n");
+-    abort();
+-    return NULL;
++// not sure any other libc like this exists, but there is no way to differentiate musl as of right now
++// to be fair, with the change above, this should always work
++// also, #warning is a gcc extension
++    return (const unsigned long *)*__ctype_b_loc();
+ #endif
+ }
+ #endif
diff --git a/srcpkgs/electron12/files/musl-patches/chromium-musl-sandbox.patch b/srcpkgs/electron12/files/musl-patches/chromium-musl-sandbox.patch
new file mode 100644
index 000000000000..230bb7bbd297
--- /dev/null
+++ b/srcpkgs/electron12/files/musl-patches/chromium-musl-sandbox.patch
@@ -0,0 +1,92 @@
+--- ./sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc.orig	2019-07-03 11:53:21.213479736 -0400
++++ ./sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc	2019-07-03 11:57:01.304998253 -0400
+@@ -140,31 +140,14 @@
+ ResultExpr RestrictCloneToThreadsAndEPERMFork() {
+   const Arg<unsigned long> flags(0);
+ 
+-  // TODO(mdempsky): Extend DSL to support (flags & ~mask1) == mask2.
+-  const uint64_t kAndroidCloneMask = CLONE_VM | CLONE_FS | CLONE_FILES |
+-                                     CLONE_SIGHAND | CLONE_THREAD |
+-                                     CLONE_SYSVSEM;
+-  const uint64_t kObsoleteAndroidCloneMask = kAndroidCloneMask | CLONE_DETACHED;
++  const int required = CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
++                       CLONE_THREAD | CLONE_SYSVSEM;
++  const int safe = CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID | 
++                   CLONE_DETACHED;
++  const BoolExpr thread_clone_ok = (flags&~safe)==required;
+ 
+-  const uint64_t kGlibcPthreadFlags =
+-      CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_THREAD |
+-      CLONE_SYSVSEM | CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID;
+-  const BoolExpr glibc_test = flags == kGlibcPthreadFlags;
+-
+-  const BoolExpr android_test =
+-      AnyOf(flags == kAndroidCloneMask, flags == kObsoleteAndroidCloneMask,
+-            flags == kGlibcPthreadFlags);
+-
+-  // The following two flags are the two important flags in any vfork-emulating
+-  // clone call. EPERM any clone call that contains both of them.
+-  const uint64_t kImportantCloneVforkFlags = CLONE_VFORK | CLONE_VM;
+-
+-  const BoolExpr is_fork_or_clone_vfork =
+-      AnyOf((flags & (CLONE_VM | CLONE_THREAD)) == 0,
+-            (flags & kImportantCloneVforkFlags) == kImportantCloneVforkFlags);
+-
+-  return If(IsAndroid() ? android_test : glibc_test, Allow())
+-      .ElseIf(is_fork_or_clone_vfork, Error(EPERM))
++  return If(thread_clone_ok, Allow())
++      .ElseIf((flags & (CLONE_VM | CLONE_THREAD)) == 0, Error(EPERM))
+       .Else(CrashSIGSYSClone());
+ }
+ 
+--- ./sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc.orig
++++ ./sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -494,6 +494,7 @@
+     case __NR_mlock:
+     case __NR_munlock:
+     case __NR_munmap:
++    case __NR_mremap:
+       return true;
+     case __NR_madvise:
+     case __NR_mincore:
+@@ -509,7 +510,6 @@
+     case __NR_modify_ldt:
+ #endif
+     case __NR_mprotect:
+-    case __NR_mremap:
+     case __NR_msync:
+     case __NR_munlockall:
+     case __NR_readahead:
+diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+index 80f02c0..21fbe21 100644
+--- sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -373,6 +373,7 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) {
+ #if defined(__i386__)
+     case __NR_waitpid:
+ #endif
++    case __NR_set_tid_address:
+       return true;
+     case __NR_clone:  // Should be parameter-restricted.
+     case __NR_setns:  // Privileged.
+@@ -385,7 +386,6 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) {
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
+     case __NR_set_thread_area:
+ #endif
+-    case __NR_set_tid_address:
+     case __NR_unshare:
+ #if !defined(__mips__) && !defined(__aarch64__)
+     case __NR_vfork:
+--- sandbox/policy/linux/bpf_renderer_policy_linux.cc
++++ sandbox/policy/linux/bpf_renderer_policy_linux.cc
+@@ -100,9 +100,9 @@
+     case __NR_uname:
+     case __NR_sched_getparam:
+     case __NR_sched_getscheduler:
++    case __NR_sched_setscheduler:
+       return Allow();
+     case __NR_sched_getaffinity:
+-    case __NR_sched_setscheduler:
+       return RestrictSchedTarget(GetPolicyPid(), sysno);
+     case __NR_prlimit64:
+       // See crbug.com/662450 and setrlimit comment above.
diff --git a/srcpkgs/electron12/files/musl-patches/chromium-musl-sync.patch b/srcpkgs/electron12/files/musl-patches/chromium-musl-sync.patch
new file mode 100644
index 000000000000..bc2fa1937bd3
--- /dev/null
+++ b/srcpkgs/electron12/files/musl-patches/chromium-musl-sync.patch
@@ -0,0 +1,30 @@
+--- third_party/libsync/src/include/sync/sync.h.orig	2020-02-21 07:43:33.748325175 -0500
++++ third_party/libsync/src/include/sync/sync.h	2020-02-21 07:44:07.288328784 -0500
+@@ -19,12 +19,16 @@
+ #ifndef __SYS_CORE_SYNC_H
+ #define __SYS_CORE_SYNC_H
+ 
++#if defined(__GLIBC__)
+ #include <sys/cdefs.h>
++#endif
+ #include <stdint.h>
+ 
+ #include <linux/types.h>
+ 
+-__BEGIN_DECLS
++#ifdef __cplusplus
++extern "C" {
++#endif
+ 
+ struct sync_legacy_merge_data {
+  int32_t fd2;
+@@ -158,6 +162,8 @@
+                                   struct sync_pt_info *itr);
+ void sync_fence_info_free(struct sync_fence_info_data *info);
+ 
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
+ 
+ #endif /* __SYS_CORE_SYNC_H */
diff --git a/srcpkgs/electron12/files/musl-patches/chromium-no-mallinfo.patch b/srcpkgs/electron12/files/musl-patches/chromium-no-mallinfo.patch
new file mode 100644
index 000000000000..254a1f632da5
--- /dev/null
+++ b/srcpkgs/electron12/files/musl-patches/chromium-no-mallinfo.patch
@@ -0,0 +1,54 @@
+--- base/trace_event/malloc_dump_provider.cc.orig
++++ base/trace_event/malloc_dump_provider.cc
+@@ -243,7 +243,7 @@
+   allocated_objects_count = main_heap_info.block_count;
+ #elif defined(OS_FUCHSIA)
+ // TODO(fuchsia): Port, see https://crbug.com/706592.
+-#else
++#elif defined(__GLIBC__)
+   struct mallinfo info = mallinfo();
+   DCHECK_GE(info.arena + info.hblkhd, info.uordblks);
+ 
+--- base/process/process_metrics_posix.cc.orig	2020-11-18 23:50:33.958223497 -0500
++++ base/process/process_metrics_posix.cc	2020-11-18 23:53:52.024589316 -0500
+@@ -119,14 +119,14 @@
+   malloc_statistics_t stats = {0};
+   malloc_zone_statistics(nullptr, &stats);
+   return stats.size_in_use;
+-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
++#elif defined(__GLIBC__) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
+   struct mallinfo minfo = mallinfo();
+ #if BUILDFLAG(USE_TCMALLOC)
+   return minfo.uordblks;
+ #else
+   return minfo.hblkhd + minfo.arena;
+ #endif
+-#elif defined(OS_FUCHSIA)
++#else
+   // TODO(fuchsia): Not currently exposed. https://crbug.com/735087.
+   return 0;
+ #endif
+--- third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Process.inc
++++ third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Process.inc.orig
+@@ -84,7 +84,7 @@
+ }
+ 
+ size_t Process::GetMallocUsage() {
+-#if defined(HAVE_MALLINFO)
++#if defined(HAVE_MALLINFO) && defined(__GLIBC__)
+   struct mallinfo mi;
+   mi = ::mallinfo();
+   return mi.uordblks;
+
+--- third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/config.h.orig	2019-09-30 13:03:42.556880537 -0400
++++ third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/config.h	2019-09-30 13:07:27.989821227 -0400
+@@ -122,7 +122,9 @@
+ /* #undef HAVE_MALLCTL */
+ 
+ /* Define to 1 if you have the `mallinfo' function. */
++#if defined(__GLIBC__)
+ #define HAVE_MALLINFO 1
++#endif
+ 
+ /* Define to 1 if you have the <malloc.h> header file. */
+ #define HAVE_MALLOC_H 1
diff --git a/srcpkgs/electron12/files/musl-patches/chromium-resolver.patch b/srcpkgs/electron12/files/musl-patches/chromium-resolver.patch
new file mode 100644
index 000000000000..29fe2d2f1f3c
--- /dev/null
+++ b/srcpkgs/electron12/files/musl-patches/chromium-resolver.patch
@@ -0,0 +1,38 @@
+--- net/dns/host_resolver_manager.cc.orig	2020-10-09 16:39:12.064069835 -0400
++++ net/dns/host_resolver_manager.cc	2020-10-09 16:42:49.738302772 -0400
+@@ -2779,8 +2779,7 @@
+   NetworkChangeNotifier::AddConnectionTypeObserver(this);
+   if (system_dns_config_notifier_)
+     system_dns_config_notifier_->AddObserver(this);
+-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
+-    !defined(OS_ANDROID)
++#if defined(__GLIBC__)
+   EnsureDnsReloaderInit();
+ #endif
+ 
+--- net/dns/dns_reloader.cc.orig	2020-10-09 16:39:12.064069835 -0400
++++ net/dns/dns_reloader.cc	2020-10-09 16:44:30.442419823 -0400
+@@ -4,9 +4,8 @@
+ 
+ #include "net/dns/dns_reloader.h"
+ 
+-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
+-    !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
+-
++#if defined(__GLIBC__)
++ 
+ #include <resolv.h>
+ 
+ #include "base/lazy_instance.h"
+--- net/dns/host_resolver_proc.cc.orig	2020-10-09 16:39:12.065069836 -0400
++++ net/dns/host_resolver_proc.cc	2020-10-09 16:45:09.641466644 -0400
+@@ -159,8 +159,7 @@
+   base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
+                                                 base::BlockingType::WILL_BLOCK);
+ 
+-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \
+-    !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
++#if defined(__GLIBC__)
+   DnsReloaderMaybeReload();
+ #endif
+   base::Optional<AddressInfo> ai;
diff --git a/srcpkgs/electron12/files/musl-patches/chromium-xxx-ppc64le-support.patch b/srcpkgs/electron12/files/musl-patches/chromium-xxx-ppc64le-support.patch
new file mode 100644
index 000000000000..9001a2a854d0
--- /dev/null
+++ b/srcpkgs/electron12/files/musl-patches/chromium-xxx-ppc64le-support.patch
@@ -0,0 +1,190 @@
+diff --git sandbox/linux/bpf_dsl/seccomp_macros.h sandbox/linux/bpf_dsl/seccomp_macros.h
+index a6aec544e..2a4a7f1bc 100644
+--- sandbox/linux/bpf_dsl/seccomp_macros.h
++++ sandbox/linux/bpf_dsl/seccomp_macros.h
+@@ -16,7 +16,7 @@
+ #if defined(__mips__)
+ // sys/user.h in eglibc misses size_t definition
+ #include <stddef.h>
+-#elif defined(__powerpc64__)
++#elif defined(__powerpc64__) && defined(__GLIBC__)
+ // Manually define greg_t on ppc64
+ typedef unsigned long long greg_t;
+ #endif
+@@ -361,11 +361,11 @@ typedef struct pt_regs regs_struct;
+ #define SECCOMP_ARCH AUDIT_ARCH_PPC64
+ #endif
+ 
+-#define SECCOMP_REG(_ctx, _reg) ((_ctx)->uc_mcontext.regs->gpr[_reg])
++#define SECCOMP_REG(_ctx, _reg) (((struct pt_regs *)(_ctx)->uc_mcontext.regs)->gpr[_reg])
+ 
+ #define SECCOMP_RESULT(_ctx) SECCOMP_REG(_ctx, 3)
+ #define SECCOMP_SYSCALL(_ctx) SECCOMP_REG(_ctx, 0)
+-#define SECCOMP_IP(_ctx) (_ctx)->uc_mcontext.regs->nip
++#define SECCOMP_IP(_ctx) ((struct pt_regs *)(_ctx)->uc_mcontext.regs)->nip
+ #define SECCOMP_PARM1(_ctx) SECCOMP_REG(_ctx, 3)
+ #define SECCOMP_PARM2(_ctx) SECCOMP_REG(_ctx, 4)
+ #define SECCOMP_PARM3(_ctx) SECCOMP_REG(_ctx, 5)
+diff --git sandbox/linux/seccomp-bpf/syscall.cc sandbox/linux/seccomp-bpf/syscall.cc
+index d53a7ff56..c290f0e92 100644
+--- sandbox/linux/seccomp-bpf/syscall.cc
++++ sandbox/linux/seccomp-bpf/syscall.cc
+@@ -499,9 +499,9 @@ void Syscall::PutValueInUcontext(intptr_t ret_val, ucontext_t* ctx) {
+   // Same as MIPS, need to invert ret and set error register (cr0.SO)
+   if (ret_val <= -1 && ret_val >= -4095) {
+     ret_val = -ret_val;
+-    ctx->uc_mcontext.regs->ccr |= (1 << 28);
++    ((struct pt_regs *)ctx->uc_mcontext.regs)->ccr |= (1 << 28);
+   } else {
+-    ctx->uc_mcontext.regs->ccr &= ~(1 << 28);
++    ((struct pt_regs *)ctx->uc_mcontext.regs)->ccr &= ~(1 << 28);
+   }
+ #endif
+   SECCOMP_RESULT(ctx) = static_cast<greg_t>(ret_val);
+diff --git third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
+index cdce9bf8..73d77dda 100644
+--- third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
++++ third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
+@@ -46,7 +46,7 @@
+ 
+ // The following platforms have an implementation of a hardware counter.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
+-  defined(__powerpc__) || defined(__ppc__) || \
++  ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \
+   defined(_M_IX86) || defined(_M_X64)
+ #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
+ #else
+--- third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
++++ third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
+@@ -64,7 +64,7 @@
+ #elif defined(__i386__) || defined(__x86_64__)
+ #define ABSL_STACKTRACE_INL_HEADER \
+   "absl/debugging/internal/stacktrace_x86-inl.inc"
+-#elif defined(__ppc__) || defined(__PPC__)
++#elif (defined(__ppc__) || defined(__PPC__)) && defined(__GLIBC__)
+ #define ABSL_STACKTRACE_INL_HEADER \
+   "absl/debugging/internal/stacktrace_powerpc-inl.inc"
+ #elif defined(__aarch64__)
+diff --git third_party/breakpad/BUILD.gn third_party/breakpad/BUILD.gn
+index f9a60e37..25f3a0b7 100644
+--- third_party/breakpad/BUILD.gn
++++ third_party/breakpad/BUILD.gn
+@@ -637,6 +637,7 @@ if (is_linux || is_android) {
+ 
+     if (current_cpu == "ppc64") {
+         defines = [ "HAVE_GETCONTEXT" ]
++        libs += [ "ucontext" ]
+     } else {
+         sources += [
+             "breakpad/src/common/linux/breakpad_getcontext.S"
+diff --git third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
+index 03afec7a..0264ecf1 100644
+--- third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
++++ third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
+@@ -273,6 +273,9 @@ void ThreadInfo::FillCPUContext(RawContextCPU* out) const {
+ 
+ #elif defined(__powerpc64__)
+ 
++#include <asm/elf.h>
++#include <asm/ptrace.h>
++
+ uintptr_t ThreadInfo::GetInstructionPointer() const {
+     return mcontext.gp_regs[PT_NIP];
+ }
+@@ -290,9 +293,9 @@ void ThreadInfo::FillCPUContext(RawContextCPU* out) const {
+     out->ctr = mcontext.gp_regs[PT_CTR];
+     
+     for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
+-        out->float_save.fpregs[i] = mcontext.fp_regs[i];
++        out->float_save.fpregs[i] = ((uint64_t *)&mcontext.fp_regs)[i];
+ 
+-    out->float_save.fpscr = mcontext.fp_regs[NFPREG-1];
++    out->float_save.fpscr = ((uint64_t *)&mcontext.fp_regs)[ELF_NFPREG-1];
+ 
+     for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++)
+         out->vector_save.save_vr[i] = \
+diff --git third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
+index 1090470f..e580233d 100644
+--- third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
++++ third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
+@@ -257,6 +257,9 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) {
+ 
+ #elif defined(__powerpc64__)
+ 
++#include <asm/elf.h>
++#include <asm/ptrace.h>
++
+ uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
+     return uc->uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP];
+ }
+@@ -280,9 +283,9 @@ void UContextReader::FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
+     out->ctr = uc->uc_mcontext.gp_regs[PT_CTR];
+     
+     for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
+-        out->float_save.fpregs[i] = uc->uc_mcontext.fp_regs[i];
++        out->float_save.fpregs[i] = ((uint64_t *)&uc->uc_mcontext.fp_regs)[i];
+ 
+-    out->float_save.fpscr = uc->uc_mcontext.fp_regs[NFPREG-1];
++    out->float_save.fpscr = ((uint64_t *)&uc->uc_mcontext.fp_regs)[ELF_NFPREG-1];
+ 
+     for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++)
+         out->vector_save.save_vr[i] =
+diff --git third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
+index 5a7ab50c..ee8b858c 100644
+--- third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
++++ third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
+@@ -105,6 +105,11 @@
+ #define PR_SET_PTRACER 0x59616d61
+ #endif
+ 
++/* musl hack, can't include asm/ptrace.h as that causes conflicts */
++#if defined(__powerpc64__) && !defined(PT_NIP)
++#define PT_NIP 32
++#endif
++
+ namespace google_breakpad {
+ 
+ namespace {
+diff --git third_party/crashpad/crashpad/snapshot/linux/signal_context.h third_party/crashpad/crashpad/snapshot/linux/signal_context.h
+index 8e335a09..b2a0f155 100644
+--- third_party/crashpad/crashpad/snapshot/linux/signal_context.h
++++ third_party/crashpad/crashpad/snapshot/linux/signal_context.h
+@@ -469,7 +469,7 @@ struct MContext64 {
+   SignalThreadContext64 gp_regs;
+   SignalFloatContext64  fp_regs;
+   SignalVectorContext64 *v_regs;
+-  int64_t vmx_reserve[69];
++  int64_t vmx_reserve[101];
+ };
+ 
+ struct ContextTraits64 : public Traits64 {
+diff --git third_party/crashpad/crashpad/util/linux/thread_info.h third_party/crashpad/crashpad/util/linux/thread_info.h
+index dea0d1f3..b203e5b2 100644
+--- third_party/crashpad/crashpad/util/linux/thread_info.h
++++ third_party/crashpad/crashpad/util/linux/thread_info.h
+@@ -30,6 +30,7 @@
+ 
+ #if defined(ARCH_CPU_PPC64_FAMILY)
+ #include <sys/ucontext.h>
++#include <asm/ptrace.h>
+ #endif
+ 
+ namespace crashpad {
+diff --git third_party/lss/linux_syscall_support.h third_party/lss/linux_syscall_support.h
+index 9955ce44..4c1cc488 100644
+--- third_party/lss/linux_syscall_support.h
++++ third_party/lss/linux_syscall_support.h
+@@ -4216,9 +4216,13 @@ struct kernel_statfs {
+     }
+   #endif
+   #if defined(__NR_fstatat64)
++    // musl does #define fstatat64 fstatat
++    #undef fstatat64
+     LSS_INLINE _syscall4(int,   fstatat64,        int,   d,
+                          const char *,      p,
+                          struct kernel_stat64 *,   b,    int,   f)
++    // set it back like it was
++    #define fstatat64 fstatat
+   #endif
+   #if defined(__NR_waitpid)
+     // waitpid is polyfilled below when not available.
diff --git a/srcpkgs/electron12/files/patches/chromium-88-glibc-2.33.patch b/srcpkgs/electron12/files/patches/chromium-88-glibc-2.33.patch
new file mode 100644
index 000000000000..64306d5e429e
--- /dev/null
+++ b/srcpkgs/electron12/files/patches/chromium-88-glibc-2.33.patch
@@ -0,0 +1,144 @@
+# Patch made by Kevin Kofler <Kevin@tigcc.ticalc.org>
+# https://bugzilla.redhat.com/show_bug.cgi?id=1904652
+
+diff -up chromium-88.0.4324.96/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc.fstatfix chromium-88.0.4324.96/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
+--- sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc.fstatfix	2021-01-25 10:11:45.427436398 -0500
++++ sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc	2021-01-25 10:12:51.337699003 -0500
+@@ -257,6 +257,18 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+     return RestrictKillTarget(current_pid, sysno);
+   }
+ 
++#if defined(__NR_newfstatat)
++  if (sysno == __NR_newfstatat) {
++    return RewriteFstatatSIGSYS();
++  }
++#endif
++
++#if defined(__NR_fstatat64)
++  if (sysno == __NR_fstatat64) {
++    return RewriteFstatatSIGSYS();
++  }
++#endif
++
+   if (SyscallSets::IsFileSystem(sysno) ||
+       SyscallSets::IsCurrentDirectory(sysno)) {
+     return Error(fs_denied_errno);
+diff -up chromium-88.0.4324.96/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc.fstatfix chromium-88.0.4324.96/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc
+--- sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc.fstatfix	2021-01-25 10:13:10.179774081 -0500
++++ sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc	2021-01-25 10:16:18.790525746 -0500
+@@ -6,6 +6,8 @@
+ 
+ #include "sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h"
+ 
++#include <errno.h>
++#include <fcntl.h>
+ #include <stddef.h>
+ #include <stdint.h>
+ #include <string.h>
+@@ -355,6 +357,35 @@ intptr_t SIGSYSSchedHandler(const struct
+   return -ENOSYS;
+ }
+ 
++intptr_t SIGSYSFstatatHandler(const struct arch_seccomp_data& args,
++                              void* aux) {
++  switch (args.nr) {
++#if defined(__NR_newfstatat)
++    case __NR_newfstatat:
++#endif
++#if defined(__NR_fstatat64)
++    case __NR_fstatat64:
++#endif
++#if defined(__NR_newfstatat) || defined(__NR_fstatat64)
++      if (*reinterpret_cast<const char *>(args.args[1]) == '\0'
++          && args.args[3] == static_cast<uint64_t>(AT_EMPTY_PATH)) {
++        return sandbox::sys_fstat64(static_cast<int>(args.args[0]),
++                                    reinterpret_cast<struct stat64 *>(args.args[2]));
++      } else {
++        errno = EACCES;
++        return -1;
++      }
++      break;
++#endif
++  }
++
++  CrashSIGSYS_Handler(args, aux);
++
++  // Should never be reached.
++  RAW_CHECK(false);
++  return -ENOSYS;
++}
++
+ bpf_dsl::ResultExpr CrashSIGSYS() {
+   return bpf_dsl::Trap(CrashSIGSYS_Handler, NULL);
+ }
+@@ -387,6 +418,10 @@ bpf_dsl::ResultExpr RewriteSchedSIGSYS()
+   return bpf_dsl::Trap(SIGSYSSchedHandler, NULL);
+ }
+ 
++bpf_dsl::ResultExpr RewriteFstatatSIGSYS() {
++  return bpf_dsl::Trap(SIGSYSFstatatHandler, NULL);
++}
++
+ void AllocateCrashKeys() {
+ #if !defined(OS_NACL_NONSFI)
+   if (seccomp_crash_key)
+diff -up chromium-88.0.4324.96/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h.fstatfix chromium-88.0.4324.96/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h
+--- sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h.fstatfix	2021-01-25 10:16:36.982598236 -0500
++++ sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h	2021-01-25 10:18:45.705111027 -0500
+@@ -62,6 +62,10 @@ SANDBOX_EXPORT intptr_t SIGSYSPtraceFail
+ // sched_setparam(), sched_setscheduler()
+ SANDBOX_EXPORT intptr_t SIGSYSSchedHandler(const arch_seccomp_data& args,
+                                            void* aux);
++// If the fstatat syscall is actually a disguised fstat, calls the regular fstat
++// syscall, otherwise, crashes in the same way as CrashSIGSYS_Handler.
++SANDBOX_EXPORT intptr_t SIGSYSFstatatHandler(const struct arch_seccomp_data& args, 
++                                             void* aux);
+ 
+ // Variants of the above functions for use with bpf_dsl.
+ SANDBOX_EXPORT bpf_dsl::ResultExpr CrashSIGSYS();
+@@ -72,6 +76,7 @@ SANDBOX_EXPORT bpf_dsl::ResultExpr Crash
+ SANDBOX_EXPORT bpf_dsl::ResultExpr CrashSIGSYSFutex();
+ SANDBOX_EXPORT bpf_dsl::ResultExpr CrashSIGSYSPtrace();
+ SANDBOX_EXPORT bpf_dsl::ResultExpr RewriteSchedSIGSYS();
++SANDBOX_EXPORT bpf_dsl::ResultExpr RewriteFstatatSIGSYS();
+ 
+ // Allocates a crash key so that Seccomp information can be recorded.
+ void AllocateCrashKeys();
+diff -up chromium-88.0.4324.96/sandbox/linux/services/syscall_wrappers.cc.fstatfix chromium-88.0.4324.96/sandbox/linux/services/syscall_wrappers.cc
+--- sandbox/linux/services/syscall_wrappers.cc.fstatfix	2021-01-25 10:18:53.307141311 -0500
++++ sandbox/linux/services/syscall_wrappers.cc	2021-01-25 10:19:46.982355293 -0500
+@@ -261,4 +261,13 @@ int sys_sigaction(int signum,
+ 
+ #endif  // defined(MEMORY_SANITIZER)
+ 
++SANDBOX_EXPORT int sys_fstat64(int fd, struct stat64 *buf)
++{
++#if defined(__NR_fstat64)
++    return syscall(__NR_fstat64, fd, buf);
++#else
++    return syscall(__NR_fstat, fd, buf);
++#endif
++}
++
+ }  // namespace sandbox
+diff -up chromium-88.0.4324.96/sandbox/linux/services/syscall_wrappers.h.fstatfix chromium-88.0.4324.96/sandbox/linux/services/syscall_wrappers.h
+--- sandbox/linux/services/syscall_wrappers.h.fstatfix	2021-01-25 10:19:53.115379741 -0500
++++ sandbox/linux/services/syscall_wrappers.h	2021-01-25 10:20:45.485588421 -0500
+@@ -17,6 +17,7 @@ struct sock_fprog;
+ struct rlimit64;
+ struct cap_hdr;
+ struct cap_data;
++struct stat64;
+ 
+ namespace sandbox {
+ 
+@@ -84,6 +85,9 @@ SANDBOX_EXPORT int sys_sigaction(int sig
+                                  const struct sigaction* act,
+                                  struct sigaction* oldact);
+ 
++// Recent glibc rewrites fstat to fstatat.
++SANDBOX_EXPORT int sys_fstat64(int fd, struct stat64 *buf);
++
+ }  // namespace sandbox
+ 
+ #endif  // SANDBOX_LINUX_SERVICES_SYSCALL_WRAPPERS_H_
diff --git a/srcpkgs/electron12/files/patches/chromium-89-AXTreeSerializer-include.patch b/srcpkgs/electron12/files/patches/chromium-89-AXTreeSerializer-include.patch
new file mode 100644
index 000000000000..7372e44d1547
--- /dev/null
+++ b/srcpkgs/electron12/files/patches/chromium-89-AXTreeSerializer-include.patch
@@ -0,0 +1,25 @@
+From c06ddc4935bf1394812c011ce5d93898ccc8a53a Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Tue, 09 Feb 2021 19:22:57 +0000
+Subject: [PATCH] IWYU: add ctime for std::time
+
+Bug: None
+Change-Id: I8bdae43209984242b9f5e538d74ece4409b65e3c
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2679610
+Reviewed-by: Katie Dektar <katie@chromium.org>
+Commit-Queue: Katie Dektar <katie@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#852287}
+---
+
+diff --git a/ui/accessibility/ax_tree_serializer.h b/ui/accessibility/ax_tree_serializer.h
+index ddbbdcd..1790e3b 100644
+--- ui/accessibility/ax_tree_serializer.h
++++ ui/accessibility/ax_tree_serializer.h
+@@ -8,6 +8,7 @@
+ #include <stddef.h>
+ #include <stdint.h>
+ 
++#include <ctime>
+ #include <ostream>
+ #include <unordered_map>
+ #include <unordered_set>
diff --git a/srcpkgs/electron12/files/patches/chromium-89-add-dependency-on-opus-in-webcodecs.patch b/srcpkgs/electron12/files/patches/chromium-89-add-dependency-on-opus-in-webcodecs.patch
new file mode 100644
index 000000000000..c25897791d95
--- /dev/null
+++ b/srcpkgs/electron12/files/patches/chromium-89-add-dependency-on-opus-in-webcodecs.patch
@@ -0,0 +1,43 @@
+From b5b80df7dafba8cafa4c6c0ba2153dfda467dfc9 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Wed, 27 Jan 2021 20:31:51 +0000
+Subject: [PATCH] add dependency on opus in webcodecs
+
+webcodecs uses opus, but dependency is missing. With unbundled
+opus library build fails, because include path is incomplete.
+
+Bug: 1169758
+Change-Id: I01369364327461196a81002479636cf45017669a
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2644623
+Reviewed-by: Dale Curtis <dalecurtis@chromium.org>
+Commit-Queue: Dale Curtis <dalecurtis@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#847754}
+---
+ third_party/blink/renderer/modules/webcodecs/BUILD.gn | 1 +
+ third_party/blink/renderer/modules/webcodecs/DEPS     | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/third_party/blink/renderer/modules/webcodecs/BUILD.gn b/third_party/blink/renderer/modules/webcodecs/BUILD.gn
+index fdf4ca0fafc72..01a7bf809ffca 100644
+--- third_party/blink/renderer/modules/webcodecs/BUILD.gn
++++ third_party/blink/renderer/modules/webcodecs/BUILD.gn
+@@ -65,6 +65,7 @@ blink_modules_sources("webcodecs") {
+     "//media/mojo/clients",
+     "//media/mojo/mojom",
+     "//third_party/libyuv:libyuv",
++    "//third_party/opus",
+   ]
+   if (media_use_openh264) {
+     deps += [ "//third_party/openh264:encoder" ]
+diff --git a/third_party/blink/renderer/modules/webcodecs/DEPS b/third_party/blink/renderer/modules/webcodecs/DEPS
+index b8dd596da8caf..ea1919d12205a 100644
+--- third_party/blink/renderer/modules/webcodecs/DEPS
++++ third_party/blink/renderer/modules/webcodecs/DEPS
+@@ -19,6 +19,7 @@ include_rules = [
+ 
+     "+third_party/libyuv",
+     "+third_party/openh264",
++    "+third_party/opus",
+ 
+     "+ui/gfx/color_space.h",
+     "+ui/gfx/geometry/rect.h",
diff --git a/srcpkgs/electron12/files/patches/chromium-89-dawn-include.patch b/srcpkgs/electron12/files/patches/chromium-89-dawn-include.patch
new file mode 100644
index 000000000000..9876ba20eb51
--- /dev/null
+++ b/srcpkgs/electron12/files/patches/chromium-89-dawn-include.patch
@@ -0,0 +1,28 @@
+From 5a56bfe8d281250a1deee0d116a9fcde65b9c29a Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Fri, 15 Jan 2021 18:37:05 +0000
+Subject: [PATCH] IWYU: add various missing includes
+
+std::weak_ptr and std::shared_ptr require map
+*int*_t types require cstdint
+---
+ third_party/dawn/src/dawn_wire/client/Device.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/third_party/dawn/src/dawn_wire/client/Device.h b/third_party/dawn/src/dawn_wire/client/Device.h
+index 3f16700..1082549 100644
+--- third_party/dawn/src/dawn_wire/client/Device.h
++++ third_party/dawn/src/dawn_wire/client/Device.h
+@@ -22,7 +22,9 @@
+ #include "dawn_wire/client/ApiObjects_autogen.h"
+ #include "dawn_wire/client/ObjectBase.h"
+ 
++#include <cstdint>
+ #include <map>
++#include <memory>
+ 
+ namespace dawn_wire { namespace client {
+ 
+-- 
+2.26.2
+
diff --git a/srcpkgs/electron12/files/patches/chromium-89-quiche-dcheck.patch b/srcpkgs/electron12/files/patches/chromium-89-quiche-dcheck.patch
new file mode 100644
index 000000000000..b2f164fac9ba
--- /dev/null
+++ b/srcpkgs/electron12/files/patches/chromium-89-quiche-dcheck.patch
@@ -0,0 +1,29 @@
+From 7cd4eab0bfca6192f14d6143410e1ae774eb1c29 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Thu, 31 Dec 2020 11:57:22 +0000
+Subject: [PATCH] GCC: do not pass unique_ptr to DCHECK_NE, but the actual
+ pointer
+
+DCHECK_NE comparison requires CheckOpValueStr to be defined for the
+type, or providing an output stream operator. A unique_ptr does not
+provide any. USE DCHECK instead.
+---
+ net/third_party/quiche/src/quic/core/quic_path_validator.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/net/third_party/quiche/src/quic/core/quic_path_validator.cc b/net/third_party/quiche/src/quic/core/quic_path_validator.cc
+index 0722216..fb2aeaf 100644
+--- net/third_party/quiche/src/quic/core/quic_path_validator.cc
++++ net/third_party/quiche/src/quic/core/quic_path_validator.cc
+@@ -68,7 +68,7 @@ void QuicPathValidator::OnPathResponse(const QuicPathFrameBuffer& probing_data,
+ void QuicPathValidator::StartPathValidation(
+     std::unique_ptr<QuicPathValidationContext> context,
+     std::unique_ptr<ResultDelegate> result_delegate) {
+-  DCHECK_NE(nullptr, context);
++  DCHECK(context);
+   QUIC_DLOG(INFO) << "Start validating path " << *context
+                   << " via writer: " << context->WriterToUse();
+   if (path_context_ != nullptr) {
+-- 
+2.26.2
+
diff --git a/srcpkgs/electron12/files/patches/chromium-89-skia-CropRect.patch b/srcpkgs/electron12/files/patches/chromium-89-skia-CropRect.patch
new file mode 100644
index 000000000000..9712c92658f6
--- /dev/null
+++ b/srcpkgs/electron12/files/patches/chromium-89-skia-CropRect.patch
@@ -0,0 +1,38 @@
+diff --git a/third_party/skia/include/effects/SkImageFilters.h b/third_party/skia/include/effects/SkImageFilters.h
+index 04cce0a..d06b007 100644
+--- third_party/skia/include/effects/SkImageFilters.h
++++ third_party/skia/include/effects/SkImageFilters.h
+@@ -23,6 +23,9 @@ class SkColorFilter;
+ class SkPaint;
+ class SkRegion;
+ 
++constexpr SkRect kNoCropRect = {SK_ScalarNegativeInfinity, SK_ScalarNegativeInfinity,
++                                SK_ScalarInfinity, SK_ScalarInfinity};
++
+ // A set of factory functions providing useful SkImageFilter effects. For image filters that take an
+ // input filter, providing nullptr means it will automatically use the dynamic source image. This
+ // source depends on how the filter is applied, but is either the contents of a saved layer when
+@@ -33,8 +36,6 @@ public:
+     // to those types as a crop rect for the image filter factories. It's not intended to be used
+     // directly.
+     struct CropRect {
+-        static constexpr SkRect kNoCropRect = {SK_ScalarNegativeInfinity, SK_ScalarNegativeInfinity,
+-                                               SK_ScalarInfinity, SK_ScalarInfinity};
+         CropRect() : fCropRect(kNoCropRect) {}
+         // Intentionally not explicit so callers don't have to use this type but can use SkIRect or
+         // SkRect as desired.
+diff --git a/third_party/skia/src/effects/imagefilters/SkImageFilters.cpp b/third_party/skia/src/effects/imagefilters/SkImageFilters.cpp
+index 5290b00..fb97fc1 100644
+--- third_party/skia/src/effects/imagefilters/SkImageFilters.cpp
++++ third_party/skia/src/effects/imagefilters/SkImageFilters.cpp
+@@ -47,10 +47,6 @@ static SkImageFilter::CropRect to_legacy_crop_rect(const SkImageFilters::CropRec
+                                          : SkImageFilter::CropRect(SkRect::MakeEmpty(), 0x0);
+ }
+ 
+-// Allow kNoCropRect to be referenced (for certain builds, e.g. macOS libFuzzer chromium target,
+-// see crbug.com/1139725)
+-constexpr SkRect SkImageFilters::CropRect::kNoCropRect;
+-
+ void SkImageFilters::RegisterFlattenables() {
+     SkAlphaThresholdFilter::RegisterFlattenables();
+     SkArithmeticImageFilter::RegisterFlattenables();
diff --git a/srcpkgs/electron12/files/patches/chromium-89-x11-ozone-fix-two-edge-cases.patch b/srcpkgs/electron12/files/patches/chromium-89-x11-ozone-fix-two-edge-cases.patch
new file mode 100644
index 000000000000..7fb586da169a
--- /dev/null
+++ b/srcpkgs/electron12/files/patches/chromium-89-x11-ozone-fix-two-edge-cases.patch
@@ -0,0 +1,135 @@
+From 5e3a738b1204941aab9f15c0eb3d06e20fefd96e Mon Sep 17 00:00:00 2001
+From: Scott Violet <sky@chromium.org>
+Date: Mon, 8 Mar 2021 21:07:39 +0000
+Subject: [PATCH] x11/ozone: fix two edge cases
+
+WindowTreeHost::OnHostMovedInPixels() may trigger a nested message
+loop (tab dragging), which when the stack unravels means this may
+be deleted. This adds an early out if this happens.
+
+X11WholeScreenMoveLoop has a similar issue, in so far as notifying
+the delegate may delete this.
+
+BUG=1185482
+TEST=WindowTreeHostPlatform.DeleteHostFromOnHostMovedInPixels
+
+Change-Id: Ieca1c90b3e4358da50b332abe2941fdbb50c5c25
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2743555
+Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
+Commit-Queue: Scott Violet <sky@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#860852}
+---
+ ui/aura/window_tree_host_platform.cc          | 10 ++++-
+ ui/aura/window_tree_host_platform_unittest.cc | 40 ++++++++++++++++++-
+ ui/base/x/x11_whole_screen_move_loop.cc       |  4 ++
+ 3 files changed, 51 insertions(+), 3 deletions(-)
+
+diff --git a/ui/aura/window_tree_host_platform.cc b/ui/aura/window_tree_host_platform.cc
+index ce8395fe07..7589542026 100644
+--- ui/aura/window_tree_host_platform.cc
++++ ui/aura/window_tree_host_platform.cc
+@@ -214,13 +214,21 @@ void WindowTreeHostPlatform::OnBoundsChanged(const gfx::Rect& new_bounds) {
+   float current_scale = compositor()->device_scale_factor();
+   float new_scale = ui::GetScaleFactorForNativeView(window());
+   gfx::Rect old_bounds = bounds_in_pixels_;
++  auto weak_ref = GetWeakPtr();
+   bounds_in_pixels_ = new_bounds;
+-  if (bounds_in_pixels_.origin() != old_bounds.origin())
++  if (bounds_in_pixels_.origin() != old_bounds.origin()) {
+     OnHostMovedInPixels(bounds_in_pixels_.origin());
++    // Changing the bounds may destroy this.
++    if (!weak_ref)
++      return;
++  }
+   if (bounds_in_pixels_.size() != old_bounds.size() ||
+       current_scale != new_scale) {
+     pending_size_ = gfx::Size();
+     OnHostResizedInPixels(bounds_in_pixels_.size());
++    // Changing the size may destroy this.
++    if (!weak_ref)
++      return;
+   }
+   DCHECK_GT(on_bounds_changed_recursion_depth_, 0);
+   if (--on_bounds_changed_recursion_depth_ == 0) {
+diff --git a/ui/aura/window_tree_host_platform_unittest.cc b/ui/aura/window_tree_host_platform_unittest.cc
+index eda14e2f0c..4de039c88a 100644
+--- ui/aura/window_tree_host_platform_unittest.cc
++++ ui/aura/window_tree_host_platform_unittest.cc
+@@ -34,7 +34,7 @@ class TestWindowTreeHost : public WindowTreeHostPlatform {
+ // OnHostWill/DidProcessBoundsChange. Additionally, this triggers a bounds
+ // change from within OnHostResized(). Such a scenario happens in production
+ // code.
+-class TestWindowTreeHostObserver : public aura::WindowTreeHostObserver {
++class TestWindowTreeHostObserver : public WindowTreeHostObserver {
+  public:
+   TestWindowTreeHostObserver(WindowTreeHostPlatform* host,
+                              ui::PlatformWindow* platform_window)
+@@ -51,7 +51,7 @@ class TestWindowTreeHostObserver : public aura::WindowTreeHostObserver {
+     return on_host_will_process_bounds_change_count_;
+   }
+ 
+-  // aura::WindowTreeHostObserver:
++  // WindowTreeHostObserver:
+   void OnHostResized(WindowTreeHost* host) override {
+     if (!should_change_bounds_in_on_resized_)
+       return;
+@@ -92,5 +92,41 @@ TEST_F(WindowTreeHostPlatformTest, HostWillProcessBoundsChangeRecursion) {
+   EXPECT_EQ(1, observer.on_host_will_process_bounds_change_count());
+ }
+ 
++// Deletes WindowTreeHostPlatform from OnHostMovedInPixels().
++class DeleteHostWindowTreeHostObserver : public WindowTreeHostObserver {
++ public:
++  explicit DeleteHostWindowTreeHostObserver(
++      std::unique_ptr<TestWindowTreeHost> host)
++      : host_(std::move(host)) {
++    host_->AddObserver(this);
++  }
++  ~DeleteHostWindowTreeHostObserver() override = default;
++
++  TestWindowTreeHost* host() { return host_.get(); }
++
++  // WindowTreeHostObserver:
++  void OnHostMovedInPixels(WindowTreeHost* host,
++                           const gfx::Point& new_origin_in_pixels) override {
++    host_->RemoveObserver(this);
++    host_.reset();
++  }
++
++ private:
++  std::unique_ptr<TestWindowTreeHost> host_;
++
++  DISALLOW_COPY_AND_ASSIGN(DeleteHostWindowTreeHostObserver);
++};
++
++// Verifies WindowTreeHostPlatform can be safely deleted when calling
++// OnHostMovedInPixels().
++// Regression test for https://crbug.com/1185482
++TEST_F(WindowTreeHostPlatformTest, DeleteHostFromOnHostMovedInPixels) {
++  std::unique_ptr<TestWindowTreeHost> host =
++      std::make_unique<TestWindowTreeHost>();
++  DeleteHostWindowTreeHostObserver observer(std::move(host));
++  observer.host()->SetBoundsInPixels(gfx::Rect(1, 2, 3, 4));
++  EXPECT_EQ(nullptr, observer.host());
++}
++
+ }  // namespace
+ }  // namespace aura
+diff --git a/ui/base/x/x11_whole_screen_move_loop.cc b/ui/base/x/x11_whole_screen_move_loop.cc
+index 5ed215db66..db678799db 100644
+--- ui/base/x/x11_whole_screen_move_loop.cc
++++ ui/base/x/x11_whole_screen_move_loop.cc
+@@ -78,9 +78,13 @@ X11WholeScreenMoveLoop::~X11WholeScreenMoveLoop() {
+ void X11WholeScreenMoveLoop::DispatchMouseMovement() {
+   if (!last_motion_in_screen_)
+     return;
++  auto weak_ref = weak_factory_.GetWeakPtr();
+   delegate_->OnMouseMovement(last_motion_in_screen_->root_location(),
+                              last_motion_in_screen_->flags(),
+                              last_motion_in_screen_->time_stamp());
++  // The delegate may delete this during dispatch.
++  if (!weak_ref)
++    return;
+   last_motion_in_screen_.reset();
+ }
+ 
diff --git a/srcpkgs/electron12/files/patches/chromium-browser-size_t.patch b/srcpkgs/electron12/files/patches/chromium-browser-size_t.patch
new file mode 100644
index 000000000000..fa214d987d61
--- /dev/null
+++ b/srcpkgs/electron12/files/patches/chromium-browser-size_t.patch
@@ -0,0 +1,10 @@
+--- chrome/browser/search/background/ntp_backgrounds.h	2020-08-10 20:39:20.000000000 +0200
++++ chrome/browser/search/background/ntp_backgrounds.h	2020-09-04 13:48:22.640023256 +0200
+@@ -6,6 +6,7 @@
+ #define CHROME_BROWSER_SEARCH_BACKGROUND_NTP_BACKGROUNDS_H_
+ 
+ #include <array>
++#include <cstddef>
+ 
+ class GURL;
+ 
diff --git a/srcpkgs/electron12/files/patches/chromium-libc_malloc.patch b/srcpkgs/electron12/files/patches/chromium-libc_malloc.patch
new file mode 100644
index 000000000000..eda11ec86637
--- /dev/null
+++ b/srcpkgs/electron12/files/patches/chromium-libc_malloc.patch
@@ -0,0 +1,26 @@
+--- base/process/memory_linux.cc.orig	2017-09-15 08:41:43.000000000 +0000
++++ base/process/memory_linux.cc	2017-09-15 08:44:39.804995469 +0000
+@@ -21,6 +21,12 @@
+ #include "third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h"
+ #endif
+ 
++#if defined(LIBC_GLIBC)
++extern "C" {
++extern void *__libc_malloc(size_t size);
++}
++#endif
++
+ namespace base {
+ 
+ size_t g_oom_size = 0U;
+--- base/process/memory_linux.cc.orig	2020-08-30 14:18:35.401132593 -0400
++++ base/process/memory_linux.cc	2020-08-30 14:19:08.030199189 -0400
+@@ -141,7 +141,7 @@
+     (!defined(LIBC_GLIBC) && !BUILDFLAG(USE_TCMALLOC))
+   *result = malloc(size);
+ #elif defined(LIBC_GLIBC) && !BUILDFLAG(USE_TCMALLOC)
+-  *result = __libc_malloc(size);
++  *result = ::__libc_malloc(size);
+ #elif BUILDFLAG(USE_TCMALLOC)
+   *result = tc_malloc_skip_new_handler(size);
+ #endif
diff --git a/srcpkgs/electron12/files/patches/chromium-musl-v8-monotonic-pthread-cont_timedwait.patch b/srcpkgs/electron12/files/patches/chromium-musl-v8-monotonic-pthread-cont_timedwait.patch
new file mode 100644
index 000000000000..33a8ea32c9c1
--- /dev/null
+++ b/srcpkgs/electron12/files/patches/chromium-musl-v8-monotonic-pthread-cont_timedwait.patch
@@ -0,0 +1,24 @@
+Use monotonic clock for pthread_cond_timedwait with musl too.
+
+diff --git a/v8/src/base/platform/condition-variable.cc b/v8/src/base/platform/condition-variable.cc
+index 5ea7083..c13027e 100644
+--- ./v8/src/base/platform/condition-variable.cc
++++ ./v8/src/base/platform/condition-variable.cc
+@@ -16,7 +16,7 @@ namespace base {
+ 
+ ConditionVariable::ConditionVariable() {
+ #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
+-     (V8_OS_LINUX && V8_LIBC_GLIBC))
++     V8_OS_LINUX)
+   // On Free/Net/OpenBSD and Linux with glibc we can change the time
+   // source for pthread_cond_timedwait() to use the monotonic clock.
+   pthread_condattr_t attr;
+@@ -92,7 +92,7 @@ bool ConditionVariable::WaitFor(Mutex* mutex, const TimeDelta& rel_time) {
+       &native_handle_, &mutex->native_handle(), &ts);
+ #else
+ #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
+-     (V8_OS_LINUX && V8_LIBC_GLIBC))
++     V8_OS_LINUX)
+   // On Free/Net/OpenBSD and Linux with glibc we can change the time
+   // source for pthread_cond_timedwait() to use the monotonic clock.
+   result = clock_gettime(CLOCK_MONOTONIC, &ts);
diff --git a/srcpkgs/electron12/files/patches/chromium-no-execinfo.patch b/srcpkgs/electron12/files/patches/chromium-no-execinfo.patch
new file mode 100644
index 000000000000..386997e8ed14
--- /dev/null
+++ b/srcpkgs/electron12/files/patches/chromium-no-execinfo.patch
@@ -0,0 +1,72 @@
+--- base/debug/stack_trace_posix.cc.orig	2019-05-14 14:49:44.000000000 -0400
++++ base/debug/stack_trace_posix.cc	2019-07-02 10:43:43.490045013 -0400
+@@ -27,7 +27,7 @@
+ #if !defined(USE_SYMBOLIZE)
+ #include <cxxabi.h>
+ #endif
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ #include <execinfo.h>
+ #endif
+ 
+@@ -86,7 +86,7 @@
+   // Note: code in this function is NOT async-signal safe (std::string uses
+   // malloc internally).
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+   std::string::size_type search_from = 0;
+   while (search_from < text->size()) {
+     // Look for the start of a mangled symbol, from search_from.
+@@ -121,7 +121,7 @@
+       search_from = mangled_start + 2;
+     }
+   }
+-#endif  // !defined(__UCLIBC__) && !defined(_AIX)
++#endif  // defined(__GLIBC__) && !defined(_AIX)
+ }
+ #endif  // !defined(USE_SYMBOLIZE)
+ 
+@@ -133,7 +133,7 @@
+   virtual ~BacktraceOutputHandler() = default;
+ };
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ void OutputPointer(void* pointer, BacktraceOutputHandler* handler) {
+   // This should be more than enough to store a 64-bit number in hex:
+   // 16 hex digits + 1 for null-terminator.
+@@ -216,7 +216,7 @@
+   }
+ #endif  // defined(USE_SYMBOLIZE)
+ }
+-#endif  // !defined(__UCLIBC__) && !defined(_AIX)
++#endif  // defined(__GLIBC__) && !defined(_AIX)
+ 
+ void PrintToStderr(const char* output) {
+   // NOTE: This code MUST be async-signal safe (it's used by in-process
+@@ -812,7 +812,7 @@
+   // NOTE: This code MUST be async-signal safe (it's used by in-process
+   // stack dumping signal handler). NO malloc or stdio is allowed here.
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+   // Though the backtrace API man page does not list any possible negative
+   // return values, we take no chance.
+   return base::saturated_cast<size_t>(backtrace(trace, count));
+@@ -825,13 +825,13 @@
+ // NOTE: This code MUST be async-signal safe (it's used by in-process
+ // stack dumping signal handler). NO malloc or stdio is allowed here.
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+   PrintBacktraceOutputHandler handler;
+   ProcessBacktrace(trace_, count_, prefix_string, &handler);
+ #endif
+ }
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+ void StackTrace::OutputToStreamWithPrefix(std::ostream* os,
+                                           const char* prefix_string) const {
+   StreamBacktraceOutputHandler handler(os);
diff --git a/srcpkgs/electron12/files/patches/chromium-no-getcontext.patch b/srcpkgs/electron12/files/patches/chromium-no-getcontext.patch
new file mode 100644
index 000000000000..b2a498734c93
--- /dev/null
+++ b/srcpkgs/electron12/files/patches/chromium-no-getcontext.patch
@@ -0,0 +1,27 @@
+--- third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc.orig	2015-12-06 09:59:55.554536646 +0100
++++ third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc	2015-12-06 10:01:16.818238035 +0100
+@@ -477,7 +477,9 @@ bool ExceptionHandler::SimulateSignalDel
+   siginfo.si_code = SI_USER;
+   siginfo.si_pid = getpid();
+   ucontext_t context;
++#if defined(__GLIBC__)
+   getcontext(&context);
++#endif
+   return HandleSignal(sig, &siginfo, &context);
+ }
+ 
+@@ -647,9 +649,14 @@ bool ExceptionHandler::WriteMinidump() {
+   sys_prctl(PR_SET_DUMPABLE, 1, 0, 0, 0);
+ 
+   CrashContext context;
++
++#if defined(__GLIBC__)
+   int getcontext_result = getcontext(&context.context);
+   if (getcontext_result)
+     return false;
++#else
++  return false;
++#endif
+ 
+ #if defined(__i386__)
+   // In CPUFillFromUContext in minidumpwriter.cc the stack pointer is retrieved
diff --git a/srcpkgs/electron12/files/patches/chromium-sandbox-membarrier.patch b/srcpkgs/electron12/files/patches/chromium-sandbox-membarrier.patch
new file mode 100644
index 000000000000..86ca16fc2d70
--- /dev/null
+++ b/srcpkgs/electron12/files/patches/chromium-sandbox-membarrier.patch
@@ -0,0 +1,10 @@
+--- sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -370,6 +370,7 @@
+   switch (sysno) {
+     case __NR_exit:
+     case __NR_exit_group:
++    case __NR_membarrier:
+     case __NR_wait4:
+     case __NR_waitid:
+ #if defined(__i386__)
diff --git a/srcpkgs/electron12/files/patches/chromium-sandbox-sched_getparam.patch b/srcpkgs/electron12/files/patches/chromium-sandbox-sched_getparam.patch
new file mode 100644
index 000000000000..ba8af49c5f8f
--- /dev/null
+++ b/srcpkgs/electron12/files/patches/chromium-sandbox-sched_getparam.patch
@@ -0,0 +1,20 @@
+Allow SYS_sched_getparam and SYS_sched_getscheduler
+musl uses them for pthread_getschedparam()
+
+source: https://git.alpinelinux.org/aports/commit/community/chromium?id=54af9f8ac24f52d382c5758e2445bf0206eff40e
+
+--- sandbox/policy/linux/bpf_renderer_policy_linux.cc.orig	2019-10-08 21:03:18.253080425 +0200
++++ sandbox/policy/linux/bpf_renderer_policy_linux.cc	2019-10-08 21:04:19.648549718 +0200
+@@ -88,10 +88,10 @@
+     case __NR_sysinfo:
+     case __NR_times:
+     case __NR_uname:
+-      return Allow();
+-    case __NR_sched_getaffinity:
+     case __NR_sched_getparam:
+     case __NR_sched_getscheduler:
++      return Allow();
++    case __NR_sched_getaffinity:
+     case __NR_sched_setscheduler:
+       return sandbox::RestrictSchedTarget(GetPolicyPid(), sysno);
+     case __NR_prlimit64:
diff --git a/srcpkgs/electron12/files/patches/chromium-sndio.patch b/srcpkgs/electron12/files/patches/chromium-sndio.patch
new file mode 100644
index 000000000000..d313b4a667c7
--- /dev/null
+++ b/srcpkgs/electron12/files/patches/chromium-sndio.patch
@@ -0,0 +1,886 @@
+diff -Naur chromium-83.0.4103.97.orig/media/BUILD.gn chromium-83.0.4103.97/media/BUILD.gn
+--- media/BUILD.gn.orig	2020-06-03 20:40:26.000000000 +0200
++++ media/BUILD.gn	2020-06-13 17:32:28.510395975 +0200
+@@ -65,6 +65,9 @@
+       defines += [ "DLOPEN_PULSEAUDIO" ]
+     }
+   }
++  if (use_sndio) {
++    defines += [ "USE_SNDIO" ]
++  }
+   if (use_cras) {
+     defines += [ "USE_CRAS" ]
+   }
+diff -Naur chromium-83.0.4103.97.orig/media/audio/BUILD.gn chromium-83.0.4103.97/media/audio/BUILD.gn
+--- media/audio/BUILD.gn.orig	2020-06-03 20:39:37.000000000 +0200
++++ media/audio/BUILD.gn	2020-06-13 17:32:28.511395969 +0200
+@@ -236,6 +236,17 @@
+     sources += [ "linux/audio_manager_linux.cc" ]
+   }
+ 
++  if (use_sndio) {
++    libs += [ "sndio" ]
++    sources += [
++      "sndio/audio_manager_sndio.cc",
++      "sndio/sndio_input.cc",
++      "sndio/sndio_input.h",
++      "sndio/sndio_output.cc",
++      "sndio/sndio_output.h"
++    ]
++  }
++
+   if (use_alsa) {
+     libs += [ "asound" ]
+     sources += [
+diff -Naur chromium-83.0.4103.97.orig/media/audio/linux/audio_manager_linux.cc chromium-83.0.4103.97/media/audio/linux/audio_manager_linux.cc
+--- media/audio/linux/audio_manager_linux.cc.orig	2020-06-03 20:39:37.000000000 +0200
++++ media/audio/linux/audio_manager_linux.cc	2020-06-13 18:09:43.623333167 +0200
+@@ -19,6 +19,11 @@
+ #include "media/audio/pulse/audio_manager_pulse.h"
+ #include "media/audio/pulse/pulse_util.h"
+ #endif
++#if defined(USE_SNDIO)
++#include "media/audio/sndio/audio_manager_sndio.h"
++#include "media/audio/sndio/sndio_input.h"
++#include "media/audio/sndio/sndio_output.h"
++#endif
+ 
+ namespace media {
+ 
+@@ -26,7 +31,8 @@
+   kPulse,
+   kAlsa,
+   kCras,
+-  kAudioIOMax = kCras  // Must always be equal to largest logged entry.
++  kSndio,
++  kAudioIOMax = kSndio // Must always be equal to largest logged entry.
+ };
+ 
+ std::unique_ptr<media::AudioManager> CreateAudioManager(
+@@ -39,6 +45,16 @@
+                                               audio_log_factory);
+   }
+ 
++#if defined(USE_SNDIO)
++  struct sio_hdl *hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0);
++  if (hdl != NULL) {
++    sio_close(hdl);
++    UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kSndio, kAudioIOMax + 1);
++    return std::make_unique<AudioManagerSndio>(std::move(audio_thread),
++                                                  audio_log_factory);
++  }
++#endif
++
+ #if defined(USE_CRAS)
+   if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseCras)) {
+     UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kCras, kAudioIOMax + 1);
+diff -Naur chromium-83.0.4103.97.orig/media/audio/sndio/audio_manager_sndio.cc chromium-83.0.4103.97/media/audio/sndio/audio_manager_sndio.cc
+--- media/audio/sndio/audio_manager_sndio.cc.orig	1970-01-01 01:00:00.000000000 +0100
++++ media/audio/sndio/audio_manager_sndio.cc	2020-06-13 17:32:28.511395969 +0200
+@@ -0,0 +1,148 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "media/audio/sndio/audio_manager_sndio.h"
++
++#include "base/metrics/histogram_macros.h"
++#include "base/memory/ptr_util.h"
++#include "media/audio/audio_device_description.h"
++#include "media/audio/audio_output_dispatcher.h"
++#include "media/audio/sndio/sndio_input.h"
++#include "media/audio/sndio/sndio_output.h"
++#include "media/base/limits.h"
++#include "media/base/media_switches.h"
++
++namespace media {
++
++
++// Maximum number of output streams that can be open simultaneously.
++static const int kMaxOutputStreams = 4;
++
++// Default sample rate for input and output streams.
++static const int kDefaultSampleRate = 48000;
++
++void AddDefaultDevice(AudioDeviceNames* device_names) {
++  DCHECK(device_names->empty());
++  device_names->push_front(AudioDeviceName::CreateDefault());
++}
++
++bool AudioManagerSndio::HasAudioOutputDevices() {
++  return true;
++}
++
++bool AudioManagerSndio::HasAudioInputDevices() {
++  return true;
++}
++
++void AudioManagerSndio::GetAudioInputDeviceNames(
++    AudioDeviceNames* device_names) {
++  DCHECK(device_names->empty());
++  AddDefaultDevice(device_names);
++}
++
++void AudioManagerSndio::GetAudioOutputDeviceNames(
++    AudioDeviceNames* device_names) {
++  AddDefaultDevice(device_names);
++}
++
++const char* AudioManagerSndio::GetName() {
++  return "SNDIO";
++}
++
++AudioParameters AudioManagerSndio::GetInputStreamParameters(
++    const std::string& device_id) {
++  static const int kDefaultInputBufferSize = 1024;
++
++  int user_buffer_size = GetUserBufferSize();
++  int buffer_size = user_buffer_size ?
++      user_buffer_size : kDefaultInputBufferSize;
++
++  return AudioParameters(
++      AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO,
++      kDefaultSampleRate, buffer_size);
++}
++
++AudioManagerSndio::AudioManagerSndio(std::unique_ptr<AudioThread> audio_thread,
++                                         AudioLogFactory* audio_log_factory)
++    : AudioManagerBase(std::move(audio_thread),
++                       audio_log_factory) {
++  DLOG(WARNING) << "AudioManagerSndio";
++  SetMaxOutputStreamsAllowed(kMaxOutputStreams);
++}
++
++AudioManagerSndio::~AudioManagerSndio() {
++  Shutdown();
++}
++
++AudioOutputStream* AudioManagerSndio::MakeLinearOutputStream(
++    const AudioParameters& params,
++    const LogCallback& log_callback) {
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
++  return MakeOutputStream(params);
++}
++
++AudioOutputStream* AudioManagerSndio::MakeLowLatencyOutputStream(
++    const AudioParameters& params,
++    const std::string& device_id,
++    const LogCallback& log_callback) {
++  DLOG_IF(ERROR, !device_id.empty()) << "Not implemented!";
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
++  return MakeOutputStream(params);
++}
++
++AudioInputStream* AudioManagerSndio::MakeLinearInputStream(
++    const AudioParameters& params,
++    const std::string& device_id,
++    const LogCallback& log_callback) {
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
++  return MakeInputStream(params);
++}
++
++AudioInputStream* AudioManagerSndio::MakeLowLatencyInputStream(
++    const AudioParameters& params,
++    const std::string& device_id,
++    const LogCallback& log_callback) {
++  DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
++  return MakeInputStream(params);
++}
++
++AudioParameters AudioManagerSndio::GetPreferredOutputStreamParameters(
++    const std::string& output_device_id,
++    const AudioParameters& input_params) {
++  // TODO(tommi): Support |output_device_id|.
++  DLOG_IF(ERROR, !output_device_id.empty()) << "Not implemented!";
++  static const int kDefaultOutputBufferSize = 2048;
++
++  ChannelLayout channel_layout = CHANNEL_LAYOUT_STEREO;
++  int sample_rate = kDefaultSampleRate;
++  int buffer_size = kDefaultOutputBufferSize;
++  if (input_params.IsValid()) {
++    sample_rate = input_params.sample_rate();
++    channel_layout = input_params.channel_layout();
++    buffer_size = std::min(buffer_size, input_params.frames_per_buffer());
++  }
++
++  int user_buffer_size = GetUserBufferSize();
++  if (user_buffer_size)
++    buffer_size = user_buffer_size;
++
++  return AudioParameters(
++      AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout,
++      sample_rate, buffer_size);
++}
++
++AudioInputStream* AudioManagerSndio::MakeInputStream(
++    const AudioParameters& params) {
++  DLOG(WARNING) << "MakeInputStream";
++  return new SndioAudioInputStream(this,
++             AudioDeviceDescription::kDefaultDeviceId, params);
++}
++
++AudioOutputStream* AudioManagerSndio::MakeOutputStream(
++    const AudioParameters& params) {
++  DLOG(WARNING) << "MakeOutputStream";
++  return new SndioAudioOutputStream(params, this);
++}
++
++}  // namespace media
+diff -Naur chromium-83.0.4103.97.orig/media/audio/sndio/audio_manager_sndio.h chromium-83.0.4103.97/media/audio/sndio/audio_manager_sndio.h
+--- media/audio/sndio/audio_manager_sndio.h.orig	1970-01-01 01:00:00.000000000 +0100
++++ media/audio/sndio/audio_manager_sndio.h	2020-06-13 17:32:28.511395969 +0200
+@@ -0,0 +1,65 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
++#define MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
++
++#include <set>
++
++#include "base/compiler_specific.h"
++#include "base/macros.h"
++#include "base/memory/ref_counted.h"
++#include "base/threading/thread.h"
++#include "media/audio/audio_manager_base.h"
++
++namespace media {
++
++class MEDIA_EXPORT AudioManagerSndio : public AudioManagerBase {
++ public:
++  AudioManagerSndio(std::unique_ptr<AudioThread> audio_thread,
++                   AudioLogFactory* audio_log_factory);
++  ~AudioManagerSndio() override;
++
++  // Implementation of AudioManager.
++  bool HasAudioOutputDevices() override;
++  bool HasAudioInputDevices() override;
++  void GetAudioInputDeviceNames(AudioDeviceNames* device_names) override;
++  void GetAudioOutputDeviceNames(AudioDeviceNames* device_names) override;
++  AudioParameters GetInputStreamParameters(
++      const std::string& device_id) override;
++  const char* GetName() override;
++
++  // Implementation of AudioManagerBase.
++  AudioOutputStream* MakeLinearOutputStream(
++      const AudioParameters& params,
++      const LogCallback& log_callback) override;
++  AudioOutputStream* MakeLowLatencyOutputStream(
++      const AudioParameters& params,
++      const std::string& device_id,
++      const LogCallback& log_callback) override;
++  AudioInputStream* MakeLinearInputStream(
++      const AudioParameters& params,
++      const std::string& device_id,
++      const LogCallback& log_callback) override;
++  AudioInputStream* MakeLowLatencyInputStream(
++      const AudioParameters& params,
++      const std::string& device_id,
++      const LogCallback& log_callback) override;
++
++ protected:
++  AudioParameters GetPreferredOutputStreamParameters(
++      const std::string& output_device_id,
++      const AudioParameters& input_params) override;
++
++ private:
++  // Called by MakeLinearOutputStream and MakeLowLatencyOutputStream.
++  AudioOutputStream* MakeOutputStream(const AudioParameters& params);
++  AudioInputStream* MakeInputStream(const AudioParameters& params);
++
++  DISALLOW_COPY_AND_ASSIGN(AudioManagerSndio);
++};
++
++}  // namespace media
++
++#endif  // MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
+diff -Naur chromium-83.0.4103.97.orig/media/audio/sndio/sndio_input.cc chromium-83.0.4103.97/media/audio/sndio/sndio_input.cc
+--- media/audio/sndio/sndio_input.cc.orig	1970-01-01 01:00:00.000000000 +0100
++++ media/audio/sndio/sndio_input.cc	2020-06-13 17:32:28.511395969 +0200
+@@ -0,0 +1,200 @@
++// Copyright 2013 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "base/bind.h"
++#include "base/logging.h"
++#include "base/macros.h"
++#include "media/base/audio_timestamp_helper.h"
++#include "media/audio/sndio/audio_manager_sndio.h"
++#include "media/audio/audio_manager.h"
++#include "media/audio/sndio/sndio_input.h"
++
++namespace media {
++
++static const SampleFormat kSampleFormat = kSampleFormatS16;
++
++void SndioAudioInputStream::OnMoveCallback(void *arg, int delta)
++{
++  SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);
++
++  self->hw_delay += delta;
++}
++
++void *SndioAudioInputStream::ThreadEntry(void *arg) {
++  SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);
++
++  self->ThreadLoop();
++  return NULL;
++}
++
++SndioAudioInputStream::SndioAudioInputStream(AudioManagerBase* manager,
++                                             const std::string& device_name,
++                                             const AudioParameters& params)
++    : manager(manager),
++      params(params),
++      audio_bus(AudioBus::Create(params)),
++      state(kClosed) {
++}
++
++SndioAudioInputStream::~SndioAudioInputStream() {
++  if (state != kClosed)
++    Close();
++}
++
++bool SndioAudioInputStream::Open() {
++  struct sio_par par;
++  int sig;
++
++  if (state != kClosed)
++    return false;
++
++  if (params.format() != AudioParameters::AUDIO_PCM_LINEAR &&
++      params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) {
++    LOG(WARNING) << "Unsupported audio format.";
++    return false;
++  }
++
++  sio_initpar(&par);
++  par.rate = params.sample_rate();
++  par.rchan = params.channels();
++  par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
++  par.bps = par.bits / 8;
++  par.sig = sig = par.bits != 8 ? 1 : 0;
++  par.le = SIO_LE_NATIVE;
++  par.appbufsz = params.frames_per_buffer();
++
++  hdl = sio_open(SIO_DEVANY, SIO_REC, 0);
++
++  if (hdl == NULL) {
++    LOG(ERROR) << "Couldn't open audio device.";
++    return false;
++  }
++
++  if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
++    LOG(ERROR) << "Couldn't set audio parameters.";
++    goto bad_close;
++  }
++
++  if (par.rate  != (unsigned int)params.sample_rate() ||
++      par.rchan != (unsigned int)params.channels() ||
++      par.bits  != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) ||
++      par.sig   != (unsigned int)sig ||
++      (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
++      (par.bits != par.bps * 8)) {
++    LOG(ERROR) << "Unsupported audio parameters.";
++    goto bad_close;
++  }
++  state = kStopped;
++  buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
++  sio_onmove(hdl, &OnMoveCallback, this);
++  return true;
++bad_close:
++  sio_close(hdl);
++  return false;
++}
++
++void SndioAudioInputStream::Start(AudioInputCallback* cb) {
++
++  StartAgc();
++
++  state = kRunning;
++  hw_delay = 0;
++  callback = cb;
++  sio_start(hdl);
++  if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) {
++    LOG(ERROR) << "Failed to create real-time thread for recording.";
++    sio_stop(hdl);
++    state = kStopped;
++  }
++}
++
++void SndioAudioInputStream::Stop() {
++
++  if (state == kStopped)
++    return;
++
++  state = kStopWait;
++  pthread_join(thread, NULL);
++  sio_stop(hdl);
++  state = kStopped;
++
++  StopAgc();
++}
++
++void SndioAudioInputStream::Close() {
++
++  if (state == kClosed)
++    return;
++
++  if (state == kRunning)
++    Stop();
++
++  state = kClosed;
++  delete [] buffer;
++  sio_close(hdl);
++
++  manager->ReleaseInputStream(this);
++}
++
++double SndioAudioInputStream::GetMaxVolume() {
++  // Not supported
++  return 0.0;
++}
++
++void SndioAudioInputStream::SetVolume(double volume) {
++  // Not supported. Do nothing.
++}
++
++double SndioAudioInputStream::GetVolume() {
++  // Not supported.
++  return 0.0;
++}
++
++bool SndioAudioInputStream::IsMuted() {
++  // Not supported.
++  return false;
++}
++
++void SndioAudioInputStream::SetOutputDeviceForAec(
++    const std::string& output_device_id) {
++  // Not supported.
++}
++
++void SndioAudioInputStream::ThreadLoop(void) {
++  size_t todo, n;
++  char *data;
++  unsigned int nframes;
++  double normalized_volume = 0.0;
++
++  nframes = audio_bus->frames();
++
++  while (state == kRunning && !sio_eof(hdl)) {
++
++    GetAgcVolume(&normalized_volume);
++
++    // read one block
++    todo = nframes * params.GetBytesPerFrame(kSampleFormat);
++    data = buffer;
++    while (todo > 0) {
++      n = sio_read(hdl, data, todo);
++      if (n == 0)
++        return;	// unrecoverable I/O error
++      todo -= n;
++      data += n;
++    }
++    hw_delay -= nframes;
++
++    // convert frames count to TimeDelta
++    const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
++      params.sample_rate());
++
++    // push into bus
++    audio_bus->FromInterleaved(buffer, nframes, SampleFormatToBytesPerChannel(kSampleFormat));
++
++    // invoke callback
++    callback->OnData(audio_bus.get(), base::TimeTicks::Now() - delay, 1.);
++  }
++}
++
++}  // namespace media
+diff -Naur chromium-83.0.4103.97.orig/media/audio/sndio/sndio_input.h chromium-83.0.4103.97/media/audio/sndio/sndio_input.h
+--- media/audio/sndio/sndio_input.h.orig	1970-01-01 01:00:00.000000000 +0100
++++ media/audio/sndio/sndio_input.h	2020-06-13 17:32:28.511395969 +0200
+@@ -0,0 +1,91 @@
++// Copyright 2013 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
++#define MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
++
++#include <stdint.h>
++#include <string>
++#include <sndio.h>
++
++#include "base/compiler_specific.h"
++#include "base/macros.h"
++#include "base/memory/weak_ptr.h"
++#include "base/time/time.h"
++#include "media/audio/agc_audio_stream.h"
++#include "media/audio/audio_io.h"
++#include "media/audio/audio_device_description.h"
++#include "media/base/audio_parameters.h"
++
++namespace media {
++
++class AudioManagerBase;
++
++// Implementation of AudioOutputStream using sndio(7)
++class SndioAudioInputStream : public AgcAudioStream<AudioInputStream> {
++ public:
++  // Pass this to the constructor if you want to attempt auto-selection
++  // of the audio recording device.
++  static const char kAutoSelectDevice[];
++
++  // Create a PCM Output stream for the SNDIO device identified by
++  // |device_name|. If unsure of what to use for |device_name|, use
++  // |kAutoSelectDevice|.
++  SndioAudioInputStream(AudioManagerBase* audio_manager,
++                     const std::string& device_name,
++                     const AudioParameters& params);
++
++  ~SndioAudioInputStream() override;
++
++  // Implementation of AudioInputStream.
++  bool Open() override;
++  void Start(AudioInputCallback* callback) override;
++  void Stop() override;
++  void Close() override;
++  double GetMaxVolume() override;
++  void SetVolume(double volume) override;
++  double GetVolume() override;
++  bool IsMuted() override;
++  void SetOutputDeviceForAec(const std::string& output_device_id) override;
++
++ private:
++
++  enum StreamState {
++    kClosed,            // Not opened yet
++    kStopped,           // Device opened, but not started yet
++    kRunning,           // Started, device playing
++    kStopWait           // Stopping, waiting for the real-time thread to exit
++  };
++
++  // C-style call-backs
++  static void OnMoveCallback(void *arg, int delta);
++  static void* ThreadEntry(void *arg);
++
++  // Continuously moves data from the device to the consumer
++  void ThreadLoop();
++  // Our creator, the audio manager needs to be notified when we close.
++  AudioManagerBase* manager;
++  // Parameters of the source
++  AudioParameters params;
++  // We store data here for consumer
++  std::unique_ptr<AudioBus> audio_bus;
++  // Call-back that consumes recorded data
++  AudioInputCallback* callback;  // Valid during a recording session.
++  // Handle of the audio device
++  struct sio_hdl* hdl;
++  // Current state of the stream
++  enum StreamState state;
++  // High priority thread running ThreadLoop()
++  pthread_t thread;
++  // Number of frames buffered in the hardware
++  int hw_delay;
++  // Temporary buffer where data is stored sndio-compatible format
++  char* buffer;
++
++  DISALLOW_COPY_AND_ASSIGN(SndioAudioInputStream);
++};
++
++}  // namespace media
++
++#endif  // MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
+diff -Naur chromium-83.0.4103.97.orig/media/audio/sndio/sndio_output.cc chromium-83.0.4103.97/media/audio/sndio/sndio_output.cc
+--- media/audio/sndio/sndio_output.cc.orig	1970-01-01 01:00:00.000000000 +0100
++++ media/audio/sndio/sndio_output.cc	2020-06-13 17:32:28.511395969 +0200
+@@ -0,0 +1,183 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "base/logging.h"
++#include "base/time/time.h"
++#include "base/time/default_tick_clock.h"
++#include "media/audio/audio_manager_base.h"
++#include "media/base/audio_timestamp_helper.h"
++#include "media/audio/sndio/sndio_output.h"
++
++namespace media {
++
++static const SampleFormat kSampleFormat = kSampleFormatS16;
++
++void SndioAudioOutputStream::OnMoveCallback(void *arg, int delta) {
++  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
++
++  self->hw_delay -= delta;
++}
++
++void SndioAudioOutputStream::OnVolCallback(void *arg, unsigned int vol) {
++  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
++
++  self->vol = vol;
++}
++
++void *SndioAudioOutputStream::ThreadEntry(void *arg) {
++  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
++
++  self->ThreadLoop();
++  return NULL;
++}
++
++SndioAudioOutputStream::SndioAudioOutputStream(const AudioParameters& params,
++                                               AudioManagerBase* manager)
++    : manager(manager),
++      params(params),
++      audio_bus(AudioBus::Create(params)),
++      state(kClosed),
++      mutex(PTHREAD_MUTEX_INITIALIZER) {
++}
++
++SndioAudioOutputStream::~SndioAudioOutputStream() {
++  if (state != kClosed)
++    Close();
++}
++
++bool SndioAudioOutputStream::Open() {
++  struct sio_par par;
++  int sig;
++
++  if (params.format() != AudioParameters::AUDIO_PCM_LINEAR &&
++      params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) {
++    LOG(WARNING) << "Unsupported audio format.";
++    return false;
++  }
++  sio_initpar(&par);
++  par.rate = params.sample_rate();
++  par.pchan = params.channels();
++  par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
++  par.bps = par.bits / 8;
++  par.sig = sig = par.bits != 8 ? 1 : 0;
++  par.le = SIO_LE_NATIVE;
++  par.appbufsz = params.frames_per_buffer();
++
++  hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0);
++  if (hdl == NULL) {
++    LOG(ERROR) << "Couldn't open audio device.";
++    return false;
++  }
++  if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
++    LOG(ERROR) << "Couldn't set audio parameters.";
++    goto bad_close;
++  }
++  if (par.rate  != (unsigned int)params.sample_rate() ||
++      par.pchan != (unsigned int)params.channels() ||
++      par.bits  != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) ||
++      par.sig   != (unsigned int)sig ||
++      (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
++      (par.bits != par.bps * 8)) {
++    LOG(ERROR) << "Unsupported audio parameters.";
++    goto bad_close;
++  }
++  state = kStopped;
++  volpending = 0;
++  vol = 0;
++  buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
++  sio_onmove(hdl, &OnMoveCallback, this);
++  sio_onvol(hdl, &OnVolCallback, this);
++  return true;
++ bad_close:
++  sio_close(hdl);
++  return false;
++}
++
++void SndioAudioOutputStream::Close() {
++  if (state == kClosed)
++    return;
++  if (state == kRunning)
++    Stop();
++  state = kClosed;
++  delete [] buffer;
++  sio_close(hdl);
++  manager->ReleaseOutputStream(this);  // Calls the destructor
++}
++
++void SndioAudioOutputStream::Start(AudioSourceCallback* callback) {
++  state = kRunning;
++  hw_delay = 0;
++  source = callback;
++  sio_start(hdl);
++  if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) {
++    LOG(ERROR) << "Failed to create real-time thread.";
++    sio_stop(hdl);
++    state = kStopped;
++  }
++}
++
++void SndioAudioOutputStream::Stop() {
++  if (state == kStopped)
++    return;
++  state = kStopWait;
++  pthread_join(thread, NULL);
++  sio_stop(hdl);
++  state = kStopped;
++}
++
++void SndioAudioOutputStream::SetVolume(double v) {
++  pthread_mutex_lock(&mutex);
++  vol = v * SIO_MAXVOL;
++  volpending = 1;
++  pthread_mutex_unlock(&mutex);
++}
++
++void SndioAudioOutputStream::GetVolume(double* v) {
++  pthread_mutex_lock(&mutex);
++  *v = vol * (1. / SIO_MAXVOL);
++  pthread_mutex_unlock(&mutex);
++}
++
++// This stream is always used with sub second buffer sizes, where it's
++// sufficient to simply always flush upon Start().
++void SndioAudioOutputStream::Flush() {}
++
++void SndioAudioOutputStream::ThreadLoop(void) {
++  int avail, count, result;
++
++  while (state == kRunning) {
++    // Update volume if needed
++    pthread_mutex_lock(&mutex);
++    if (volpending) {
++      volpending = 0;
++      sio_setvol(hdl, vol);
++    }
++    pthread_mutex_unlock(&mutex);
++
++    // Get data to play
++    const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
++	params.sample_rate());
++    count = source->OnMoreData(delay, base::TimeTicks::Now(), 0, audio_bus.get());
++    audio_bus->ToInterleaved(count, SampleFormatToBytesPerChannel(kSampleFormat), buffer);
++    if (count == 0) {
++      // We have to submit something to the device
++      count = audio_bus->frames();
++      memset(buffer, 0, count * params.GetBytesPerFrame(kSampleFormat));
++      LOG(WARNING) << "No data to play, running empty cycle.";
++    }
++
++    // Submit data to the device
++    avail = count * params.GetBytesPerFrame(kSampleFormat);
++    result = sio_write(hdl, buffer, avail);
++    if (result == 0) {
++      LOG(WARNING) << "Audio device disconnected.";
++      break;
++    }
++
++    // Update hardware pointer
++    hw_delay += count;
++  }
++}
++
++}  // namespace media
+diff -Naur chromium-83.0.4103.97.orig/media/audio/sndio/sndio_output.h chromium-83.0.4103.97/media/audio/sndio/sndio_output.h
+--- media/audio/sndio/sndio_output.h.orig	1970-01-01 01:00:00.000000000 +0100
++++ media/audio/sndio/sndio_output.h	2020-06-13 17:32:28.511395969 +0200
+@@ -0,0 +1,86 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
++#define MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
++
++#include <pthread.h>
++#include <sndio.h>
++
++#include "base/time/tick_clock.h"
++#include "base/time/time.h"
++#include "media/audio/audio_io.h"
++
++namespace media {
++
++class AudioManagerBase;
++
++// Implementation of AudioOutputStream using sndio(7)
++class SndioAudioOutputStream : public AudioOutputStream {
++ public:
++  // The manager is creating this object
++  SndioAudioOutputStream(const AudioParameters& params,
++                         AudioManagerBase* manager);
++  virtual ~SndioAudioOutputStream();
++
++  // Implementation of AudioOutputStream.
++  bool Open() override;
++  void Close() override;
++  void Start(AudioSourceCallback* callback) override;
++  void Stop() override;
++  void SetVolume(double volume) override;
++  void GetVolume(double* volume) override;
++  void Flush() override;
++
++  friend void sndio_onmove(void *arg, int delta);
++  friend void sndio_onvol(void *arg, unsigned int vol);
++  friend void *sndio_threadstart(void *arg);
++
++ private:
++  enum StreamState {
++    kClosed,            // Not opened yet
++    kStopped,           // Device opened, but not started yet
++    kRunning,           // Started, device playing
++    kStopWait           // Stopping, waiting for the real-time thread to exit
++  };
++
++  // C-style call-backs
++  static void OnMoveCallback(void *arg, int delta);
++  static void OnVolCallback(void *arg, unsigned int vol);
++  static void* ThreadEntry(void *arg);
++
++  // Continuously moves data from the producer to the device
++  void ThreadLoop(void);
++
++  // Our creator, the audio manager needs to be notified when we close.
++  AudioManagerBase* manager;
++  // Parameters of the source
++  AudioParameters params;
++  // Source stores data here
++  std::unique_ptr<AudioBus> audio_bus;
++  // Call-back that produces data to play
++  AudioSourceCallback* source;
++  // Handle of the audio device
++  struct sio_hdl* hdl;
++  // Current state of the stream
++  enum StreamState state;
++  // High priority thread running ThreadLoop()
++  pthread_t thread;
++  // Protects vol, volpending and hw_delay
++  pthread_mutex_t mutex;
++  // Current volume in the 0..SIO_MAXVOL range
++  int vol;
++  // Set to 1 if volumes must be refreshed in the realtime thread
++  int volpending;
++  // Number of frames buffered in the hardware
++  int hw_delay;
++  // Temporary buffer where data is stored sndio-compatible format
++  char* buffer;
++
++  DISALLOW_COPY_AND_ASSIGN(SndioAudioOutputStream);
++};
++
++}  // namespace media
++
++#endif  // MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
+diff -Naur chromium-83.0.4103.97.orig/media/media_options.gni chromium-83.0.4103.97/media/media_options.gni
+--- media/media_options.gni.orig	2020-06-03 20:40:26.000000000 +0200
++++ media/media_options.gni	2020-06-13 17:32:28.512395963 +0200
+@@ -119,6 +119,9 @@
+   # Enables runtime selection of ALSA library for audio.
+   use_alsa = false
+ 
++  # Enable runtime selection of sndio(7)
++  use_sndio = false
++
+   # Alsa should be used on non-Android, non-Mac POSIX systems.
+   # Alsa should be used on desktop Chromecast and audio-only Chromecast builds.
+   if (is_posix && !is_android && !is_mac &&
diff --git a/srcpkgs/electron12/files/patches/chromium-system-nodejs.patch b/srcpkgs/electron12/files/patches/chromium-system-nodejs.patch
new file mode 100644
index 000000000000..99d653955f05
--- /dev/null
+++ b/srcpkgs/electron12/files/patches/chromium-system-nodejs.patch
@@ -0,0 +1,22 @@
+diff --git third_party/node/node.py third_party/node/node.py
+index 8097e2c49..10e6a16ea 100755
+--- third_party/node/node.py
++++ third_party/node/node.py
+@@ -10,11 +10,12 @@ import sys
+ 
+ 
+ def GetBinaryPath():
+-  return os_path.join(os_path.dirname(__file__), *{
+-    'Darwin': ('mac', 'node-darwin-x64', 'bin', 'node'),
+-    'Linux': ('linux', 'node-linux-x64', 'bin', 'node'),
+-    'Windows': ('win', 'node.exe'),
+-  }[platform.system()])
++  return "/usr/bin/node"
++  #return os_path.join(os_path.dirname(__file__), *{
++  #  'Darwin': ('mac', 'node-darwin-x64', 'bin', 'node'),
++  #  'Linux': ('linux', 'node-linux-x64', 'bin', 'node'),
++  #  'Windows': ('win', 'node.exe'),
++  #}[platform.system()])
+ 
+ 
+ def RunNode(cmd_parts, stdout=None):
diff --git a/srcpkgs/electron12/files/patches/chromium-time64.patch b/srcpkgs/electron12/files/patches/chromium-time64.patch
new file mode 100644
index 000000000000..b1ad93590033
--- /dev/null
+++ b/srcpkgs/electron12/files/patches/chromium-time64.patch
@@ -0,0 +1,51 @@
+Description: allow sandboxed code to call gettime64
+ Add __NR_clock_gettime64 and __NR_clock_nanosleep_time64 to syscall whitelist
+ and clock selection parameter filtering code.
+
+ Add __NR_utimensat_time64 to syscall whitelist
+
+ Conditionalise additions on the new calls existing, because they do not exist
+ on 64-bit architectures.
+Author: Peter Michael Green <plugwash@raspbian.org>
+
+Index: chromium-83.0.4103.116/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
+===================================================================
+--- sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
++++ sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
+@@ -148,7 +148,11 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+     return Allow();
+ #endif
+ 
++#ifdef __NR_clock_gettime64
++  if (sysno == __NR_clock_gettime || sysno == __NR_clock_gettime64 || sysno == __NR_clock_nanosleep || sysno == __NR_clock_nanosleep_time64) {
++#else
+   if (sysno == __NR_clock_gettime || sysno == __NR_clock_nanosleep) {
++#endif
+     return RestrictClockID();
+   }
+ 
+Index: chromium-83.0.4103.116/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+===================================================================
+--- sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -38,6 +38,10 @@ bool SyscallSets::IsAllowedGettime(int s
+     case __NR_clock_getres:     // Allowed only on Android with parameters
+                                 // filtered by RestrictClokID().
+     case __NR_clock_gettime:    // Parameters filtered by RestrictClockID().
++#ifdef __NR_clock_gettime64
++    case __NR_clock_gettime64:    // Parameters filtered by RestrictClockID().
++    case __NR_clock_nanosleep_time64:  // Parameters filtered by RestrictClockID().
++#endif
+     case __NR_clock_nanosleep:  // Parameters filtered by RestrictClockID().
+     case __NR_clock_settime:    // Privileged.
+ #if defined(__i386__) || \
+@@ -159,6 +163,9 @@ bool SyscallSets::IsFileSystem(int sysno
+     case __NR_utime:
+ #endif
+     case __NR_utimensat:  // New.
++#ifdef __NR_utimensat_time64
++    case __NR_utimensat_time64:
++#endif
+       return true;
+     default:
+       return false;
diff --git a/srcpkgs/electron12/files/patches/chromium-webrtc-include.patch b/srcpkgs/electron12/files/patches/chromium-webrtc-include.patch
new file mode 100644
index 000000000000..92ec272a89ac
--- /dev/null
+++ b/srcpkgs/electron12/files/patches/chromium-webrtc-include.patch
@@ -0,0 +1,10 @@
+--- third_party/webrtc/modules/desktop_capture/linux/window_capturer_x11.cc.orig	2019-02-21 21:21:24.488058990 +0100
++++ third_party/webrtc/modules/desktop_capture/linux/window_capturer_x11.cc	2019-02-21 21:21:36.151961064 +0100
+@@ -16,6 +16,7 @@
+ 
+ #include <memory>
+ #include <string>
++#include <string.h>
+ #include <utility>
+ 
+ #include "modules/desktop_capture/desktop_frame.h"
diff --git a/srcpkgs/electron12/files/patches/chromium-webrtc-r0.patch b/srcpkgs/electron12/files/patches/chromium-webrtc-r0.patch
new file mode 100644
index 000000000000..70bbede472f4
--- /dev/null
+++ b/srcpkgs/electron12/files/patches/chromium-webrtc-r0.patch
@@ -0,0 +1,33 @@
+Upstream: Yes, https://webrtc-review.googlesource.com/9384
+Reason: Fixes musl builds of webrtc
+
+From 7f90e2cceda0458cf56026eb6ccffb961a47804b Mon Sep 17 00:00:00 2001
+From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
+Date: Fri, 13 Oct 2017 15:49:32 +0200
+Subject: [PATCH] IWYU: Include math.h for round(3).
+
+math.h was being implicitly included, which can break the build with
+alternative libc implementations.
+
+Bug: None
+Change-Id: I969b320b65d0f44abb33d3e1036cfbcb859a4952
+Reviewed-on: https://webrtc-review.googlesource.com/9384
+Reviewed-by: Tommi <tommi@webrtc.org>
+Commit-Queue: Raphael Kubo da Costa (rakuco) <raphael.kubo.da.costa@intel.com>
+Cr-Commit-Position: refs/heads/master@{#20292}
+---
+
+--- third_party/webrtc/p2p/base/port.cc
++++ third_party/webrtc/p2p/base/port.cc
+@@ -10,6 +10,8 @@
+ 
+ #include "p2p/base/port.h"
+ 
++#include <math.h>
++
+ #include <algorithm>
+ #include <vector>
+ 
+-- 
+2.15.0.rc2
+
diff --git a/srcpkgs/electron12/files/patches/chromium-webrtc-size_t.patch b/srcpkgs/electron12/files/patches/chromium-webrtc-size_t.patch
new file mode 100644
index 000000000000..ef7ea09cf632
--- /dev/null
+++ b/srcpkgs/electron12/files/patches/chromium-webrtc-size_t.patch
@@ -0,0 +1,10 @@
+--- third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h	2020-08-10 20:42:29.000000000 +0200
++++ third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h	2020-09-04 12:47:07.014833633 +0200
+@@ -12,6 +12,7 @@
+ #define MODULES_AUDIO_PROCESSING_AEC3_CLOCKDRIFT_DETECTOR_H_
+ 
+ #include <array>
++#include <cstddef>
+ 
+ namespace webrtc {
+ 
diff --git a/srcpkgs/electron12/files/patches/chromium-xxx-ppc64le-libvpx.patch b/srcpkgs/electron12/files/patches/chromium-xxx-ppc64le-libvpx.patch
new file mode 100644
index 000000000000..792befb3a39d
--- /dev/null
+++ b/srcpkgs/electron12/files/patches/chromium-xxx-ppc64le-libvpx.patch
@@ -0,0 +1,72 @@
+Uses generic target for now. To use ppc64le, change --target to ppc64le-gnu
+and add --enable-vsx, and change generic to ppc for the rtcd header.
+
+From 18e6c5c55cfae0cfb458d8210d7bc709360a0e90 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Wed, 9 Sep 2020 19:08:25 +0200
+Subject: [PATCH] enable generation of ppc64 libvpx bits
+
+this doesn't update the gni file, that's done from
+the template by running the appropriate scripts
+---
+ third_party/libvpx/BUILD.gn        | 4 ++++
+ third_party/libvpx/generate_gni.sh | 9 +++++++++
+ 2 files changed, 13 insertions(+)
+
+diff --git third_party/libvpx/BUILD.gn third_party/libvpx/BUILD.gn
+index 7198e59..3300485 100644
+--- third_party/libvpx/BUILD.gn
++++ third_party/libvpx/BUILD.gn
+@@ -336,6 +336,8 @@ static_library("libvpx") {
+     } else {
+       sources = libvpx_srcs_arm64
+     }
++  } else if (current_cpu == "ppc64") {
++    sources = libvpx_srcs_ppc64
+   }
+ 
+   configs -= [ "//build/config/compiler:chromium_code" ]
+diff --git third_party/libvpx/generate_gni.sh third_party/libvpx/generate_gni.sh
+index bcf84b0..8a3f4f1 100755
+--- third_party/libvpx/generate_gni.sh
++++ third_party/libvpx/generate_gni.sh
+@@ -361,6 +361,7 @@ gen_config_files linux/arm-neon-highbd "--target=armv7-linux-gcc ${all_platforms
+ gen_config_files linux/arm64-highbd "--target=armv8-linux-gcc ${all_platforms} ${HIGHBD}"
+ gen_config_files linux/mipsel "--target=mips32-linux-gcc ${all_platforms}"
+ gen_config_files linux/mips64el "--target=mips64-linux-gcc ${all_platforms}"
++gen_config_files linux/ppc64 "--target=generic-gnu $HIGHBD ${all_platforms}"
+ gen_config_files linux/generic "--target=generic-gnu $HIGHBD ${all_platforms}"
+ gen_config_files win/arm64 "--target=arm64-win64-vs15 ${all_platforms} ${HIGHBD}"
+ gen_config_files win/ia32 "--target=x86-win32-vs14 ${all_platforms} ${x86_platforms}"
+@@ -386,6 +387,7 @@ lint_config linux/arm-neon-highbd
+ lint_config linux/arm64-highbd
+ lint_config linux/mipsel
+ lint_config linux/mips64el
++lint_config linux/ppc64
+ lint_config linux/generic
+ lint_config win/arm64
+ lint_config win/ia32
+@@ -415,6 +417,7 @@ gen_rtcd_header linux/arm-neon-highbd armv7
+ gen_rtcd_header linux/arm64-highbd armv8
+ gen_rtcd_header linux/mipsel mipsel
+ gen_rtcd_header linux/mips64el mips64el
++gen_rtcd_header linux/ppc64 generic
+ gen_rtcd_header linux/generic generic
+ gen_rtcd_header win/arm64 armv8
+ gen_rtcd_header win/ia32 x86 "${require_sse2}"
+@@ -500,6 +503,12 @@ if [ -z $ONLY_CONFIGS ]; then
+ 
+   echo "MIPS64 source list is identical to MIPS source list. No need to generate it."
+ 
++  echo "Generate ppc64 source list."
++  config=$(print_config_basic linux/ppc64)
++  make_clean
++  make libvpx_srcs.txt target=libs $config > /dev/null
++  convert_srcs_to_project_files libvpx_srcs.txt libvpx_srcs_ppc64
++
+   echo "Generate NaCl source list."
+   config=$(print_config_basic nacl)
+   make_clean
+-- 
+2.28.0
+
diff --git a/srcpkgs/electron12/files/patches/chromium-xxx-ppc64le-support.patch b/srcpkgs/electron12/files/patches/chromium-xxx-ppc64le-support.patch
new file mode 100644
index 000000000000..389ac3b7aa22
--- /dev/null
+++ b/srcpkgs/electron12/files/patches/chromium-xxx-ppc64le-support.patch
@@ -0,0 +1,3635 @@
+commit 2c013a317b1114ef67cdbbc30824b28907b9ea94
+Author: Daniel Kolesa <daniel@octaforge.org>
+Date:   Wed Mar 3 19:08:29 2021 +0100
+
+    ppc64le support
+
+diff --git build/download_nacl_toolchains.py build/download_nacl_toolchains.py
+index 286a92a27..ec36a85d3 100755
+--- build/download_nacl_toolchains.py
++++ build/download_nacl_toolchains.py
+@@ -13,6 +13,10 @@ import sys
+ 
+ 
+ def Main(args):
++  # If `disable_nacl=1` is in GYP_DEFINES, exit
++  if 'disable_nacl=1' in os.environ.get('GYP_DEFINES', ''):
++    return 0
++
+   script_dir = os.path.dirname(os.path.abspath(__file__))
+   src_dir = os.path.dirname(script_dir)
+   nacl_dir = os.path.join(src_dir, 'native_client')
+diff --git chrome/installer/linux/BUILD.gn chrome/installer/linux/BUILD.gn
+index 35f01d0a4..28f2e7475 100644
+--- chrome/installer/linux/BUILD.gn
++++ chrome/installer/linux/BUILD.gn
+@@ -94,8 +94,6 @@ packaging_files = packaging_files_binaries + [
+                     "$root_out_dir/xdg-mime",
+                     "$root_out_dir/xdg-settings",
+                     "$root_out_dir/locales/en-US.pak",
+-                    "$root_out_dir/MEIPreload/manifest.json",
+-                    "$root_out_dir/MEIPreload/preloaded_data.pb",
+                   ]
+ 
+ action_foreach("calculate_deb_dependencies") {
+@@ -315,7 +313,6 @@ group("installer_deps") {
+     ":theme_files",
+     "//chrome",
+     "//chrome:packed_resources",
+-    "//chrome/browser/resources/media/mei_preload:component",
+     "//sandbox/linux:chrome_sandbox",
+     "//third_party/crashpad/crashpad/handler:crashpad_handler",
+   ]
+diff --git sandbox/features.gni sandbox/features.gni
+index db30ae6d6..9dc09bf53 100644
+--- sandbox/features.gni
++++ sandbox/features.gni
+@@ -11,7 +11,8 @@ import("//build/config/nacl/config.gni")
+ use_seccomp_bpf = (is_linux || is_chromeos || is_android) &&
+                   (current_cpu == "x86" || current_cpu == "x64" ||
+                    current_cpu == "arm" || current_cpu == "arm64" ||
+-                   current_cpu == "mipsel" || current_cpu == "mips64el")
++                   current_cpu == "mipsel" || current_cpu == "mips64el" ||
++                   current_cpu == "ppc64")
+ 
+ use_seccomp_bpf = use_seccomp_bpf || is_nacl_nonsfi
+ 
+diff --git sandbox/linux/BUILD.gn sandbox/linux/BUILD.gn
+index e9a94b461..cca1a5da5 100644
+--- sandbox/linux/BUILD.gn
++++ sandbox/linux/BUILD.gn
+@@ -427,6 +427,8 @@ component("sandbox_services") {
+ 
+ source_set("sandbox_services_headers") {
+   sources = [
++    "system_headers/ppc64_linux_syscalls.h",
++    "system_headers/ppc64_linux_ucontext.h",
+     "system_headers/arm64_linux_syscalls.h",
+     "system_headers/arm_linux_syscalls.h",
+     "system_headers/arm_linux_ucontext.h",
+diff --git sandbox/linux/bpf_dsl/linux_syscall_ranges.h sandbox/linux/bpf_dsl/linux_syscall_ranges.h
+index 313511f22..0ca3a326f 100644
+--- sandbox/linux/bpf_dsl/linux_syscall_ranges.h
++++ sandbox/linux/bpf_dsl/linux_syscall_ranges.h
+@@ -56,6 +56,13 @@
+ #define MAX_PUBLIC_SYSCALL __NR_syscalls
+ #define MAX_SYSCALL MAX_PUBLIC_SYSCALL
+ 
++#elif defined(__powerpc64__)
++
++#include <asm/unistd.h>
++#define MIN_SYSCALL 0u
++#define MAX_PUBLIC_SYSCALL 386u
++#define MAX_SYSCALL MAX_PUBLIC_SYSCALL
++
+ #else
+ #error "Unsupported architecture"
+ #endif
+diff --git sandbox/linux/bpf_dsl/seccomp_macros.h sandbox/linux/bpf_dsl/seccomp_macros.h
+index 1a407b952..a6aec544e 100644
+--- sandbox/linux/bpf_dsl/seccomp_macros.h
++++ sandbox/linux/bpf_dsl/seccomp_macros.h
+@@ -16,6 +16,9 @@
+ #if defined(__mips__)
+ // sys/user.h in eglibc misses size_t definition
+ #include <stddef.h>
++#elif defined(__powerpc64__)
++// Manually define greg_t on ppc64
++typedef unsigned long long greg_t;
+ #endif
+ #endif
+ 
+@@ -346,6 +349,51 @@ struct regs_struct {
+ #define SECCOMP_PT_PARM4(_regs) (_regs).regs[3]
+ #define SECCOMP_PT_PARM5(_regs) (_regs).regs[4]
+ #define SECCOMP_PT_PARM6(_regs) (_regs).regs[5]
++
++#elif defined(__powerpc64__)
++#include <asm/ptrace.h>
++
++typedef struct pt_regs regs_struct;
++
++#ifdef ARCH_CPU_LITTLE_ENDIAN
++#define SECCOMP_ARCH AUDIT_ARCH_PPC64LE
++#else
++#define SECCOMP_ARCH AUDIT_ARCH_PPC64
++#endif
++
++#define SECCOMP_REG(_ctx, _reg) ((_ctx)->uc_mcontext.regs->gpr[_reg])
++
++#define SECCOMP_RESULT(_ctx) SECCOMP_REG(_ctx, 3)
++#define SECCOMP_SYSCALL(_ctx) SECCOMP_REG(_ctx, 0)
++#define SECCOMP_IP(_ctx) (_ctx)->uc_mcontext.regs->nip
++#define SECCOMP_PARM1(_ctx) SECCOMP_REG(_ctx, 3)
++#define SECCOMP_PARM2(_ctx) SECCOMP_REG(_ctx, 4)
++#define SECCOMP_PARM3(_ctx) SECCOMP_REG(_ctx, 5)
++#define SECCOMP_PARM4(_ctx) SECCOMP_REG(_ctx, 6)
++#define SECCOMP_PARM5(_ctx) SECCOMP_REG(_ctx, 7)
++#define SECCOMP_PARM6(_ctx) SECCOMP_REG(_ctx, 8)
++
++#define SECCOMP_NR_IDX (offsetof(struct arch_seccomp_data, nr))
++#define SECCOMP_ARCH_IDX (offsetof(struct arch_seccomp_data, arch))
++#define SECCOMP_IP_MSB_IDX \
++  (offsetof(struct arch_seccomp_data, instruction_pointer) + 4)
++#define SECCOMP_IP_LSB_IDX \
++  (offsetof(struct arch_seccomp_data, instruction_pointer) + 0)
++#define SECCOMP_ARG_MSB_IDX(nr) \
++  (offsetof(struct arch_seccomp_data, args) + 8 * (nr) + 4)
++#define SECCOMP_ARG_LSB_IDX(nr) \
++  (offsetof(struct arch_seccomp_data, args) + 8 * (nr) + 0)
++
++#define SECCOMP_PT_RESULT(_regs) (_regs).gpr[3]
++#define SECCOMP_PT_SYSCALL(_regs) (_regs).gpr[0]
++#define SECCOMP_PT_IP(_regs) (_regs).nip
++#define SECCOMP_PT_PARM1(_regs) (_regs).gpr[3]
++#define SECCOMP_PT_PARM2(_regs) (_regs).gpr[4]
++#define SECCOMP_PT_PARM3(_regs) (_regs).gpr[5]
++#define SECCOMP_PT_PARM4(_regs) (_regs).gpr[6]
++#define SECCOMP_PT_PARM5(_regs) (_regs).gpr[7]
++#define SECCOMP_PT_PARM6(_regs) (_regs).gpr[8]
++
+ #else
+ #error Unsupported target platform
+ 
+diff --git sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
+index 6a1ec2389..f20c582dd 100644
+--- sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
++++ sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
+@@ -88,7 +88,8 @@ bool IsBaselinePolicyWatched(int sysno) {
+          SyscallSets::IsPrctl(sysno) ||
+          SyscallSets::IsProcessGroupOrSession(sysno) ||
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+          SyscallSets::IsSocketCall(sysno) ||
+ #endif
+ #if defined(__arm__)
+@@ -227,7 +228,7 @@ ResultExpr EvaluateSyscallImpl(int fs_denied_errno,
+   }
+ 
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+   if (sysno == __NR_mmap)
+     return RestrictMmapFlags();
+ #endif
+@@ -245,7 +246,7 @@ ResultExpr EvaluateSyscallImpl(int fs_denied_errno,
+     return RestrictPrctl();
+ 
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+   if (sysno == __NR_socketpair) {
+     // Only allow AF_UNIX, PF_UNIX. Crash if anything else is seen.
+     static_assert(AF_UNIX == PF_UNIX,
+@@ -285,7 +286,8 @@ ResultExpr EvaluateSyscallImpl(int fs_denied_errno,
+   }
+ 
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+   if (SyscallSets::IsSocketCall(sysno))
+     return RestrictSocketcallCommand();
+ #endif
+diff --git sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
+index 01c046dda..7e5a6be82 100644
+--- sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
++++ sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
+@@ -302,7 +302,7 @@ TEST_BASELINE_SIGSYS(__NR_sysinfo)
+ TEST_BASELINE_SIGSYS(__NR_syslog)
+ TEST_BASELINE_SIGSYS(__NR_timer_create)
+ 
+-#if !defined(__aarch64__)
++#if !defined(__aarch64__) && !defined(__powerpc64__)
+ TEST_BASELINE_SIGSYS(__NR_eventfd)
+ TEST_BASELINE_SIGSYS(__NR_inotify_init)
+ TEST_BASELINE_SIGSYS(__NR_vserver)
+diff --git sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
+index 2a97d3916..8e81aa6cf 100644
+--- sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
++++ sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
+@@ -40,7 +40,8 @@
+ #include <sys/ptrace.h>
+ #if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \
+     !defined(__arm__) && !defined(__aarch64__) &&           \
+-    !defined(PTRACE_GET_THREAD_AREA)
++    !defined(PTRACE_GET_THREAD_AREA) &&			    \
++    !defined(__powerpc64__)
+ // Also include asm/ptrace-abi.h since ptrace.h in older libc (for instance
+ // the one in Ubuntu 16.04 LTS) is missing PTRACE_GET_THREAD_AREA.
+ // asm/ptrace-abi.h doesn't exist on arm32 and PTRACE_GET_THREAD_AREA isn't
+@@ -49,6 +50,11 @@
+ #endif
+ #endif  // !OS_NACL_NONSFI
+ 
++// On PPC64, TCGETS is defined in terms of struct termios, so we must include termios.h
++#ifdef __powerpc64__
++#include <termios.h>
++#endif
++
+ #if defined(OS_ANDROID)
+ 
+ #if !defined(F_DUPFD_CLOEXEC)
+@@ -98,6 +104,15 @@ inline bool IsArchitectureMips() {
+ #endif
+ }
+ 
++inline bool IsArchitecturePPC64() {
++#if defined(__powerpc64__)
++  return true;
++#else
++  return false;
++#endif
++}
++
++
+ // Ubuntu's version of glibc has a race condition in sem_post that can cause
+ // it to call futex(2) with bogus op arguments. To workaround this, we need
+ // to allow those futex(2) calls to fail with EINVAL, instead of crashing the
+@@ -239,6 +254,8 @@ ResultExpr RestrictFcntlCommands() {
+   uint64_t kOLargeFileFlag = O_LARGEFILE;
+   if (IsArchitectureX86_64() || IsArchitectureI386() || IsArchitectureMips())
+     kOLargeFileFlag = 0100000;
++  else if (IsArchitecturePPC64())
++    kOLargeFileFlag = 0200000;
+ 
+   const Arg<int> cmd(1);
+   const Arg<long> long_arg(2);
+@@ -253,14 +270,23 @@ ResultExpr RestrictFcntlCommands() {
+               F_SETLKW,
+               F_GETLK,
+               F_DUPFD,
+-              F_DUPFD_CLOEXEC),
+-             Allow())
++              F_DUPFD_CLOEXEC
++#if defined(__powerpc64__)
++// On PPC64, F_SETLK, F_GETLK, F_SETLKW are defined as the 64-bit variants
++// but glibc will sometimes still use the 32-bit versions. Allow both.
++              ,
++              5, /* F_GETLK (32) */
++              6, /* F_SETLK (32) */
++              7  /* F_SETLKW (32) */
++#endif
++              ),
++            Allow())
+       .Case(F_SETFL,
+             If((long_arg & ~kAllowedMask) == 0, Allow()).Else(CrashSIGSYS()))
+       .Default(CrashSIGSYS());
+ }
+ 
+-#if defined(__i386__) || defined(__mips__)
++#if defined(__i386__) || defined(__mips__) || defined(__powerpc64__)
+ ResultExpr RestrictSocketcallCommand() {
+   // Unfortunately, we are unable to restrict the first parameter to
+   // socketpair(2). Whilst initially sounding bad, it's noteworthy that very
+@@ -413,7 +439,7 @@ ResultExpr RestrictPtrace() {
+ #endif
+   return Switch(request)
+       .CASES((
+-#if !defined(__aarch64__)
++#if !defined(__aarch64__) && !defined(__powerpc64__)
+                  PTRACE_GETREGS, PTRACE_GETFPREGS, PTRACE_GET_THREAD_AREA,
+                  PTRACE_GETREGSET,
+ #endif
+diff --git sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
+index ba4289f05..9a4d5ab2d 100644
+--- sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
++++ sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
+@@ -48,7 +48,7 @@ SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictMprotectFlags();
+ // O_NONBLOCK | O_SYNC | O_LARGEFILE | O_CLOEXEC | O_NOATIME.
+ SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictFcntlCommands();
+ 
+-#if defined(__i386__) || defined(__mips__)
++#if defined(__i386__) || defined(__mips__) || defined(__powerpc64__)
+ // Restrict socketcall(2) to only allow socketpair(2), send(2), recv(2),
+ // sendto(2), recvfrom(2), shutdown(2), sendmsg(2) and recvmsg(2).
+ SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictSocketcallCommand();
+diff --git sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+index 642df7207..34f47eb73 100644
+--- sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -29,7 +29,8 @@ bool SyscallSets::IsAllowedGettime(int sysno) {
+   switch (sysno) {
+     case __NR_gettimeofday:
+ #if defined(__i386__) || defined(__x86_64__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+     case __NR_time:
+ #endif
+       return true;
+@@ -45,12 +46,14 @@ bool SyscallSets::IsAllowedGettime(int sysno) {
+     case __NR_clock_nanosleep:  // Parameters filtered by RestrictClockID().
+     case __NR_clock_settime:    // Privileged.
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+     case __NR_ftime:  // Obsolete.
+ #endif
+     case __NR_settimeofday:  // Privileged.
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+     case __NR_stime:
+ #endif
+     default:
+@@ -116,7 +119,7 @@ bool SyscallSets::IsFileSystem(int sysno) {
+     case __NR_faccessat:  // EPERM not a valid errno.
+     case __NR_fchmodat:
+     case __NR_fchownat:  // Should be called chownat ?
+-#if defined(__x86_64__) || defined(__aarch64__)
++#if defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_newfstatat:  // fstatat(). EPERM not a valid errno.
+ #elif defined(__i386__) || defined(__arm__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+@@ -135,7 +138,7 @@ bool SyscallSets::IsFileSystem(int sysno) {
+     case __NR_memfd_create:
+     case __NR_mkdirat:
+     case __NR_mknodat:
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_oldlstat:
+     case __NR_oldstat:
+ #endif
+@@ -149,7 +152,8 @@ bool SyscallSets::IsFileSystem(int sysno) {
+ #endif
+     case __NR_statfs:  // EPERM not a valid errno.
+ #if defined(__i386__) || defined(__arm__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+     case __NR_statfs64:
+ #endif
+     case __NR_symlinkat:
+@@ -159,7 +163,8 @@ bool SyscallSets::IsFileSystem(int sysno) {
+     case __NR_truncate64:
+ #endif
+     case __NR_unlinkat:
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_utime:
+ #endif
+     case __NR_utimensat:  // New.
+@@ -181,7 +186,8 @@ bool SyscallSets::IsAllowedFileSystemAccessViaFd(int sysno) {
+ #endif
+       return true;
+ // TODO(jln): these should be denied gracefully as well (moved below).
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_fadvise64:  // EPERM not a valid errno.
+ #endif
+ #if defined(__i386__)
+@@ -194,11 +200,12 @@ bool SyscallSets::IsAllowedFileSystemAccessViaFd(int sysno) {
+     case __NR_flock:      // EPERM not a valid errno.
+     case __NR_fstatfs:    // Give information about the whole filesystem.
+ #if defined(__i386__) || defined(__arm__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+     case __NR_fstatfs64:
+ #endif
+     case __NR_fsync:  // EPERM not a valid errno.
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_oldfstat:
+ #endif
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+@@ -206,6 +213,8 @@ bool SyscallSets::IsAllowedFileSystemAccessViaFd(int sysno) {
+     case __NR_sync_file_range:  // EPERM not a valid errno.
+ #elif defined(__arm__)
+     case __NR_arm_sync_file_range:  // EPERM not a valid errno.
++#elif defined(__powerpc64__)
++    case __NR_sync_file_range2: // EPERM not a valid errno.
+ #endif
+     default:
+       return false;
+@@ -231,7 +240,8 @@ bool SyscallSets::IsDeniedFileSystemAccessViaFd(int sysno) {
+ #endif
+     case __NR_getdents64:  // EPERM not a valid errno.
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+     case __NR_readdir:
+ #endif
+       return true;
+@@ -272,7 +282,7 @@ bool SyscallSets::IsGetSimpleId(int sysno) {
+ bool SyscallSets::IsProcessPrivilegeChange(int sysno) {
+   switch (sysno) {
+     case __NR_capset:
+-#if defined(__i386__) || defined(__x86_64__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__)
+     case __NR_ioperm:  // Intel privilege.
+     case __NR_iopl:    // Intel privilege.
+ #endif
+@@ -323,7 +333,8 @@ bool SyscallSets::IsAllowedSignalHandling(int sysno) {
+     case __NR_rt_sigreturn:
+     case __NR_rt_sigtimedwait:
+ #if defined(__i386__) || defined(__arm__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+     case __NR_sigaction:
+     case __NR_sigprocmask:
+     case __NR_sigreturn:
+@@ -339,7 +350,8 @@ bool SyscallSets::IsAllowedSignalHandling(int sysno) {
+ #endif
+     case __NR_signalfd4:
+ #if defined(__i386__) || defined(__arm__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+     case __NR_sigpending:
+     case __NR_sigsuspend:
+ #endif
+@@ -363,7 +375,7 @@ bool SyscallSets::IsAllowedOperationOnFd(int sysno) {
+ #endif
+     case __NR_dup3:
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_shutdown:
+ #endif
+       return true;
+@@ -397,7 +409,7 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) {
+     case __NR_membarrier:
+     case __NR_wait4:
+     case __NR_waitid:
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_waitpid:
+ #endif
+       return true;
+@@ -414,7 +426,7 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) {
+ #endif
+     case __NR_set_tid_address:
+     case __NR_unshare:
+-#if !defined(__mips__) && !defined(__aarch64__)
++#if !defined(__mips__) && !defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_vfork:
+ #endif
+     default:
+@@ -463,7 +475,7 @@ bool SyscallSets::IsAllowedGetOrModifySocket(int sysno) {
+       return true;
+     default:
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_socketpair:  // We will want to inspect its argument.
+ #endif
+       return false;
+@@ -473,7 +485,7 @@ bool SyscallSets::IsAllowedGetOrModifySocket(int sysno) {
+ bool SyscallSets::IsDeniedGetOrModifySocket(int sysno) {
+   switch (sysno) {
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_accept:
+     case __NR_accept4:
+     case __NR_bind:
+@@ -488,7 +500,8 @@ bool SyscallSets::IsDeniedGetOrModifySocket(int sysno) {
+ }
+ 
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+ // Big multiplexing system call for sockets.
+ bool SyscallSets::IsSocketCall(int sysno) {
+   switch (sysno) {
+@@ -502,7 +515,8 @@ bool SyscallSets::IsSocketCall(int sysno) {
+ }
+ #endif
+ 
+-#if defined(__x86_64__) || defined(__arm__) || defined(__mips__)
++#if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
++    defined(__powerpc64__)
+ bool SyscallSets::IsNetworkSocketInformation(int sysno) {
+   switch (sysno) {
+     case __NR_getpeername:
+@@ -527,7 +541,7 @@ bool SyscallSets::IsAllowedAddressSpaceAccess(int sysno) {
+     case __NR_mincore:
+     case __NR_mlockall:
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_mmap:
+ #endif
+ #if defined(__i386__) || defined(__arm__) || \
+@@ -557,7 +571,8 @@ bool SyscallSets::IsAllowedGeneralIo(int sysno) {
+   switch (sysno) {
+     case __NR_lseek:
+ #if defined(__i386__) || defined(__arm__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+     case __NR__llseek:
+ #endif
+ #if !defined(__aarch64__)
+@@ -569,26 +584,28 @@ bool SyscallSets::IsAllowedGeneralIo(int sysno) {
+     case __NR_readv:
+     case __NR_pread64:
+ #if defined(__arm__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+     case __NR_recv:
+ #endif
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_recvfrom:  // Could specify source.
+     case __NR_recvmsg:   // Could specify source.
+ #endif
+-#if defined(__i386__) || defined(__x86_64__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__)
+     case __NR_select:
+ #endif
+-#if defined(__i386__) || defined(__arm__) || defined(__mips__)
++#if defined(__i386__) || defined(__arm__) || defined(__mips__) || defined(__powerpc64__)
+     case __NR__newselect:
+ #endif
+ #if defined(__arm__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+     case __NR_send:
+ #endif
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_sendmsg:  // Could specify destination.
+     case __NR_sendto:   // Could specify destination.
+ #endif
+@@ -645,7 +662,8 @@ bool SyscallSets::IsAllowedBasicScheduler(int sysno) {
+       return true;
+     case __NR_getpriority:
+ #if defined(__i386__) || defined(__arm__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+     case __NR_nice:
+ #endif
+     case __NR_setpriority:
+@@ -657,7 +675,8 @@ bool SyscallSets::IsAllowedBasicScheduler(int sysno) {
+ bool SyscallSets::IsAdminOperation(int sysno) {
+   switch (sysno) {
+ #if defined(__i386__) || defined(__arm__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+     case __NR_bdflush:
+ #endif
+     case __NR_kexec_load:
+@@ -673,7 +692,8 @@ bool SyscallSets::IsAdminOperation(int sysno) {
+ 
+ bool SyscallSets::IsKernelModule(int sysno) {
+   switch (sysno) {
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_create_module:
+     case __NR_get_kernel_syms:  // Should ENOSYS.
+     case __NR_query_module:
+@@ -706,7 +726,8 @@ bool SyscallSets::IsFsControl(int sysno) {
+     case __NR_swapoff:
+     case __NR_swapon:
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+     case __NR_umount:
+ #endif
+     case __NR_umount2:
+@@ -722,7 +743,7 @@ bool SyscallSets::IsNuma(int sysno) {
+     case __NR_getcpu:
+     case __NR_mbind:
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_migrate_pages:
+ #endif
+     case __NR_move_pages:
+@@ -751,14 +772,15 @@ bool SyscallSets::IsGlobalProcessEnvironment(int sysno) {
+   switch (sysno) {
+     case __NR_acct:  // Privileged.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_getrlimit:
+ #endif
+-#if defined(__i386__) || defined(__arm__)
++#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__)
+     case __NR_ugetrlimit:
+ #endif
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+     case __NR_ulimit:
+ #endif
+     case __NR_getrusage:
+@@ -792,7 +814,7 @@ bool SyscallSets::IsGlobalSystemStatus(int sysno) {
+ #endif
+     case __NR_sysinfo:
+     case __NR_uname:
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__powerpc64__)
+     case __NR_olduname:
+     case __NR_oldolduname:
+ #endif
+@@ -854,8 +876,16 @@ bool SyscallSets::IsSystemVSemaphores(int sysno) {
+ }
+ #endif
+ 
++/* shitty hack around Void's 4.19 kernel headers missing those numbers */
++#if defined(__powerpc64__) && !defined(__NR_shmget)
++#define __NR_shmget 395
++#define __NR_shmctl 396
++#define __NR_shmat 397
++#define __NR_shmdt 398
++#endif
++
+ #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
+-    defined(__aarch64__) ||                                         \
++    defined(__aarch64__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
+ // These give a lot of ambient authority and bypass the setuid sandbox.
+ bool SyscallSets::IsSystemVSharedMemory(int sysno) {
+@@ -887,7 +917,8 @@ bool SyscallSets::IsSystemVMessageQueue(int sysno) {
+ #endif
+ 
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+ // Big system V multiplexing system call.
+ bool SyscallSets::IsSystemVIpc(int sysno) {
+   switch (sysno) {
+@@ -907,7 +938,8 @@ bool SyscallSets::IsAnySystemV(int sysno) {
+   return IsSystemVMessageQueue(sysno) || IsSystemVSemaphores(sysno) ||
+          IsSystemVSharedMemory(sysno);
+ #elif defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+   return IsSystemVIpc(sysno);
+ #endif
+ }
+@@ -960,7 +992,8 @@ bool SyscallSets::IsFaNotify(int sysno) {
+ bool SyscallSets::IsTimer(int sysno) {
+   switch (sysno) {
+     case __NR_getitimer:
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_alarm:
+ #endif
+     case __NR_setitimer:
+@@ -1019,18 +1052,22 @@ bool SyscallSets::IsMisc(int sysno) {
+     case __NR_syncfs:
+     case __NR_vhangup:
+ // The system calls below are not implemented.
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_afs_syscall:
+ #endif
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+     case __NR_break:
+ #endif
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_getpmsg:
+ #endif
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+     case __NR_gtty:
+     case __NR_idle:
+     case __NR_lock:
+@@ -1038,20 +1075,22 @@ bool SyscallSets::IsMisc(int sysno) {
+     case __NR_prof:
+     case __NR_profil:
+ #endif
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
++    defined(__powerpc64__)
+     case __NR_putpmsg:
+ #endif
+ #if defined(__x86_64__)
+     case __NR_security:
+ #endif
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+     case __NR_stty:
+ #endif
+-#if defined(__x86_64__)
++#if defined(__x86_64__) || defined(__powerpc64__)
+     case __NR_tuxcall:
+ #endif
+-#if !defined(__aarch64__)
++#if !defined(__aarch64__) && !defined(__powerpc64__)
+     case __NR_vserver:
+ #endif
+       return true;
+diff --git sandbox/linux/seccomp-bpf-helpers/syscall_sets.h sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
+index 923533ec9..411f72acd 100644
+--- sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
++++ sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
+@@ -43,13 +43,14 @@ class SANDBOX_EXPORT SyscallSets {
+   static bool IsDeniedGetOrModifySocket(int sysno);
+ 
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+   // Big multiplexing system call for sockets.
+   static bool IsSocketCall(int sysno);
+ #endif
+ 
+ #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+   static bool IsNetworkSocketInformation(int sysno);
+ #endif
+ 
+@@ -76,7 +77,7 @@ class SANDBOX_EXPORT SyscallSets {
+   static bool IsSystemVSemaphores(int sysno);
+ #endif
+ #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
+-    defined(__aarch64__) ||                                         \
++    defined(__aarch64__) || defined(__powerpc64__) || \
+     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
+   // These give a lot of ambient authority and bypass the setuid sandbox.
+   static bool IsSystemVSharedMemory(int sysno);
+@@ -88,7 +89,8 @@ class SANDBOX_EXPORT SyscallSets {
+ #endif
+ 
+ #if defined(__i386__) || \
+-    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
++    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
++    defined(__powerpc64__)
+   // Big system V multiplexing system call.
+   static bool IsSystemVIpc(int sysno);
+ #endif
+diff --git sandbox/linux/seccomp-bpf/syscall.cc sandbox/linux/seccomp-bpf/syscall.cc
+index e47e98bf5..d53a7ff56 100644
+--- sandbox/linux/seccomp-bpf/syscall.cc
++++ sandbox/linux/seccomp-bpf/syscall.cc
+@@ -18,7 +18,7 @@ namespace sandbox {
+ namespace {
+ 
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \
+-    defined(ARCH_CPU_MIPS_FAMILY)
++    defined(ARCH_CPU_MIPS_FAMILY) || defined (ARCH_CPU_PPC64_FAMILY)
+ // Number that's not currently used by any Linux kernel ABIs.
+ const int kInvalidSyscallNumber = 0x351d3;
+ #else
+@@ -310,12 +310,56 @@ asm(// We need to be able to tell the kernel exactly where we made a
+     // Enter the kernel
+     "svc 0\n"
+     "2:ret\n"
++    ".cfi_endproc\n"
++    ".size SyscallAsm, .-SyscallAsm\n"
++#elif defined(__powerpc64__)
++    ".text\n"
++    ".align 4\n"
++    ".type SyscallAsm @function\n"
++    "SyscallAsm:\n"
++    ".cfi_startproc\n"
++
++    // Check if r3 is negative
++    "cmpdi 3, 0\n"
++    "bgt 2f\n"
++
++    // Load address of 3f into r3 and return
++    "mflr 10\n"
++    "bl 1f\n"
++    "1: mflr 3\n"
++    "mtlr 10\n"
++    "addi 3, 3, 4*13\n"
++    "blr\n"
++
++    // Load arguments from array into r3-8
++    // save param 3 in r10
++    "2:\n"
++    "mr 0, 3\n"
++    "ld 3, 0(4)\n"
++    "ld 5, 16(4)\n"
++    "ld 6, 24(4)\n"
++    "ld 7, 32(4)\n"
++    "ld 8, 40(4)\n"
++    "ld 4, 8(4)\n"
++    "li 9, 0\n"
++
++    // Enter kernel
++    "sc\n"
++
++    // Magic return address
++    "3:\n"
++    // Like MIPS, ppc64 return values are always positive.
++    // Check for error in cr0.SO and negate upon error
++    "bc 4, 3, 4f\n"
++    "neg 3, 3\n"
++    "4: blr\n"
++
+     ".cfi_endproc\n"
+     ".size SyscallAsm, .-SyscallAsm\n"
+ #endif
+     );  // asm
+ 
+-#if defined(__x86_64__)
++#if defined(__x86_64__) || defined(__powerpc64__)
+ extern "C" {
+ intptr_t SyscallAsm(intptr_t nr, const intptr_t args[6]);
+ }
+@@ -429,6 +473,8 @@ intptr_t Syscall::Call(int nr,
+     ret = inout;
+   }
+ 
++#elif defined(__powerpc64__)
++  intptr_t ret = SyscallAsm(nr, args);
+ #else
+ #error "Unimplemented architecture"
+ #endif
+@@ -445,8 +491,18 @@ void Syscall::PutValueInUcontext(intptr_t ret_val, ucontext_t* ctx) {
+     // needs to be changed back.
+     ret_val = -ret_val;
+     SECCOMP_PARM4(ctx) = 1;
+-  } else
++  } else {
+     SECCOMP_PARM4(ctx) = 0;
++  }
++#endif
++#if defined(__powerpc64__)
++  // Same as MIPS, need to invert ret and set error register (cr0.SO)
++  if (ret_val <= -1 && ret_val >= -4095) {
++    ret_val = -ret_val;
++    ctx->uc_mcontext.regs->ccr |= (1 << 28);
++  } else {
++    ctx->uc_mcontext.regs->ccr &= ~(1 << 28);
++  }
+ #endif
+   SECCOMP_RESULT(ctx) = static_cast<greg_t>(ret_val);
+ }
+diff --git sandbox/linux/seccomp-bpf/trap.cc sandbox/linux/seccomp-bpf/trap.cc
+index f5b86a73a..5e6c4a068 100644
+--- sandbox/linux/seccomp-bpf/trap.cc
++++ sandbox/linux/seccomp-bpf/trap.cc
+@@ -232,6 +232,20 @@ void Trap::SigSys(int nr, LinuxSigInfo* info, ucontext_t* ctx) {
+       SetIsInSigHandler();
+     }
+ 
++#if defined(__powerpc64__)
++    // On ppc64+glibc, some syscalls seem to accidentally negate the first
++    // parameter which causes checks against it to fail. For now, manually
++    // negate them back.
++    // TODO(shawn@anastas.io): investigate this issue further
++    auto nr = SECCOMP_SYSCALL(ctx);
++    if (nr == __NR_openat || nr == __NR_mkdirat || nr == __NR_faccessat || nr == __NR_readlinkat ||
++        nr == __NR_renameat || nr == __NR_renameat2 || nr == __NR_newfstatat || nr == __NR_unlinkat) {
++        if (static_cast<int>(SECCOMP_PARM1(ctx)) > 0) {
++            SECCOMP_PARM1(ctx) = -SECCOMP_PARM1(ctx);
++        }
++    }
++#endif
++
+     // Copy the seccomp-specific data into a arch_seccomp_data structure. This
+     // is what we are showing to TrapFnc callbacks that the system call
+     // evaluator registered with the sandbox.
+diff --git sandbox/linux/services/credentials.cc sandbox/linux/services/credentials.cc
+index d7b5d8c44..4adc6d0d4 100644
+--- sandbox/linux/services/credentials.cc
++++ sandbox/linux/services/credentials.cc
+@@ -81,7 +81,7 @@ bool ChrootToSafeEmptyDir() {
+   pid_t pid = -1;
+   alignas(16) char stack_buf[PTHREAD_STACK_MIN];
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \
+-    defined(ARCH_CPU_MIPS_FAMILY)
++    defined(ARCH_CPU_MIPS_FAMILY) || defined(ARCH_CPU_PPC64_FAMILY)
+   // The stack grows downward.
+   void* stack = stack_buf + sizeof(stack_buf);
+ #else
+diff --git sandbox/linux/services/syscall_wrappers.cc sandbox/linux/services/syscall_wrappers.cc
+index fcfd2aa12..f6eb32fb7 100644
+--- sandbox/linux/services/syscall_wrappers.cc
++++ sandbox/linux/services/syscall_wrappers.cc
+@@ -58,7 +58,7 @@ long sys_clone(unsigned long flags,
+ #if defined(ARCH_CPU_X86_64)
+   return syscall(__NR_clone, flags, child_stack, ptid, ctid, tls);
+ #elif defined(ARCH_CPU_X86) || defined(ARCH_CPU_ARM_FAMILY) || \
+-    defined(ARCH_CPU_MIPS_FAMILY)
++    defined(ARCH_CPU_MIPS_FAMILY) || defined(ARCH_CPU_PPC64_FAMILY)
+   // CONFIG_CLONE_BACKWARDS defined.
+   return syscall(__NR_clone, flags, child_stack, ptid, tls, ctid);
+ #endif
+diff --git sandbox/linux/syscall_broker/broker_process.cc sandbox/linux/syscall_broker/broker_process.cc
+index d72c9d238..77f1d95f5 100644
+--- sandbox/linux/syscall_broker/broker_process.cc
++++ sandbox/linux/syscall_broker/broker_process.cc
+@@ -169,7 +169,7 @@ bool BrokerProcess::IsSyscallBrokerable(int sysno, bool fast_check) const {
+ #if defined(__NR_fstatat64)
+     case __NR_fstatat64:
+ #endif
+-#if defined(__x86_64__) || defined(__aarch64__)
++#if defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__)
+     case __NR_newfstatat:
+ #endif
+       return !fast_check || allowed_command_set_.test(COMMAND_STAT);
+diff --git sandbox/linux/system_headers/linux_seccomp.h sandbox/linux/system_headers/linux_seccomp.h
+index 1fa47ed09..39cc9ab53 100644
+--- sandbox/linux/system_headers/linux_seccomp.h
++++ sandbox/linux/system_headers/linux_seccomp.h
+@@ -41,6 +41,9 @@
+ #ifndef EM_AARCH64
+ #define EM_AARCH64 183
+ #endif
++#ifndef EM_PPC64
++#define EM_PPC64 21
++#endif
+ 
+ #ifndef __AUDIT_ARCH_64BIT
+ #define __AUDIT_ARCH_64BIT 0x80000000
+@@ -73,6 +76,12 @@
+ #ifndef AUDIT_ARCH_AARCH64
+ #define AUDIT_ARCH_AARCH64 (EM_AARCH64 | __AUDIT_ARCH_64BIT | __AUDIT_ARCH_LE)
+ #endif
++#ifndef AUDIT_ARCH_PPC64
++#define AUDIT_ARCH_PPC64 (EM_PPC64 | __AUDIT_ARCH_64BIT)
++#endif
++#ifndef AUDIT_ARCH_PPC64LE
++#define AUDIT_ARCH_PPC64LE (EM_PPC64 | __AUDIT_ARCH_64BIT | __AUDIT_ARCH_LE)
++#endif
+ 
+ // For prctl.h
+ #ifndef PR_SET_SECCOMP
+diff --git sandbox/linux/system_headers/linux_signal.h sandbox/linux/system_headers/linux_signal.h
+index f5a736761..515b21a5f 100644
+--- sandbox/linux/system_headers/linux_signal.h
++++ sandbox/linux/system_headers/linux_signal.h
+@@ -13,7 +13,7 @@
+ // (not undefined, but defined different values and in different memory
+ // layouts). So, fill the gap here.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
+-    defined(__aarch64__)
++    defined(__aarch64__) || defined(__powerpc64__)
+ 
+ #define LINUX_SIGHUP 1
+ #define LINUX_SIGINT 2
+diff --git sandbox/linux/system_headers/linux_syscalls.h sandbox/linux/system_headers/linux_syscalls.h
+index 2b78a0cc3..0a70f5ea5 100644
+--- sandbox/linux/system_headers/linux_syscalls.h
++++ sandbox/linux/system_headers/linux_syscalls.h
+@@ -35,5 +35,9 @@
+ #include "sandbox/linux/system_headers/arm64_linux_syscalls.h"
+ #endif
+ 
++#if defined(__powerpc64__)
++#include "sandbox/linux/system_headers/ppc64_linux_syscalls.h"
++#endif
++
+ #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_SYSCALLS_H_
+ 
+diff --git sandbox/linux/system_headers/linux_ucontext.h sandbox/linux/system_headers/linux_ucontext.h
+index 22ce78027..a69b024c2 100644
+--- sandbox/linux/system_headers/linux_ucontext.h
++++ sandbox/linux/system_headers/linux_ucontext.h
+@@ -11,6 +11,8 @@
+ #include "sandbox/linux/system_headers/arm_linux_ucontext.h"
+ #elif defined(__i386__)
+ #include "sandbox/linux/system_headers/i386_linux_ucontext.h"
++#elif defined(__powerpc64__)
++#include "sandbox/linux/system_headers/ppc64_linux_ucontext.h"
+ #else
+ #error "No support for your architecture in PNaCl header"
+ #endif
+diff --git sandbox/linux/system_headers/ppc64_linux_syscalls.h sandbox/linux/system_headers/ppc64_linux_syscalls.h
+new file mode 100644
+index 000000000..ccacffe22
+--- /dev/null
++++ sandbox/linux/system_headers/ppc64_linux_syscalls.h
+@@ -0,0 +1,12 @@
++// Copyright 2014 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
++#define SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
++
++#include <asm/unistd.h>
++
++//TODO: is it necessary to redefine syscall numbers for PPC64?
++
++#endif  // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
+diff --git sandbox/linux/system_headers/ppc64_linux_ucontext.h sandbox/linux/system_headers/ppc64_linux_ucontext.h
+new file mode 100644
+index 000000000..07728e087
+--- /dev/null
++++ sandbox/linux/system_headers/ppc64_linux_ucontext.h
+@@ -0,0 +1,12 @@
++// Copyright 2014 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
++#define SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
++
++#include <sys/ucontext.h>
++
++//TODO: is it necessary to redefine ucontext on PPC64?
++
++#endif  // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
+diff --git sandbox/policy/linux/bpf_renderer_policy_linux.cc sandbox/policy/linux/bpf_renderer_policy_linux.cc
+index 2588fc792..d455c4601 100644
+--- sandbox/policy/linux/bpf_renderer_policy_linux.cc
++++ sandbox/policy/linux/bpf_renderer_policy_linux.cc
+@@ -15,6 +15,11 @@
+ #include "sandbox/linux/system_headers/linux_syscalls.h"
+ #include "sandbox/policy/linux/sandbox_linux.h"
+ 
++// On PPC64, TCGETS is defined in terms of struct termios, so we must include termios.h
++#ifdef __powerpc64__
++#include <termios.h>
++#endif
++
+ // TODO(vignatti): replace the local definitions below with #include
+ // <linux/dma-buf.h> once kernel version 4.6 becomes widely used.
+ #include <linux/types.h>
+diff --git third_party/angle/src/compiler/translator/InfoSink.h third_party/angle/src/compiler/translator/InfoSink.h
+index 3a807e1e3..5258617a7 100644
+--- third_party/angle/src/compiler/translator/InfoSink.h
++++ third_party/angle/src/compiler/translator/InfoSink.h
+@@ -92,7 +92,16 @@ class TInfoSinkBase
+             stream.precision(8);
+             stream << f;
+         }
+-        sink.append(stream.str());
++
++        // Hack to work around a bug where negative floating point values
++        // are rendered like '.0.5' instead of '-0.5'
++        std::string res(stream.str());
++
++        if (signbit(f)) { // test if f is negative
++            res[0] = '-';
++        }
++
++        sink.append(res);
+         return *this;
+     }
+     // Write boolean values as their names instead of integral value.
+diff --git third_party/angle/src/libANGLE/Constants.h third_party/angle/src/libANGLE/Constants.h
+index fcbc9246a..39ae66148 100644
+--- third_party/angle/src/libANGLE/Constants.h
++++ third_party/angle/src/libANGLE/Constants.h
+@@ -9,6 +9,7 @@
+ #ifndef LIBANGLE_CONSTANTS_H_
+ #define LIBANGLE_CONSTANTS_H_
+ 
++#include <cstddef>
+ #include "common/platform.h"
+ 
+ #include <stdint.h>
+diff --git third_party/boringssl/BUILD.gn third_party/boringssl/BUILD.gn
+index 17cf9cda9..8ce96bd32 100644
+--- third_party/boringssl/BUILD.gn
++++ third_party/boringssl/BUILD.gn
+@@ -103,6 +103,13 @@ if (is_win && !is_msan && current_cpu != "arm64") {
+       } else {
+         public_configs = [ ":no_asm_config" ]
+       }
++    } else if (current_cpu == "ppc64") {
++      if (is_linux) {
++        # TODO: ppc64 (be) check
++        sources += crypto_sources_linux_ppc64le
++      } else {
++        public_configs = [ ":no_asm_config" ]
++      }
+     } else {
+       public_configs = [ ":no_asm_config" ]
+     }
+diff --git third_party/breakpad/BUILD.gn third_party/breakpad/BUILD.gn
+index 4af3d7bbf..adbf54159 100644
+--- third_party/breakpad/BUILD.gn
++++ third_party/breakpad/BUILD.gn
+@@ -596,7 +596,6 @@ if (is_linux || is_chromeos || is_android) {
+       "breakpad/src/client/minidump_file_writer.h",
+       "breakpad/src/common/convert_UTF.cc",
+       "breakpad/src/common/convert_UTF.h",
+-      "breakpad/src/common/linux/breakpad_getcontext.S",
+       "breakpad/src/common/linux/elf_core_dump.cc",
+       "breakpad/src/common/linux/elf_core_dump.h",
+       "breakpad/src/common/linux/elfutils.cc",
+@@ -634,6 +633,14 @@ if (is_linux || is_chromeos || is_android) {
+ 
+     libs = [ "dl" ]
+ 
++    if (current_cpu == "ppc64") {
++        defines = [ "HAVE_GETCONTEXT" ]
++    } else {
++        sources += [
++            "breakpad/src/common/linux/breakpad_getcontext.S"
++        ]
++    }
++
+     include_dirs = [
+       ".",
+       "breakpad/src",
+@@ -682,7 +689,6 @@ if (is_linux || is_chromeos || is_android) {
+       "breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc",
+       "breakpad/src/client/linux/minidump_writer/minidump_writer_unittest_utils.cc",
+       "breakpad/src/client/linux/minidump_writer/proc_cpuinfo_reader_unittest.cc",
+-      "breakpad/src/common/linux/breakpad_getcontext_unittest.cc",
+       "breakpad/src/common/linux/elf_core_dump_unittest.cc",
+       "breakpad/src/common/linux/file_id_unittest.cc",
+       "breakpad/src/common/linux/linux_libc_support_unittest.cc",
+diff --git third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
+index 07d9171a0..9aed4cb36 100644
+--- third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
++++ third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
+@@ -44,6 +44,8 @@ typedef MDRawContextARM RawContextCPU;
+ typedef MDRawContextARM64_Old RawContextCPU;
+ #elif defined(__mips__)
+ typedef MDRawContextMIPS RawContextCPU;
++#elif defined(__powerpc64__)
++typedef MDRawContextPPC64 RawContextCPU;
+ #else
+ #error "This code has not been ported to your platform yet."
+ #endif
+diff --git third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
+index aae1dc13b..03afec7a5 100644
+--- third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
++++ third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
+@@ -270,7 +270,42 @@ void ThreadInfo::FillCPUContext(RawContextCPU* out) const {
+   out->float_save.fir = mcontext.fpc_eir;
+ #endif
+ }
+-#endif  // __mips__
++
++#elif defined(__powerpc64__)
++
++uintptr_t ThreadInfo::GetInstructionPointer() const {
++    return mcontext.gp_regs[PT_NIP];
++}
++
++void ThreadInfo::FillCPUContext(RawContextCPU* out) const {
++    out->context_flags = MD_CONTEXT_PPC64_FULL;
++    for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
++        out->gpr[i] = mcontext.gp_regs[i];
++
++    out->lr = mcontext.gp_regs[PT_LNK];
++    out->srr0 = mcontext.gp_regs[PT_NIP];
++    out->srr1 = mcontext.gp_regs[PT_MSR];
++    out->cr = mcontext.gp_regs[PT_CCR];
++    out->xer = mcontext.gp_regs[PT_XER];
++    out->ctr = mcontext.gp_regs[PT_CTR];
++    
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = mcontext.fp_regs[i];
++
++    out->float_save.fpscr = mcontext.fp_regs[NFPREG-1];
++
++    for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++)
++        out->vector_save.save_vr[i] = \
++            {(((uint64_t)vregs.vrregs[i][0]) << 32) 
++                          | vregs.vrregs[i][1], 
++            (((uint64_t)vregs.vrregs[i][2]) << 32)
++                         | vregs.vrregs[i][3]};
++
++    out->vrsave = vregs.vrsave;
++    out->vector_save.save_vscr = {0, vregs.vscr.vscr_word};
++    out->vector_save.save_vrvalid = 0xFFFFFFFF; 
++}
++#endif  // __powerpc64__
+ 
+ void ThreadInfo::GetGeneralPurposeRegisters(void** gp_regs, size_t* size) {
+   assert(gp_regs || size);
+@@ -279,6 +314,11 @@ void ThreadInfo::GetGeneralPurposeRegisters(void** gp_regs, size_t* size) {
+     *gp_regs = mcontext.gregs;
+   if (size)
+     *size = sizeof(mcontext.gregs);
++#elif defined(__powerpc64__)
++  if (gp_regs)
++    *gp_regs = mcontext.gp_regs;
++  if (size)
++    *size = sizeof(mcontext.gp_regs);
+ #else
+   if (gp_regs)
+     *gp_regs = &regs;
+@@ -294,6 +334,11 @@ void ThreadInfo::GetFloatingPointRegisters(void** fp_regs, size_t* size) {
+     *fp_regs = &mcontext.fpregs;
+   if (size)
+     *size = sizeof(mcontext.fpregs);
++#elif defined(__powerpc64__)
++  if (fp_regs)
++    *fp_regs = &mcontext.fp_regs;
++  if (size)
++    *size = sizeof(mcontext.fp_regs);
+ #else
+   if (fp_regs)
+     *fp_regs = &fpregs;
+@@ -302,4 +347,13 @@ void ThreadInfo::GetFloatingPointRegisters(void** fp_regs, size_t* size) {
+ #endif
+ }
+ 
++#if defined(__powerpc64__)
++void ThreadInfo::GetVectorRegisters(void** v_regs, size_t* size) {
++    if (v_regs)
++        *v_regs = &vregs;
++    if (size)
++        *size = sizeof(vregs);
++}
++#endif
++
+ }  // namespace google_breakpad
+diff --git third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
+index fb216fa6d..593aac822 100644
+--- third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
++++ third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
+@@ -68,6 +68,10 @@ struct ThreadInfo {
+   // Use the structures defined in <sys/user.h>
+   struct user_regs_struct regs;
+   struct user_fpsimd_struct fpregs;
++#elif defined(__powerpc64__)
++  // Use the structures defined in <sys/ucontext.h>.
++  mcontext_t mcontext;
++  vrregset_t vregs;
+ #elif defined(__mips__)
+   // Use the structure defined in <sys/ucontext.h>.
+   mcontext_t mcontext;
+@@ -84,6 +88,11 @@ struct ThreadInfo {
+ 
+   // Returns the pointer and size of float point register area.
+   void GetFloatingPointRegisters(void** fp_regs, size_t* size);
++
++#if defined(__powerpc64__)
++  // Returns the pointer and size of the vector register area. (PPC64 only)
++  void GetVectorRegisters(void** v_regs, size_t* size);
++#endif
+ };
+ 
+ }  // namespace google_breakpad
+diff --git third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
+index 6eec1be24..741983a1a 100644
+--- third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
++++ third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
+@@ -254,6 +254,48 @@ void UContextReader::FillCPUContext(RawContextCPU* out, const ucontext_t* uc) {
+   out->float_save.fir = uc->uc_mcontext.fpc_eir;  // Unused.
+ #endif
+ }
++
++#elif defined(__powerpc64__)
++
++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
++    return uc->uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP];
++}
++
++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
++    return uc->uc_mcontext.gp_regs[PT_NIP];
++}
++
++void UContextReader::FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
++                                    const vrregset_t* vregs) {
++    out->context_flags = MD_CONTEXT_PPC64_FULL;
++
++    for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
++        out->gpr[i] = uc->uc_mcontext.gp_regs[i];
++
++    out->lr = uc->uc_mcontext.gp_regs[PT_LNK];    
++    out->srr0 = uc->uc_mcontext.gp_regs[PT_NIP];
++    out->srr1 = uc->uc_mcontext.gp_regs[PT_MSR];
++    out->cr = uc->uc_mcontext.gp_regs[PT_CCR];
++    out->xer = uc->uc_mcontext.gp_regs[PT_XER];
++    out->ctr = uc->uc_mcontext.gp_regs[PT_CTR];
++    
++    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++        out->float_save.fpregs[i] = uc->uc_mcontext.fp_regs[i];
++
++    out->float_save.fpscr = uc->uc_mcontext.fp_regs[NFPREG-1];
++
++    for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++)
++        out->vector_save.save_vr[i] =
++            {(((uint64_t)vregs->vrregs[i][0]) << 32) 
++                         | vregs->vrregs[i][1], 
++             (((uint64_t)vregs->vrregs[i][2]) << 32)
++                         | vregs->vrregs[i][3]};
++
++    out->vrsave = vregs->vrsave;
++    out->vector_save.save_vscr = {0, vregs->vscr.vscr_word};
++    out->vector_save.save_vrvalid = 0xFFFFFFFF; 
++}
++
+ #endif
+ 
+ }  // namespace google_breakpad
+diff --git third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
+index 7d4100881..c122ac92e 100644
+--- third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
++++ third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
+@@ -55,6 +55,9 @@ struct UContextReader {
+ #elif defined(__aarch64__)
+   static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
+                              const struct fpsimd_context* fpregs);
++#elif defined(__powerpc64__)
++  static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
++                             const vrregset_t* vregs);
+ #else
+   static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc);
+ #endif
+diff --git third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
+index a6cb5f984..ae16b64d9 100644
+--- third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
++++ third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
+@@ -461,9 +461,16 @@ bool ExceptionHandler::HandleSignal(int /*sig*/, siginfo_t* info, void* uc) {
+     memcpy(&g_crash_context_.float_state, fp_ptr,
+            sizeof(g_crash_context_.float_state));
+   }
++#elif defined(__powerpc64__)
++  // On PPC64, we must copy VR state
++  ucontext_t* uc_ptr = (ucontext_t*)uc;
++  if (uc_ptr->uc_mcontext.v_regs) {
++    memcpy(&g_crash_context_.vector_state, uc_ptr->uc_mcontext.v_regs,
++           sizeof(g_crash_context_.vector_state));
++  }
+ #elif !defined(__ARM_EABI__) && !defined(__mips__)
+   // FP state is not part of user ABI on ARM Linux.
+-  // In case of MIPS Linux FP state is already part of ucontext_t
++  // In case of MIPS, Linux FP state is already part of ucontext_t
+   // and 'float_state' is not a member of CrashContext.
+   ucontext_t* uc_ptr = (ucontext_t*)uc;
+   if (uc_ptr->uc_mcontext.fpregs) {
+@@ -708,11 +715,19 @@ bool ExceptionHandler::WriteMinidump() {
+   }
+ #endif
+ 
+-#if !defined(__ARM_EABI__) && !defined(__aarch64__) && !defined(__mips__)
++#if !defined(__ARM_EABI__) && !defined(__aarch64__) && !defined(__mips__) \
++    && !defined(__powerpc64__)
+   // FPU state is not part of ARM EABI ucontext_t.
+   memcpy(&context.float_state, context.context.uc_mcontext.fpregs,
+          sizeof(context.float_state));
+ #endif
++
++#if defined(__powerpc64__)
++  // Vector registers must be copied on PPC64
++  memcpy(&context.vector_state, context.context.uc_mcontext.v_regs,
++         sizeof(context.vector_state));
++#endif
++
+   context.tid = sys_gettid();
+ 
+   // Add an exception stream to the minidump for better reporting.
+@@ -733,6 +748,9 @@ bool ExceptionHandler::WriteMinidump() {
+ #elif defined(__mips__)
+   context.siginfo.si_addr =
+       reinterpret_cast<void*>(context.context.uc_mcontext.pc);
++#elif defined(__powerpc64__)
++  context.siginfo.si_addr =
++      reinterpret_cast<void*>(context.context.uc_mcontext.gp_regs[PT_NIP]);
+ #else
+ #error "This code has not been ported to your platform yet."
+ #endif
+diff --git third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
+index f80843ea7..260dd10f7 100644
+--- third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
++++ third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
+@@ -192,7 +192,11 @@ class ExceptionHandler {
+     siginfo_t siginfo;
+     pid_t tid;  // the crashing thread.
+     ucontext_t context;
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++    // PPC64's FP state is a part of ucontext_t like MIPS but the vector
++    // state is not, so a struct is needed.
++    vstate_t vector_state;
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+     // #ifdef this out because FP state is not part of user ABI for Linux ARM.
+     // In case of MIPS Linux FP state is already part of ucontext_t so
+     // 'float_state' is not required.
+diff --git third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
+index 35dcbfd4d..7934370fd 100644
+--- third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
++++ third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
+@@ -307,7 +307,7 @@ TEST(ExceptionHandlerTest, ParallelChildCrashesDontHang) {
+   }
+ 
+   // Wait a while until the child should have crashed.
+-  usleep(1000000);
++  usleep(2000000);
+   // Kill the child if it is still running.
+   kill(child, SIGKILL);
+ 
+@@ -559,6 +559,8 @@ const unsigned char kIllegalInstruction[] = {
+ #if defined(__mips__)
+   // mfc2 zero,Impl - usually illegal in userspace.
+   0x48, 0x00, 0x00, 0x48
++#elif defined(__powerpc64__)
++  0x01, 0x01, 0x01, 0x01 // Crashes on a tested POWER9 cpu
+ #else
+   // This crashes with SIGILL on x86/x86-64/arm.
+   0xff, 0xff, 0xff, 0xff
+@@ -754,10 +756,10 @@ TEST(ExceptionHandlerTest, InstructionPointerMemoryMaxBound) {
+ 
+   // These are defined here so the parent can use them to check the
+   // data from the minidump afterwards.
+-  // Use 4k here because the OS will hand out a single page even
++  // Use the page size here because the OS will hand out a single page even
+   // if a smaller size is requested, and this test wants to
+   // test the upper bound of the memory range.
+-  const uint32_t kMemorySize = 4096;  // bytes
++  const uint32_t kMemorySize = getpagesize();  // bytes
+   const int kOffset = kMemorySize - sizeof(kIllegalInstruction);
+ 
+   const pid_t child = fork();
+diff --git third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
+index fa3c1713a..6ce709e2f 100644
+--- third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
++++ third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
+@@ -138,7 +138,9 @@ class MicrodumpWriter {
+                   const MicrodumpExtraInfo& microdump_extra_info,
+                   LinuxDumper* dumper)
+       : ucontext_(context ? &context->context : NULL),
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++        vector_state_(context ? &context->vector_state : NULL),
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+         float_state_(context ? &context->float_state : NULL),
+ #endif
+         dumper_(dumper),
+@@ -337,6 +339,8 @@ class MicrodumpWriter {
+ # else
+ #  error "This mips ABI is currently not supported (n32)"
+ #endif
++#elif defined(__powerpc64__)
++    const char kArch[] = "ppc64";
+ #else
+ #error "This code has not been ported to your platform yet"
+ #endif
+@@ -409,7 +413,9 @@ class MicrodumpWriter {
+   void DumpCPUState() {
+     RawContextCPU cpu;
+     my_memset(&cpu, 0, sizeof(RawContextCPU));
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++    UContextReader::FillCPUContext(&cpu, ucontext_, vector_state_);
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+     UContextReader::FillCPUContext(&cpu, ucontext_, float_state_);
+ #else
+     UContextReader::FillCPUContext(&cpu, ucontext_);
+@@ -605,7 +611,9 @@ class MicrodumpWriter {
+   void* Alloc(unsigned bytes) { return dumper_->allocator()->Alloc(bytes); }
+ 
+   const ucontext_t* const ucontext_;
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++  const google_breakpad::vstate_t* const vector_state_;
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+   const google_breakpad::fpstate_t* const float_state_;
+ #endif
+   LinuxDumper* dumper_;
+diff --git third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
+index 6339ac0cd..291af106b 100644
+--- third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
++++ third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
+@@ -279,10 +279,19 @@ TEST(MicrodumpWriterTest, BasicWithMappings) {
+   CrashAndGetMicrodump(mappings, MicrodumpExtraInfo(), &buf);
+   ASSERT_TRUE(ContainsMicrodump(buf));
+ 
++  int page_size = getpagesize();
+ #ifdef __LP64__
+-  ASSERT_NE(std::string::npos,
+-            buf.find("M 0000000000001000 000000000000002A 0000000000001000 "
+-                     "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
++  // This test is only available for the following page sizes
++  ASSERT_TRUE((page_size == 4096) || (page_size == 65536));
++  if (page_size == 4096) { 
++    ASSERT_NE(std::string::npos,
++              buf.find("M 0000000000001000 000000000000002A 0000000000001000 "
++                       "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
++  } else {
++    ASSERT_NE(std::string::npos,
++              buf.find("M 0000000000010000 000000000000002A 0000000000010000 "
++                       "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
++  }
+ #else
+   ASSERT_NE(std::string::npos,
+             buf.find("M 00001000 0000002A 00001000 "
+diff --git third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
+index 415068983..b93e4afcf 100644
+--- third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
++++ third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
+@@ -112,6 +112,9 @@ bool LinuxCoreDumper::GetThreadInfoByIndex(size_t index, ThreadInfo* info) {
+ #elif defined(__mips__)
+   stack_pointer =
+       reinterpret_cast<uint8_t*>(info->mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]);
++#elif defined(__powerpc64__)
++  stack_pointer =
++      reinterpret_cast<uint8_t*>(info->mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP]);
+ #else
+ #error "This code hasn't been ported to your platform yet."
+ #endif
+@@ -197,7 +200,10 @@ bool LinuxCoreDumper::EnumerateThreads() {
+         memset(&info, 0, sizeof(ThreadInfo));
+         info.tgid = status->pr_pgrp;
+         info.ppid = status->pr_ppid;
+-#if defined(__mips__)
++#if defined(__powerpc64__)
++        for (int i = 0; i < 31; i++)
++            info.mcontext.gp_regs[i] = status->pr_reg[i];
++#elif defined(__mips__)
+ #if defined(__ANDROID__)
+         for (int i = EF_R0; i <= EF_R31; i++)
+           info.mcontext.gregs[i - EF_R0] = status->pr_reg[i];
+diff --git third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
+index 7fd6532ad..199cbfffd 100644
+--- third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
++++ third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
+@@ -765,7 +765,9 @@ bool LinuxDumper::GetStackInfo(const void** stack, size_t* stack_len,
+       reinterpret_cast<uint8_t*>(int_stack_pointer & ~(page_size - 1));
+ 
+   // The number of bytes of stack which we try to capture.
+-  static const ptrdiff_t kStackToCapture = 32 * 1024;
++  // This now depends on page_size to avoid missing data
++  // on systems with larger page sizes.
++  static const ptrdiff_t kStackToCapture = 8 * page_size;
+ 
+   const MappingInfo* mapping = FindMapping(stack_pointer);
+   if (!mapping)
+diff --git third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
+index 7bee160f1..07bb2b81a 100644
+--- third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
++++ third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
+@@ -63,7 +63,8 @@ namespace google_breakpad {
+  (defined(__mips__) && _MIPS_SIM == _ABIO32)
+ typedef Elf32_auxv_t elf_aux_entry;
+ #elif defined(__x86_64) || defined(__aarch64__) || \
+-     (defined(__mips__) && _MIPS_SIM != _ABIO32)
++     (defined(__mips__) && _MIPS_SIM != _ABIO32) || \
++     defined(__powerpc64__)
+ typedef Elf64_auxv_t elf_aux_entry;
+ #endif
+ 
+diff --git third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
+index 331f4bb34..3f722947f 100644
+--- third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
++++ third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
+@@ -51,6 +51,8 @@
+ #define TID_PTR_REGISTER "rcx"
+ #elif defined(__mips__)
+ #define TID_PTR_REGISTER "$1"
++#elif defined(__powerpc64__)
++#define TID_PTR_REGISTER "r8"
+ #else
+ #error This test has not been ported to this platform.
+ #endif
+diff --git third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
+index e3ddb81a6..fa28575ef 100644
+--- third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
++++ third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
+@@ -149,19 +149,27 @@ bool LinuxPtraceDumper::CopyFromProcess(void* dest, pid_t child,
+   return true;
+ }
+ 
+-bool LinuxPtraceDumper::ReadRegisterSet(ThreadInfo* info, pid_t tid)
+-{
++bool LinuxPtraceDumper::ReadRegisterSet(ThreadInfo* info, pid_t tid) {
+ #ifdef PTRACE_GETREGSET
+   struct iovec io;
+   info->GetGeneralPurposeRegisters(&io.iov_base, &io.iov_len);
+-  if (sys_ptrace(PTRACE_GETREGSET, tid, (void*)NT_PRSTATUS, (void*)&io) == -1) {
++  if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_PRSTATUS, (void*)&io) == -1) {
+     return false;
+   }
+ 
+   info->GetFloatingPointRegisters(&io.iov_base, &io.iov_len);
+-  if (sys_ptrace(PTRACE_GETREGSET, tid, (void*)NT_FPREGSET, (void*)&io) == -1) {
++  if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_FPREGSET, (void*)&io) == -1) {
+     return false;
+   }
++
++#if defined(__powerpc64__)
++  // Grab the vector registers on PPC64 too
++  info->GetVectorRegisters(&io.iov_base, &io.iov_len);
++  if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_PPC_VMX, (void*)&io) == -1) {
++    return false;
++  }
++#endif // defined(__powerpc64__)
++
+   return true;
+ #else
+   return false;
+@@ -298,6 +306,9 @@ bool LinuxPtraceDumper::GetThreadInfoByIndex(size_t index, ThreadInfo* info) {
+ #elif defined(__mips__)
+   stack_pointer =
+       reinterpret_cast<uint8_t*>(info->mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]);
++#elif defined(__powerpc64__)
++  stack_pointer =
++      reinterpret_cast<uint8_t*>(info->mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP]);
+ #else
+ #error "This code hasn't been ported to your platform yet."
+ #endif
+diff --git third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
+index da71e15dc..12bfb317a 100644
+--- third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
++++ third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
+@@ -462,6 +462,9 @@ TEST(LinuxPtraceDumperTest, VerifyStackReadWithMultipleThreads) {
+ #elif defined(__mips__)
+     pid_t* process_tid_location =
+         reinterpret_cast<pid_t*>(one_thread.mcontext.gregs[1]);
++#elif defined(__powerpc64__)
++    pid_t* process_tid_location =
++        reinterpret_cast<pid_t*>(one_thread.mcontext.gp_regs[8]);
+ #else
+ #error This test has not been ported to this platform.
+ #endif
+@@ -559,6 +562,8 @@ TEST_F(LinuxPtraceDumperTest, SanitizeStackCopy) {
+   uintptr_t heap_addr = thread_info.regs.rcx;
+ #elif defined(__mips__)
+   uintptr_t heap_addr = thread_info.mcontext.gregs[1];
++#elif defined(__powerpc64__)
++  uintptr_t heap_addr = thread_info.mcontext.gp_regs[8];
+ #else
+ #error This test has not been ported to this platform.
+ #endif
+diff --git third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
+index 32634ef00..2a56948de 100644
+--- third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
++++ third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
+@@ -136,7 +136,9 @@ class MinidumpWriter {
+       : fd_(minidump_fd),
+         path_(minidump_path),
+         ucontext_(context ? &context->context : NULL),
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++        vector_state_(context ? &context->vector_state : NULL),
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+         float_state_(context ? &context->float_state : NULL),
+ #endif
+         dumper_(dumper),
+@@ -468,7 +470,9 @@ class MinidumpWriter {
+         if (!cpu.Allocate())
+           return false;
+         my_memset(cpu.get(), 0, sizeof(RawContextCPU));
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++        UContextReader::FillCPUContext(cpu.get(), ucontext_, vector_state_);
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+         UContextReader::FillCPUContext(cpu.get(), ucontext_, float_state_);
+ #else
+         UContextReader::FillCPUContext(cpu.get(), ucontext_);
+@@ -897,7 +901,7 @@ class MinidumpWriter {
+     dirent->location.rva = 0;
+   }
+ 
+-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || defined(__powerpc64__)
+   bool WriteCPUInformation(MDRawSystemInfo* sys_info) {
+     char vendor_id[sizeof(sys_info->cpu.x86_cpu_info.vendor_id) + 1] = {0};
+     static const char vendor_id_name[] = "vendor_id";
+@@ -917,7 +921,9 @@ class MinidumpWriter {
+ 
+     // processor_architecture should always be set, do this first
+     sys_info->processor_architecture =
+-#if defined(__mips__)
++#if defined(__powerpc64__)
++        MD_CPU_ARCHITECTURE_PPC64;
++#elif defined(__mips__)
+ # if _MIPS_SIM == _ABIO32
+         MD_CPU_ARCHITECTURE_MIPS;
+ # elif _MIPS_SIM == _ABI64
+@@ -1333,7 +1339,9 @@ class MinidumpWriter {
+   const char* path_;  // Path to the file where the minidum should be written.
+ 
+   const ucontext_t* const ucontext_;  // also from the signal handler
+-#if !defined(__ARM_EABI__) && !defined(__mips__)
++#if defined(__powerpc64__)
++  const google_breakpad::vstate_t* const vector_state_;
++#elif !defined(__ARM_EABI__) && !defined(__mips__)
+   const google_breakpad::fpstate_t* const float_state_;  // ditto
+ #endif
+   LinuxDumper* dumper_;
+diff --git third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
+index e3b0b16da..ccd8aa0a4 100644
+--- third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
++++ third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
+@@ -48,6 +48,8 @@ class ExceptionHandler;
+ 
+ #if defined(__aarch64__)
+ typedef struct fpsimd_context fpstate_t;
++#elif defined(__powerpc64__)
++typedef vrregset_t vstate_t;
+ #elif !defined(__ARM_EABI__) && !defined(__mips__)
+ typedef std::remove_pointer<fpregset_t>::type fpstate_t;
+ #endif
+diff --git third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
+index d192e5cbb..fc1bfa8d7 100644
+--- third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
++++ third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
+@@ -715,6 +715,9 @@ TEST(MinidumpWriterTest, InvalidStackPointer) {
+ #elif defined(__mips__)
+   context.context.uc_mcontext.gregs[MD_CONTEXT_MIPS_REG_SP] =
+       invalid_stack_pointer;
++#elif defined(__powerpc64__)
++  context.context.uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP] =
++      invalid_stack_pointer;
+ #else
+ # error "This code has not been ported to your platform yet."
+ #endif
+diff --git third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
+index 99362945c..c54ba7145 100644
+--- third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
++++ third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
+@@ -65,8 +65,7 @@ bool MemoryMappedFile::Map(const char* path, size_t offset) {
+   }
+ 
+ #if defined(__x86_64__) || defined(__aarch64__) || \
+-   (defined(__mips__) && _MIPS_SIM == _ABI64)
+-
++   (defined(__mips__) && _MIPS_SIM == _ABI64) || defined(__powerpc64__)
+   struct kernel_stat st;
+   if (sys_fstat(fd, &st) == -1 || st.st_size < 0) {
+ #else
+diff --git third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
+index fad59f40c..616496d67 100644
+--- third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
++++ third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
+@@ -176,9 +176,10 @@ TEST_F(MemoryMappedFileTest, RemapAfterMap) {
+ TEST_F(MemoryMappedFileTest, MapWithOffset) {
+   // Put more data in the test file this time. Offsets can only be
+   // done on page boundaries, so we need a two page file to test this.
+-  const int page_size = 4096;
+-  char data1[2 * page_size];
+-  size_t data1_size = sizeof(data1);
++  const int page_size = getpagesize();
++  char *data1 = static_cast<char*>(malloc(2 * page_size));
++  EXPECT_TRUE(data1 != NULL);
++  size_t data1_size = (2 * page_size);
+   for (size_t i = 0; i < data1_size; ++i) {
+     data1[i] = i & 0x7f;
+   }
+diff --git third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
+index 5803b90d5..2a1cf14f0 100644
+--- third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
++++ third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
+@@ -57,8 +57,9 @@ TEST(PageAllocatorTest, LargeObject) {
+ 
+   EXPECT_EQ(0U, allocator.pages_allocated());
+   uint8_t* p = reinterpret_cast<uint8_t*>(allocator.Alloc(10000));
++  uint64_t expected_pages = 1 + ((10000 - 1) / getpagesize());
+   ASSERT_FALSE(p == NULL);
+-  EXPECT_EQ(3U, allocator.pages_allocated());
++  EXPECT_EQ(expected_pages, allocator.pages_allocated());
+   for (unsigned i = 1; i < 10; ++i) {
+     uint8_t* p = reinterpret_cast<uint8_t*>(allocator.Alloc(i));
+     ASSERT_FALSE(p == NULL);
+diff --git third_party/breakpad/breakpad/src/processor/exploitability_linux.cc third_party/breakpad/breakpad/src/processor/exploitability_linux.cc
+index 798056dfa..22bd81fff 100644
+--- third_party/breakpad/breakpad/src/processor/exploitability_linux.cc
++++ third_party/breakpad/breakpad/src/processor/exploitability_linux.cc
+@@ -202,12 +202,14 @@ bool ExploitabilityLinux::EndedOnIllegalWrite(uint64_t instruction_ptr) {
+   // Check architecture and set architecture variable to corresponding flag
+   // in objdump.
+   switch (context->GetContextCPU()) {
++#if defined(__i386) || defined(__x86_64)
+     case MD_CONTEXT_X86:
+       architecture = "i386";
+       break;
+     case MD_CONTEXT_AMD64:
+       architecture = "i386:x86-64";
+       break;
++#endif
+     default:
+       // Unsupported architecture. Note that ARM architectures are not
+       // supported because objdump does not support ARM.
+diff --git third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc
+index 528ee5f21..72764d6c1 100644
+--- third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc
++++ third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc
+@@ -104,6 +104,8 @@ ExploitabilityFor(const string& filename) {
+ }
+ 
+ TEST(ExploitabilityTest, TestWindowsEngine) {
++// The following tests are only executable on an x86-class linux machine.
++#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+             ExploitabilityFor("ascii_read_av.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+@@ -136,9 +138,12 @@ TEST(ExploitabilityTest, TestWindowsEngine) {
+             ExploitabilityFor("read_av_clobber_write.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_LOW,
+             ExploitabilityFor("read_av_conditional.dmp"));
++#endif
+ }
+ 
+ TEST(ExploitabilityTest, TestLinuxEngine) {
++// The following tests are only executable on an x86-class linux machine.
++#if defined(__i386) || defined(__x86_64)
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_INTERESTING,
+             ExploitabilityFor("linux_null_read_av.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+@@ -171,7 +176,8 @@ TEST(ExploitabilityTest, TestLinuxEngine) {
+             ExploitabilityFor("linux_executable_heap.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+             ExploitabilityFor("linux_jmp_to_module_not_exe_region.dmp"));
+-#ifndef _WIN32
++#endif
++#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+             ExploitabilityFor("linux_write_to_nonwritable_module.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
+@@ -182,10 +188,10 @@ TEST(ExploitabilityTest, TestLinuxEngine) {
+             ExploitabilityFor("linux_write_to_outside_module_via_math.dmp"));
+   ASSERT_EQ(google_breakpad::EXPLOITABILITY_INTERESTING,
+             ExploitabilityFor("linux_write_to_under_4k.dmp"));
+-#endif  // _WIN32
++#endif  // !defined(_WIN32) && (!defined(__i386) && !defined(__x86_64))
+ }
+ 
+-#ifndef _WIN32
++#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
+ TEST(ExploitabilityLinuxUtilsTest, DisassembleBytesTest) {
+   ASSERT_FALSE(ExploitabilityLinuxTest::DisassembleBytes("", NULL, 5, NULL));
+   uint8_t bytes[6] = {0xc7, 0x0, 0x5, 0x0, 0x0, 0x0};
+@@ -301,6 +307,7 @@ TEST(ExploitabilityLinuxUtilsTest, CalculateAddressTest) {
+                                                          context,
+                                                          &write_address));
+ }
+-#endif  // _WIN32
++#endif  // !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
++
+ 
+ }  // namespace
+diff --git third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
+index aade82c99..195aa73f3 100644
+--- third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
++++ third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
+@@ -77,6 +77,8 @@
+   #define ELF_ARCH  EM_MIPS
+ #elif defined(__aarch64__)
+   #define ELF_ARCH  EM_AARCH64
++#elif defined(__powerpc64__)
++  #define ELF_ARCH  EM_PPC64
+ #endif
+ 
+ #if defined(__arm__)
+@@ -87,6 +89,8 @@ typedef user_regs user_regs_struct;
+ #elif defined (__mips__)
+ // This file-local typedef simplifies the source code.
+ typedef gregset_t user_regs_struct;
++#elif defined(__powerpc64__)
++typedef struct pt_regs user_regs_struct;
+ #endif
+ 
+ using google_breakpad::MDTypeHelper;
+@@ -321,6 +325,9 @@ struct CrashedProcess {
+ #endif
+ #if defined(__aarch64__)
+     user_fpsimd_struct fpregs;
++#endif
++#if defined(__powerpc64__)
++    mcontext_t mcontext;
+ #endif
+     uintptr_t stack_addr;
+     const uint8_t* stack;
+@@ -535,6 +542,38 @@ ParseThreadRegisters(CrashedProcess::Thread* thread,
+   thread->mcontext.fpc_eir = rawregs->float_save.fir;
+ #endif
+ }
++#elif defined(__powerpc64__)
++static void
++ParseThreadRegisters(CrashedProcess::Thread* thread,
++                     const MinidumpMemoryRange& range) {
++  const MDRawContextPPC64* rawregs = range.GetData<MDRawContextPPC64>(0);
++
++  for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
++    thread->mcontext.gp_regs[i] = rawregs->gpr[i];
++
++  thread->mcontext.gp_regs[PT_LNK] = rawregs->lr;
++  thread->mcontext.gp_regs[PT_NIP] = rawregs->srr0;
++  thread->mcontext.gp_regs[PT_MSR] = rawregs->srr1;
++  thread->mcontext.gp_regs[PT_CCR] = rawregs->cr;
++  thread->mcontext.gp_regs[PT_XER] = rawregs->xer;
++  thread->mcontext.gp_regs[PT_CTR] = rawregs->ctr;
++  thread->mcontext.v_regs->vrsave = rawregs->vrsave;
++
++  for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
++      thread->mcontext.fp_regs[i] = rawregs->float_save.fpregs[i];
++
++  thread->mcontext.fp_regs[NFPREG-1] = rawregs->float_save.fpscr;
++
++  for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++) {
++      thread->mcontext.v_regs->vrregs[i][0] = rawregs->vector_save.save_vr[i].high >> 32;
++      thread->mcontext.v_regs->vrregs[i][1] = rawregs->vector_save.save_vr[i].high;
++      thread->mcontext.v_regs->vrregs[i][2] = rawregs->vector_save.save_vr[i].low >> 32;
++      thread->mcontext.v_regs->vrregs[i][3] = rawregs->vector_save.save_vr[i].low;
++  }
++
++  thread->mcontext.v_regs->vscr.vscr_word = rawregs->vector_save.save_vscr.low & 0xFFFFFFFF;
++}
++
+ #else
+ #error "This code has not been ported to your platform yet"
+ #endif
+@@ -623,6 +662,12 @@ ParseSystemInfo(const Options& options, CrashedProcess* crashinfo,
+ # else
+ #  error "This mips ABI is currently not supported (n32)"
+ # endif
++#elif defined(__powerpc64__)
++  if (sysinfo->processor_architecture != MD_CPU_ARCHITECTURE_PPC64) {
++    fprintf(stderr,
++            "This version of minidump-2-core only supports PPC64.\n");
++    exit(1);
++  }
+ #else
+ #error "This code has not been ported to your platform yet"
+ #endif
+diff --git third_party/crashpad/crashpad/CONTRIBUTORS third_party/crashpad/crashpad/CONTRIBUTORS
+index 8724b7f32..8e29424ef 100644
+--- third_party/crashpad/crashpad/CONTRIBUTORS
++++ third_party/crashpad/crashpad/CONTRIBUTORS
+@@ -13,3 +13,4 @@ Mark Mentovai <mark@chromium.org>
+ Robert Sesek <rsesek@chromium.org>
+ Scott Graham <scottmg@chromium.org>
+ Joshua Peraza <jperaza@chromium.org>
++Shawn Anastasio <shawn@anastas.io>
+diff --git third_party/crashpad/crashpad/compat/linux/sys/user.h third_party/crashpad/crashpad/compat/linux/sys/user.h
+index 6ed77a98e..1fd83469a 100644
+--- third_party/crashpad/crashpad/compat/linux/sys/user.h
++++ third_party/crashpad/crashpad/compat/linux/sys/user.h
+@@ -15,6 +15,7 @@
+ #ifndef CRASHPAD_COMPAT_LINUX_SYS_USER_H_
+ #define CRASHPAD_COMPAT_LINUX_SYS_USER_H_
+ 
++#include <cstddef>
+ #include_next <sys/user.h>
+ 
+ #include <features.h>
+diff --git third_party/crashpad/crashpad/minidump/minidump_context.h third_party/crashpad/crashpad/minidump/minidump_context.h
+index 3a3e603cb..3118d9e9f 100644
+--- third_party/crashpad/crashpad/minidump/minidump_context.h
++++ third_party/crashpad/crashpad/minidump/minidump_context.h
+@@ -592,6 +592,70 @@ struct MinidumpContextMIPS64 {
+   uint64_t fir;
+ };
+ 
++//! \brief ppc64-specific flags for MinidumpPPC64::context_flags
++//! Based on minidump_cpu_ppc64.h from breakpad
++enum MinidumpContextPPC64Flags : uint32_t {
++  //! \brief Identifies the context as PPC64.
++  kMinidumpContextPPC64 = 0x01000000,
++
++  //! \brief Indicates the validity of general purpose registers.
++  //!
++  //! Registers `r0`-`r31`, `nip`, `msr`, `lr`, etc. are valid.
++  kMinidumpContextPPC64Base = kMinidumpContextPPC64 | 0x00000001,
++
++  //! \brief Indicates the validity of floating point registers.
++  //!
++  //! Registers `fp0`-`fp31`, `fpscr` are valid.
++  kMinidumpContextPPC64Floating = kMinidumpContextPPC64 | 0x00000008,
++
++  //! \brief Indicates the validity of Altivec/VMX registers.
++  //!
++  //! Registers `v0`-`v31`, `vscr`, `vrsave`.
++  kMinidumpContextPPC64Vector = kMinidumpContextPPC64 | 0x00000020,
++
++  //! \brief Indicates the validity of all registers
++  kMinidumpContextPPC64All = kMinidumpContextPPC64Base     |
++                             kMinidumpContextPPC64Floating |
++                             kMinidumpContextPPC64Vector
++};
++
++//! \brief A PPC64 CPU context carried in a minidump file.
++//! Based on minidump_cpu_ppc64.h from breakpad.
++struct MinidumpContextPPC64 {
++  uint64_t context_flags;
++
++  //! \brief General purpose registers.
++  uint64_t nip;
++  uint64_t msr;
++  uint64_t regs[32];
++  uint64_t ccr;
++  uint64_t xer;
++  uint64_t lnk;
++  uint64_t ctr;
++
++  //! \brief Floating point registers.
++  double fpregs[32];
++
++  //! \brief FPU status register.
++  double fpscr;
++
++  //! \brief Altivec/VMX vector registers.
++  struct {
++      //! \brief Vector registers are 128bits.
++      uint128_struct save_vr[32];
++      uint128_struct save_vscr;
++
++      //! \brief Padding included for breakpad compatibiltiy.
++      uint32_t save_pad5[4];
++
++      //! \brief VRSAVE register.
++      uint32_t save_vrsave;
++
++      //! \brief Padding included for breakpad compatibiltiy.
++      uint32_t save_pad6[7];
++  } vregs;
++};
++
+ }  // namespace crashpad
+ 
+ #endif  // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_H_
+diff --git third_party/crashpad/crashpad/minidump/minidump_context_writer.cc third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
+index d7e53a493..d89eb9e01 100644
+--- third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
++++ third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
+@@ -101,6 +101,13 @@ MinidumpContextWriter::CreateFromSnapshot(const CPUContext* context_snapshot) {
+       break;
+     }
+ 
++    case kCPUArchitecturePPC64: {
++      context = std::make_unique<MinidumpContextPPC64Writer>();
++      reinterpret_cast<MinidumpContextPPC64Writer*>(context.get())
++          ->InitalizeFromSnapshot(context_snapshot->ppc64);
++      break;
++    }
++
+     default: {
+       LOG(ERROR) << "unknown context architecture "
+                  << context_snapshot->architecture;
+@@ -453,4 +460,47 @@ size_t MinidumpContextMIPS64Writer::ContextSize() const {
+   return sizeof(context_);
+ }
+ 
++MinidumpContextPPC64Writer::MinidumpContextPPC64Writer()
++  : MinidumpContextWriter(), context_() {
++    context_.context_flags = kMinidumpContextPPC64;
++}
++
++MinidumpContextPPC64Writer::~MinidumpContextPPC64Writer() = default;
++
++void MinidumpContextPPC64Writer::InitalizeFromSnapshot(
++    const CPUContextPPC64* context_snapshot) {
++  DCHECK_EQ(state(), kStateMutable);
++  DCHECK_EQ(context_.context_flags, kMinidumpContextPPC64);
++
++  context_.context_flags = kMinidumpContextPPC64All;
++
++  memcpy(context_.regs, context_snapshot->regs, sizeof(context_.regs));
++  context_.nip = context_snapshot->nip;
++  context_.msr = context_snapshot->msr;
++  context_.ccr = context_snapshot->ccr;
++  context_.xer = context_snapshot->xer;
++  context_.lnk = context_snapshot->lnk;
++  context_.ctr = context_snapshot->ctr;
++
++  memcpy(context_.fpregs, context_snapshot->fpregs, sizeof(context_.fpregs));
++  context_.fpscr = context_snapshot->fpscr;
++
++  memcpy(context_.vregs.save_vr, context_snapshot->vregs.save_vr,
++         sizeof(context_.vregs.save_vr));
++  memcpy(&context_.vregs.save_vscr, &context_snapshot->vregs.save_vscr,
++         sizeof(context_.vregs.save_vscr));
++  context_.vregs.save_vrsave = context_snapshot->vregs.save_vrsave;
++}
++
++bool MinidumpContextPPC64Writer::WriteObject(
++    FileWriterInterface* file_writer) {
++  DCHECK_EQ(state(), kStateWritable);
++  return file_writer->Write(&context_, sizeof(context_));
++}
++
++size_t MinidumpContextPPC64Writer::ContextSize() const {
++  DCHECK_GE(state(), kStateFrozen);
++  return sizeof(context_);
++}
++
+ }  // namespace crashpad
+diff --git third_party/crashpad/crashpad/minidump/minidump_context_writer.h third_party/crashpad/crashpad/minidump/minidump_context_writer.h
+index d4ab936ee..1d22fc59c 100644
+--- third_party/crashpad/crashpad/minidump/minidump_context_writer.h
++++ third_party/crashpad/crashpad/minidump/minidump_context_writer.h
+@@ -315,6 +315,45 @@ class MinidumpContextMIPS64Writer final : public MinidumpContextWriter {
+   DISALLOW_COPY_AND_ASSIGN(MinidumpContextMIPS64Writer);
+ };
+ 
++class MinidumpContextPPC64Writer final : public MinidumpContextWriter {
++ public:
++  MinidumpContextPPC64Writer();
++  ~MinidumpContextPPC64Writer() override;
++
++  //! \brief Initalizes the MinidumpContextPPC64 based on \a context_snapshot.
++  //!
++  //! \param[in] context_snapshot The context snapshot to use as source data.
++  //!
++  //! \note Valid in #kStateMutable. No mutation of context() may be done before
++  //!     calling this method, and it is not normally necessary to alter
++  //!     context() after calling this method.
++  void InitalizeFromSnapshot(const CPUContextPPC64* context_snapshot);
++
++  //! \brief Returns a pointer to the context structure that this object will
++  //!     write.
++  //!
++  //! \attention This returns a non-`const` pointer to this object’s private
++  //!     data so that a caller can populate the context structure directly.
++  //!     This is done because providing setter interfaces to each field in the
++  //!     context structure would be unwieldy and cumbersome. Care must be taken
++  //!     to populate the context structure correctly. The context structure
++  //!     must only be modified while this object is in the #kStateMutable
++  //!     state.
++  MinidumpContextPPC64* context() { return &context_; }
++
++ protected:
++  // MinidumpWritable:
++  bool WriteObject(FileWriterInterface* file_writer) override;
++
++  // MinidumpContextWriter:
++  size_t ContextSize() const override;
++
++ private:
++  MinidumpContextPPC64 context_;
++
++  DISALLOW_COPY_AND_ASSIGN(MinidumpContextPPC64Writer);
++};
++
+ }  // namespace crashpad
+ 
+ #endif  // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_WRITER_H_
+diff --git third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
+index 3216a906b..a9fcbe9d8 100644
+--- third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
++++ third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
+@@ -213,6 +213,21 @@ TEST(MinidumpContextWriter, MIPS64_FromSnapshot) {
+       context, ExpectMinidumpContextMIPS64, kSeed);
+ }
+ 
++TEST(MinidumpContextWriter, PPC64_Zeros) {
++  EmptyContextTest<MinidumpContextPPC64Writer, MinidumpContextPPC64>(
++    ExpectMinidumpContextPPC64);
++}
++
++TEST(MinidumpContextWriter, PPC64_FromSnapshot) {
++  constexpr uint32_t kSeed = 64;
++  CPUContextPPC64 context_ppc64;
++  CPUContext context;
++  context.ppc64 = &context_ppc64;
++  InitializeCPUContextPPC64(&context, kSeed);
++  FromSnapshotTest<MinidumpContextPPC64Writer, MinidumpContextPPC64>(
++      context, ExpectMinidumpContextPPC64, kSeed);
++}
++
+ }  // namespace
+ }  // namespace test
+ }  // namespace crashpad
+diff --git third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
+index 0974e3ddf..b71ec5880 100644
+--- third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
++++ third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
+@@ -135,6 +135,8 @@ std::string MinidumpMiscInfoDebugBuildString() {
+   static constexpr char kCPU[] = "mips";
+ #elif defined(ARCH_CPU_MIPS64EL)
+   static constexpr char kCPU[] = "mips64";
++#elif defined(ARCH_CPU_PPC64)
++  static constexpr char kCPU[] = "ppc64";
+ #else
+ #error define kCPU for this CPU
+ #endif
+diff --git third_party/crashpad/crashpad/snapshot/capture_memory.cc third_party/crashpad/crashpad/snapshot/capture_memory.cc
+index 7a1b2763c..beda8da9e 100644
+--- third_party/crashpad/crashpad/snapshot/capture_memory.cc
++++ third_party/crashpad/crashpad/snapshot/capture_memory.cc
+@@ -112,6 +112,11 @@ void CaptureMemory::PointedToByContext(const CPUContext& context,
+   for (size_t i = 0; i < base::size(context.mipsel->regs); ++i) {
+     MaybeCaptureMemoryAround(delegate, context.mipsel->regs[i]);
+   }
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  MaybeCaptureMemoryAround(delegate, context.ppc64->nip);
++  for (size_t i = 0; i < base::size(context.ppc64->regs); ++i) {
++    MaybeCaptureMemoryAround(delegate, context.ppc64->regs[i]);
++  }
+ #else
+ #error Port.
+ #endif
+diff --git third_party/crashpad/crashpad/snapshot/cpu_architecture.h third_party/crashpad/crashpad/snapshot/cpu_architecture.h
+index 811a72095..f4f83981d 100644
+--- third_party/crashpad/crashpad/snapshot/cpu_architecture.h
++++ third_party/crashpad/crashpad/snapshot/cpu_architecture.h
+@@ -43,7 +43,10 @@ enum CPUArchitecture {
+   kCPUArchitectureMIPSEL,
+ 
+   //! \brief 64-bit MIPSEL.
+-  kCPUArchitectureMIPS64EL
++  kCPUArchitectureMIPS64EL,
++
++  //! \brief 64-bit PPC64.
++  kCPUArchitecturePPC64
+ };
+ 
+ }  // namespace crashpad
+diff --git third_party/crashpad/crashpad/snapshot/cpu_context.cc third_party/crashpad/crashpad/snapshot/cpu_context.cc
+index c75b5555e..aeade577a 100644
+--- third_party/crashpad/crashpad/snapshot/cpu_context.cc
++++ third_party/crashpad/crashpad/snapshot/cpu_context.cc
+@@ -169,6 +169,8 @@ uint64_t CPUContext::InstructionPointer() const {
+       return arm->pc;
+     case kCPUArchitectureARM64:
+       return arm64->pc;
++    case kCPUArchitecturePPC64:
++      return ppc64->nip;
+     default:
+       NOTREACHED();
+       return ~0ull;
+@@ -185,6 +187,8 @@ uint64_t CPUContext::StackPointer() const {
+       return arm->sp;
+     case kCPUArchitectureARM64:
+       return arm64->sp;
++    case kCPUArchitecturePPC64:
++      return ppc64->regs[1];
+     default:
+       NOTREACHED();
+       return ~0ull;
+@@ -196,6 +200,7 @@ bool CPUContext::Is64Bit() const {
+     case kCPUArchitectureX86_64:
+     case kCPUArchitectureARM64:
+     case kCPUArchitectureMIPS64EL:
++    case kCPUArchitecturePPC64:
+       return true;
+     case kCPUArchitectureX86:
+     case kCPUArchitectureARM:
+diff --git third_party/crashpad/crashpad/snapshot/cpu_context.h third_party/crashpad/crashpad/snapshot/cpu_context.h
+index fb23c4679..eebede63c 100644
+--- third_party/crashpad/crashpad/snapshot/cpu_context.h
++++ third_party/crashpad/crashpad/snapshot/cpu_context.h
+@@ -352,6 +352,24 @@ struct CPUContextMIPS64 {
+   uint64_t fir;
+ };
+ 
++//! \brief A context structure carrying PPC64 CPU state.
++struct CPUContextPPC64 {
++  uint64_t nip;
++  uint64_t msr;
++  uint64_t regs[32];
++  uint64_t ccr;
++  uint64_t xer;
++  uint64_t lnk;
++  uint64_t ctr;
++  double fpregs[32];
++  double fpscr;
++  struct {
++    uint128_struct save_vr[32];
++    uint128_struct save_vscr;
++    uint32_t save_vrsave;
++  } vregs;
++};
++
+ //! \brief A context structure capable of carrying the context of any supported
+ //!     CPU architecture.
+ struct CPUContext {
+@@ -382,6 +400,7 @@ struct CPUContext {
+     CPUContextARM64* arm64;
+     CPUContextMIPS* mipsel;
+     CPUContextMIPS64* mips64;
++    CPUContextPPC64* ppc64;
+   };
+ };
+ 
+diff --git third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
+index 9f46a4897..aa677c4eb 100644
+--- third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
++++ third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
+@@ -15,6 +15,7 @@
+ #ifndef CRASHPAD_SNAPSHOT_LINUX_CPU_CONTEXT_LINUX_H_
+ #define CRASHPAD_SNAPSHOT_LINUX_CPU_CONTEXT_LINUX_H_
+ 
++#include <cstring>
+ #include "build/build_config.h"
+ #include "snapshot/cpu_context.h"
+ #include "snapshot/linux/signal_context.h"
+@@ -174,6 +175,78 @@ void InitializeCPUContextMIPS(
+ 
+ #endif  // ARCH_CPU_MIPS_FAMILY || DOXYGEN
+ 
++#if defined(ARCH_CPU_PPC64_FAMILY) || DOXYGEN
++
++//! \brief Initalizes a CPUContextPPC64 structure from native context
++//!     structures on Linux.
++//!
++//! \param[in] thread_context The native thread context.
++//! \param[in] float_context The native float context.
++//! \param[in] vector_context The native vector context.
++//! \param[out] context The CPUContextPPC64 structure to initalize.
++template <typename Traits>
++void InitializeCPUContextPPC64(
++    const ThreadContext::t64_t& thread_context,
++    const FloatContext::f64_t& float_context,
++    const VectorContext::v64_t& vector_context,
++    typename Traits::CPUContext* context) {
++
++  memcpy(context->regs, thread_context.gpr, sizeof(context->regs));
++  context->nip = thread_context.nip;
++  context->msr = thread_context.msr;
++  context->ccr = thread_context.ccr;
++  context->xer = thread_context.xer;
++  context->lnk = thread_context.lnk;
++  context->ctr = thread_context.ctr;
++
++  memcpy(context->fpregs, float_context.fpregs, sizeof(context->fpregs));
++  context->fpscr = float_context.fpscr;
++
++  for (uint8_t i = 0; i < 32; i++) {
++    context->vregs.save_vr[i] = {
++      (((uint64_t)vector_context.vrregs[i][0]) << 32) |
++        vector_context.vrregs[i][1],
++      (((uint64_t)vector_context.vrregs[i][2]) << 32) |
++        vector_context.vrregs[i][3]
++    };
++  }
++  context->vregs.save_vrsave = vector_context.vrsave;
++  context->vregs.save_vscr = {0, (uint64_t)vector_context.vscr.vscr_word};
++}
++
++template <typename Traits>
++void InitializeCPUContextPPC64(
++    const SignalThreadContext64 &thread_context,
++    const SignalFloatContext64 &float_context,
++    const SignalVectorContext64 &vector_context,
++    typename Traits::CPUContext* context) {
++
++  memcpy(context->regs, thread_context.regs, sizeof(context->regs));
++  context->nip = thread_context.nip;
++  context->msr = thread_context.msr;
++  context->ccr = thread_context.ccr;
++  context->xer = thread_context.xer;
++  context->lnk = thread_context.lnk;
++  context->ctr = thread_context.ctr;
++
++  memcpy(context->fpregs, float_context.regs, sizeof(context->fpregs));
++  context->fpscr = float_context.fpscr;
++
++  for (uint8_t i = 0; i < 32; i++) {
++    context->vregs.save_vr[i] = {
++      (((uint64_t)vector_context.vrregs[i][0]) << 32) |
++        vector_context.vrregs[i][1],
++      (((uint64_t)vector_context.vrregs[i][2]) << 32) |
++        vector_context.vrregs[i][3]
++    };
++  }
++  context->vregs.save_vrsave = vector_context.vrsave;
++  context->vregs.save_vscr = {0, (uint64_t)vector_context.vscr.vscr_word};
++}
++
++
++#endif
++
+ }  // namespace internal
+ }  // namespace crashpad
+ 
+diff --git third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
+index d32bd1937..2dd538c2b 100644
+--- third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
++++ third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
+@@ -192,6 +192,8 @@ void TestAgainstTarget(PtraceConnection* connection) {
+               device == 0 && inode == 0 && mapping_name == "[vdso]";
+ #if defined(ARCH_CPU_X86)
+           static constexpr char kPrefix[] = "linux-gate.so.";
++#elif defined(ARCH_CPU_PPC64)
++          static constexpr char kPrefix[] = "linux-vdso64.so.";
+ #else
+           static constexpr char kPrefix[] = "linux-vdso.so.";
+ #endif
+diff --git third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
+index cd40b3b12..6bcf23b6f 100644
+--- third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
++++ third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
+@@ -323,6 +323,69 @@ bool ExceptionSnapshotLinux::ReadContext<ContextTraits64>(
+       reader, context_address, context_.mips64);
+ }
+ 
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++
++template <typename Traits>
++static bool ReadContext(ProcessReaderLinux* reader,
++                        LinuxVMAddress context_address,
++                        typename Traits::CPUContext* dest_context) {
++  const ProcessMemory* memory = reader->Memory();
++
++  LinuxVMAddress gp_regs_address = context_address +
++                                   offsetof(UContext, mcontext) +
++                                   offsetof(typename Traits::MContext, gp_regs);
++
++  typename Traits::SignalThreadContext thread_context;
++  if (!memory->Read(gp_regs_address, sizeof(thread_context), &thread_context)) {
++    LOG(ERROR) << "Couldn't read gp_regs!";
++    return false;
++  }
++
++  LinuxVMAddress fp_regs_address = context_address +
++                                   offsetof(UContext, mcontext) +
++                                   offsetof(typename Traits::MContext, fp_regs);
++
++  typename Traits::SignalFloatContext fp_context;
++  if (!memory->Read(fp_regs_address, sizeof(fp_context), &fp_context)) {
++    LOG(ERROR) << "Couldn't read fp_regs!";
++    return false;
++  }
++
++  LinuxVMAddress v_regs_ptr_address = context_address +
++                                  offsetof(UContext, mcontext) +
++                                  offsetof(typename Traits::MContext, vmx_reserve) + 8;
++
++  typename Traits::SignalVectorContext v_context;
++  if (!memory->Read(v_regs_ptr_address, sizeof(v_context), &v_context)) {
++    LOG(ERROR) << "Couldn't read v_regs!";
++    return false;
++  }
++
++  InitializeCPUContextPPC64<ContextTraits64>(thread_context, fp_context,
++                            v_context, dest_context);
++
++  return true;
++}
++
++template<>
++bool ExceptionSnapshotLinux::ReadContext<ContextTraits64>(
++    ProcessReaderLinux* reader,
++    LinuxVMAddress context_address) {
++  context_.architecture = kCPUArchitecturePPC64;
++  context_.ppc64 = &context_union_.ppc64;
++
++  return internal::ReadContext<ContextTraits64>(
++      reader, context_address, context_.ppc64);
++}
++
++template<>
++bool ExceptionSnapshotLinux::ReadContext<ContextTraits32>(
++    ProcessReaderLinux* reader,
++    LinuxVMAddress context_address) {
++  // PPC64 is 64-bit
++  return false;
++}
++
+ #endif  // ARCH_CPU_X86_FAMILY
+ 
+ bool ExceptionSnapshotLinux::Initialize(ProcessReaderLinux* process_reader,
+diff --git third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
+index ea0cd2106..e42df520f 100644
+--- third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
++++ third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
+@@ -84,6 +84,8 @@ class ExceptionSnapshotLinux final : public ExceptionSnapshot {
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+     CPUContextMIPS mipsel;
+     CPUContextMIPS64 mips64;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    CPUContextPPC64 ppc64;
+ #endif
+   } context_union_;
+   CPUContext context_;
+diff --git third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
+index c17170b43..b6a714cc6 100644
+--- third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
++++ third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
+@@ -296,7 +296,28 @@ void ExpectContext(const CPUContext& actual, const NativeCPUContext& expected) {
+             0);
+ #undef CPU_ARCH_NAME
+ }
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++using NativeCPUContext = ucontext_t;
++
++void InitializeContext(NativeCPUContext* context) {
++  for (size_t reg = 0; reg < 32; ++reg) {
++    context->uc_mcontext.gp_regs[reg] = reg;
++  }
++
++  memset(&context->uc_mcontext.fp_regs, 44,
++      sizeof(context->uc_mcontext.fp_regs));
++}
+ 
++void ExpectContext(const CPUContext& actual, const NativeCPUContext& expected) {
++  EXPECT_EQ(actual.architecture, kCPUArchitecturePPC64);
++
++  for (size_t reg = 0; reg < 32; ++reg) {
++    EXPECT_EQ(actual.ppc64->regs[reg], expected.uc_mcontext.gp_regs[reg]);
++  }
++
++  EXPECT_EQ(memcmp(actual.ppc64->fpregs, expected.uc_mcontext.fp_regs,
++            sizeof(actual.ppc64->fpregs)), 0);
++}
+ #else
+ #error Port.
+ #endif
+diff --git third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
+index ee246e8bc..9555dce04 100644
+--- third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
++++ third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
+@@ -108,6 +108,8 @@ void ProcessReaderLinux::Thread::InitializeStack(ProcessReaderLinux* reader) {
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   stack_pointer = reader->Is64Bit() ? thread_info.thread_context.t64.regs[29]
+                                     : thread_info.thread_context.t32.regs[29];
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  stack_pointer = thread_info.thread_context.t64.gpr[1];
+ #else
+ #error Port.
+ #endif
+diff --git third_party/crashpad/crashpad/snapshot/linux/signal_context.h third_party/crashpad/crashpad/snapshot/linux/signal_context.h
+index 110024680..a1f2da259 100644
+--- third_party/crashpad/crashpad/snapshot/linux/signal_context.h
++++ third_party/crashpad/crashpad/snapshot/linux/signal_context.h
+@@ -422,6 +422,89 @@ static_assert(offsetof(UContext<ContextTraits64>, mcontext.fpregs) ==
+               "context offset mismatch");
+ #endif
+ 
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++
++struct SignalThreadContext64 {
++  uint64_t regs[32];
++  uint64_t nip;
++  uint64_t msr;
++  uint64_t orig_r3;
++  uint64_t ctr;
++  uint64_t lnk;
++  uint64_t xer;
++  uint64_t ccr;
++  uint64_t softe;
++  uint64_t trap;
++  uint64_t dar;
++  uint64_t dsisr;
++  uint64_t result;
++  uint64_t dscr;
++  uint64_t fpr0[3];
++};
++
++struct SignalFloatContext64 {
++  double regs[32];
++  double fpscr;
++};
++
++struct SignalVectorContext64 {
++  int32_t vrregs[32][4];
++  struct {
++    int32_t __pad[3];
++    int32_t vscr_word;
++  } vscr;
++  int32_t vrsave;
++  int32_t __pad[3];
++} __attribute__((__aligned__(16)));
++
++
++#pragma pack(pop)
++struct MContext64 {
++  uint64_t reserved[4];
++  int32_t signal;
++  int32_t __pad0;
++  uint64_t handler;
++  uint64_t oldmask;
++  uint64_t pt_regs_ptr;
++  SignalThreadContext64 gp_regs;
++  SignalFloatContext64  fp_regs;
++  SignalVectorContext64 *v_regs;
++  int64_t vmx_reserve[69];
++};
++
++struct ContextTraits64 : public Traits64 {
++  using MContext = MContext64;
++  using SignalThreadContext = SignalThreadContext64;
++  using SignalFloatContext = SignalFloatContext64;
++  using SignalVectorContext = SignalVectorContext64;
++  using CPUContext = CPUContextPPC64;
++};
++
++struct ContextTraits32 : public Traits32 {};
++
++struct UContext {
++  uint64_t flags;
++  uint64_t link;
++  SignalStack<ContextTraits64> stack;
++  Sigset<ContextTraits64> sigmask;
++  MContext64 mcontext;
++};
++#pragma pack(push, 1)
++
++static_assert(sizeof(UContext) == sizeof(ucontext_t),
++              "ucontext_t size mismatch");
++static_assert(sizeof(MContext64) == sizeof(mcontext_t),
++              "mcontext_t size mismatch");
++static_assert(sizeof(SignalThreadContext64) == sizeof(gregset_t),
++              "gregset_t size mismatch");
++static_assert(sizeof(SignalFloatContext64) == sizeof(fpregset_t),
++              "fpregset_t size mismatch");
++static_assert(sizeof(SignalVectorContext64) == sizeof(vrregset_t),
++              "vrregset_t size mismatch");
++static_assert(offsetof(UContext, mcontext) ==
++              offsetof(ucontext_t, uc_mcontext), "mcontext offset mismatch");
++static_assert(offsetof(MContext64, gp_regs) ==
++              offsetof(mcontext_t, gp_regs), "gp_regs offset mismatch");
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+diff --git third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
+index a99da3e4b..03b973083 100644
+--- third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
++++ third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
+@@ -204,6 +204,8 @@ CPUArchitecture SystemSnapshotLinux::GetCPUArchitecture() const {
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   return process_reader_->Is64Bit() ? kCPUArchitectureMIPS64EL
+                                     : kCPUArchitectureMIPSEL;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  return kCPUArchitecturePPC64;
+ #else
+ #error port to your architecture
+ #endif
+@@ -219,6 +221,9 @@ uint32_t SystemSnapshotLinux::CPURevision() const {
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   // Not implementable on MIPS
+   return 0;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  // Not yet implemented on PPC64
++  return 0;
+ #else
+ #error port to your architecture
+ #endif
+@@ -239,6 +244,9 @@ std::string SystemSnapshotLinux::CPUVendor() const {
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   // Not implementable on MIPS
+   return std::string();
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  // Not yet implemented on PPC64
++  return std::string();
+ #else
+ #error port to your architecture
+ #endif
+@@ -372,6 +380,9 @@ bool SystemSnapshotLinux::NXEnabled() const {
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   // Not implementable on MIPS
+   return false;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  // Not yet implemented on PPC64
++  return false;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+diff --git third_party/crashpad/crashpad/snapshot/linux/test_modules.cc third_party/crashpad/crashpad/snapshot/linux/test_modules.cc
+index b2450c206..7ba78b2ae 100644
+--- third_party/crashpad/crashpad/snapshot/linux/test_modules.cc
++++ third_party/crashpad/crashpad/snapshot/linux/test_modules.cc
+@@ -110,6 +110,8 @@ bool WriteTestModule(const base::FilePath& module_path,
+   module.ehdr.e_machine = EM_AARCH64;
+ #elif defined(ARCH_CPU_MIPSEL) || defined(ARCH_CPU_MIPS64EL)
+   module.ehdr.e_machine = EM_MIPS;
++#elif defined(ARCH_CPU_PPC64)
++  module.ehdr.e_machine = EM_PPC64;
+ #endif
+ 
+   module.ehdr.e_version = EV_CURRENT;
+diff --git third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
+index e3e2bebdd..8ef43752e 100644
+--- third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
++++ third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
+@@ -186,6 +186,14 @@ bool ThreadSnapshotLinux::Initialize(ProcessReaderLinux* process_reader,
+         thread.thread_info.float_context.f32,
+         context_.mipsel);
+   }
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  context_.architecture = kCPUArchitecturePPC64;
++  context_.ppc64 = &context_union_.ppc64;
++  InitializeCPUContextPPC64<ContextTraits64>(
++      thread.thread_info.thread_context.t64,
++      thread.thread_info.float_context.f64,
++      thread.thread_info.vector_context.v64,
++      context_.ppc64);
+ #else
+ #error Port.
+ #endif
+diff --git third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
+index 44cc6f6d9..d4136461e 100644
+--- third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
++++ third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
+@@ -68,6 +68,8 @@ class ThreadSnapshotLinux final : public ThreadSnapshot {
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+     CPUContextMIPS mipsel;
+     CPUContextMIPS64 mips64;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    CPUContextPPC64 ppc64;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+diff --git third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
+index d3d5ebdfb..3fd730cb5 100644
+--- third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
++++ third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
+@@ -56,6 +56,11 @@ bool AuxiliaryVector::Read(PtraceConnection* connection) {
+     if (type == AT_IGNORE) {
+       continue;
+     }
++#if defined(ARCH_CPU_PPC64_FAMILY)
++    if (type == AT_IGNOREPPC) {
++      continue;
++    }
++#endif
+     if (!MapInsertOrReplace(&values_, type, value, nullptr)) {
+       LOG(ERROR) << "duplicate auxv entry";
+       return false;
+diff --git third_party/crashpad/crashpad/util/linux/ptracer.cc third_party/crashpad/crashpad/util/linux/ptracer.cc
+index 557e0d363..08ae434b8 100644
+--- third_party/crashpad/crashpad/util/linux/ptracer.cc
++++ third_party/crashpad/crashpad/util/linux/ptracer.cc
+@@ -398,6 +398,64 @@ bool GetThreadArea64(pid_t tid,
+   return true;
+ }
+ 
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++// PPC64 has had HAVE_ARCH_TRACEHOOK set since 2.6.27 (even before x86 had it).
++// That means we can simply use PTRACE_GETREGESET.
++
++template <typename Destination>
++bool GetRegisterSet(pid_t tid, int set, Destination* dest, bool can_log) {
++  iovec iov;
++  iov.iov_base = reinterpret_cast<void*>(dest);
++  iov.iov_len = sizeof(*dest);
++  if (ptrace(PTRACE_GETREGSET, tid, reinterpret_cast<void*>(set), &iov) != 0) {
++    PLOG_IF(ERROR, can_log) << "ptrace";
++    return false;
++  }
++  if (iov.iov_len != sizeof(*dest)) {
++    LOG_IF(ERROR, can_log) << "Unexpected registers size";
++    return false;
++  }
++  return true;
++}
++
++bool GetVectorRegisters64(pid_t tid,
++                          VectorContext* context,
++                          bool can_log) {
++  return GetRegisterSet(tid, NT_PPC_VMX, &context->v64, can_log);
++}
++
++bool GetFloatingPointRegisters64(pid_t tid,
++                                 FloatContext* context,
++                                 bool can_log) {
++  return GetRegisterSet(tid, NT_PRFPREG, &context->f64, can_log);
++}
++
++bool GetThreadArea64(pid_t tid,
++                     const ThreadContext& context,
++                     LinuxVMAddress* address,
++                     bool can_log) {
++  // PPC64 doesn't have PTRACE_GET_THREAD_AREA since the thread pointer
++  // is stored in GPR 13.
++  ThreadContext::t64_t tc;
++  if (!GetRegisterSet(tid, NT_PRSTATUS, &tc, can_log)) {
++    LOG_IF(ERROR, can_log) << "Unable to get thread pointer!";
++    return false;
++  }
++
++  *address = tc.gpr[13];
++
++  return true;
++}
++
++// Stubs for 32-bit functions not applicable on PPC64
++bool GetFloatingPointRegisters32(pid_t tid,
++                                 FloatContext* context,
++                                 bool can_log) { return false; }
++bool GetThreadArea32(pid_t tid,
++                     const ThreadContext &context,
++                     LinuxVMAddress *address,
++                     bool can_log) { return false; }
++
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -494,6 +552,9 @@ bool Ptracer::GetThreadInfo(pid_t tid, ThreadInfo* info) {
+   if (is_64_bit_) {
+     return GetGeneralPurposeRegisters64(tid, &info->thread_context, can_log_) &&
+            GetFloatingPointRegisters64(tid, &info->float_context, can_log_) &&
++#if defined(ARCH_CPU_PPC64_FAMILY)
++           GetVectorRegisters64(tid, &info->vector_context, can_log_) &&
++#endif
+            GetThreadArea64(tid,
+                            info->thread_context,
+                            &info->thread_specific_data_address,
+diff --git third_party/crashpad/crashpad/util/linux/thread_info.h third_party/crashpad/crashpad/util/linux/thread_info.h
+index 5b55c24a7..dea0d1f39 100644
+--- third_party/crashpad/crashpad/util/linux/thread_info.h
++++ third_party/crashpad/crashpad/util/linux/thread_info.h
+@@ -28,6 +28,10 @@
+ #include <android/api-level.h>
+ #endif
+ 
++#if defined(ARCH_CPU_PPC64_FAMILY)
++#include <sys/ucontext.h>
++#endif
++
+ namespace crashpad {
+ 
+ //! \brief The set of general purpose registers for an architecture family.
+@@ -79,6 +83,8 @@ union ThreadContext {
+     uint32_t cp0_status;
+     uint32_t cp0_cause;
+     uint32_t padding1_;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // PPC64 is 64-bit
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -132,6 +138,21 @@ union ThreadContext {
+     uint64_t cp0_badvaddr;
+     uint64_t cp0_status;
+     uint64_t cp0_cause;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // Reflects struct pt_regs in asm/ptrace.h.
++    uint64_t gpr[32];
++    uint64_t nip;
++    uint64_t msr;
++    uint64_t orig_gpr3;
++    uint64_t ctr;
++    uint64_t lnk;
++    uint64_t xer;
++    uint64_t ccr;
++    uint64_t softe;
++    uint64_t trap;
++    uint64_t dar;
++    uint64_t dsisr;
++    uint64_t result;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -143,6 +164,8 @@ union ThreadContext {
+   using NativeThreadContext = user_regs;
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+ // No appropriate NativeThreadsContext type available for MIPS
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  using NativeThreadContext = struct pt_regs;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY || ARCH_CPU_ARM64
+@@ -218,6 +241,9 @@ union FloatContext {
+     } fpregs[32];
+     uint32_t fpcsr;
+     uint32_t fpu_id;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // Crashpad's PPC support is 64-bit only, so this
++    // 32bit-only struct is declared as empty.
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -252,6 +278,10 @@ union FloatContext {
+     double fpregs[32];
+     uint32_t fpcsr;
+     uint32_t fpu_id;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++    // Reflects fpregset_t in sys/ucontext.h
++    double fpregs[32];
++    double fpscr;
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86_FAMILY
+@@ -280,6 +310,8 @@ union FloatContext {
+   static_assert(sizeof(f64) == sizeof(user_fpsimd_struct), "Size mismatch");
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+ // No appropriate floating point context native type for available MIPS.
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  static_assert(sizeof(f64) == sizeof(fpregset_t), "Size mismatch");
+ #else
+ #error Port.
+ #endif  // ARCH_CPU_X86
+@@ -287,6 +319,26 @@ union FloatContext {
+ static_assert(std::is_standard_layout<FloatContext>::value,
+               "Not standard layout");
+ 
++//! \brief The vector registers used for an architecture family
++union VectorContext {
++  struct v32_t {} v32;
++#if defined(ARCH_CPU_PPC64_FAMILY)
++  __attribute__((__aligned__(16))) // Vector context must be doubleword aligned.
++#endif
++  struct v64_t {
++#if defined(ARCH_CPU_PPC64_FAMILY)
++    // Reflects vrregset_t in sys/ucontext.h
++    uint32_t vrregs[32][4];
++    struct {
++      uint32_t __pad[3];
++      uint32_t vscr_word;
++    } vscr;
++    uint32_t vrsave;
++    uint32_t __pad[3];
++#endif
++  } v64;
++};
++
+ //! \brief A collection of `ptrace`-able information about a thread.
+ struct ThreadInfo {
+   ThreadInfo();
+@@ -298,6 +350,9 @@ struct ThreadInfo {
+   //! \brief The floating point registers for the thread.
+   FloatContext float_context;
+ 
++  //! \brief (Optional) The vector registers used for the thread.
++  VectorContext vector_context;
++
+   //! \brief The thread-local storage address for the thread.
+   LinuxVMAddress thread_specific_data_address;
+ };
+diff --git third_party/crashpad/crashpad/util/misc/capture_context.h third_party/crashpad/crashpad/util/misc/capture_context.h
+index d21a24f19..acc325349 100644
+--- third_party/crashpad/crashpad/util/misc/capture_context.h
++++ third_party/crashpad/crashpad/util/misc/capture_context.h
+@@ -69,6 +69,7 @@ using NativeCPUContext = ucontext_t;
+ //!     macOS/Linux/Fuchsia | x86_64       | `%%rdi`
+ //!     Linux               | ARM/ARM64    | `r0`/`x0`
+ //!     Linux               | MIPS/MIPS64  | `$a0`
++//!     Linux               | PPC64        | `r3`
+ //!
+ //!     Additionally, the value `LR` on ARM/ARM64 will be the return address of
+ //!     this function.
+diff --git third_party/crashpad/crashpad/util/misc/capture_context_linux.S third_party/crashpad/crashpad/util/misc/capture_context_linux.S
+index 52215ee5d..b3e4a3ec7 100644
+--- third_party/crashpad/crashpad/util/misc/capture_context_linux.S
++++ third_party/crashpad/crashpad/util/misc/capture_context_linux.S
+@@ -32,7 +32,7 @@
+   .balign 4, 0x0
+   .type CAPTURECONTEXT_SYMBOL, %function
+   .type CAPTURECONTEXT_SYMBOL2, %function
+-#elif defined(__mips__)
++#elif defined(__mips__) || defined(__powerpc64__)
+   .balign 4, 0x0
+ #endif
+ 
+@@ -423,4 +423,214 @@ CAPTURECONTEXT_SYMBOL2:
+   jr $ra
+ 
+   .set at
++#elif defined(__powerpc64__)
++  // Store r0-r31
++  std 0, 0xe8(3)   // context->uc_mcontext.gp_regs[0]
++  std 1, 0xf0(3)   // context->uc_mcontext.gp_regs[1]
++  std 2, 0xf8(3)   // context->uc_mcontext.gp_regs[2]
++  // note that r3's original value was lost
++  std 3, 0x100(3)  // context->uc_mcontext.gp_regs[3]
++  std 4, 0x108(3)  // context->uc_mcontext.gp_regs[4]
++  std 5, 0x110(3)  // context->uc_mcontext.gp_regs[5]
++  std 6, 0x118(3)  // context->uc_mcontext.gp_regs[6]
++  std 7, 0x120(3)  // context->uc_mcontext.gp_regs[7]
++  std 8, 0x128(3)  // context->uc_mcontext.gp_regs[8]
++  std 9, 0x130(3)  // context->uc_mcontext.gp_regs[9]
++  std 10, 0x138(3) // context->uc_mcontext.gp_regs[10]
++  std 11, 0x140(3) // context->uc_mcontext.gp_regs[11]
++  std 12, 0x148(3) // context->uc_mcontext.gp_regs[12]
++  std 13, 0x150(3) // context->uc_mcontext.gp_regs[13]
++  std 14, 0x158(3) // context->uc_mcontext.gp_regs[14]
++  std 15, 0x160(3) // context->uc_mcontext.gp_regs[15]
++  std 16, 0x168(3) // context->uc_mcontext.gp_regs[16]
++  std 17, 0x170(3) // context->uc_mcontext.gp_regs[17]
++  std 18, 0x178(3) // context->uc_mcontext.gp_regs[18]
++  std 19, 0x180(3) // context->uc_mcontext.gp_regs[19]
++  std 20, 0x188(3) // context->uc_mcontext.gp_regs[20]
++  std 21, 0x190(3) // context->uc_mcontext.gp_regs[21]
++  std 22, 0x198(3) // context->uc_mcontext.gp_regs[22]
++  std 23, 0x1a0(3) // context->uc_mcontext.gp_regs[23]
++  std 24, 0x1a8(3) // context->uc_mcontext.gp_regs[24]
++  std 25, 0x1b0(3) // context->uc_mcontext.gp_regs[25]
++  std 26, 0x1b8(3) // context->uc_mcontext.gp_regs[26]
++  std 27, 0x1c0(3) // context->uc_mcontext.gp_regs[27]
++  std 28, 0x1c8(3) // context->uc_mcontext.gp_regs[28]
++  std 29, 0x1d0(3) // context->uc_mcontext.gp_regs[29]
++  std 30, 0x1d8(3) // context->uc_mcontext.gp_regs[30]
++  std 31, 0x1e0(3) // context->uc_mcontext.gp_regs[31]
++
++  // For NIP, we can use the value in the link register
++  mflr 0
++  std 0, 0x1e8(3) // context->uc_mcontext.gp_regs[PT_NIP]
++
++  // CTR
++  mfctr 0
++  std 0, 0x200(3) // context->uc_mcontext.gp_regs[PT_CTR]
++
++  // For LNK, we'll use the caller's LR save area (2 stack frames up).
++  // r4 can be used as a scratch register since it has already been saved.
++  ld 4, 0(1)
++  ld 4, 16(4)
++  std 4, 0x208(3) // context->uc_mcontext.gp_regs[PT_LNK]
++
++  // XER
++  mfxer 0
++  std 0, 0x210(3) // context->uc_mcontext.gp_regs[PT_XER]
++
++  // CCR
++  mfcr 0
++  std 0, 0x218(3) // context->uc_mcontext.gp_regs[PT_CCR]
++
++  // MSR, orig_r3, MQ, TRAP, DAR, DSISR, RESULT, DSCR,
++  // not used or not relevant,  zero them out.
++  li 4, 0
++  std 4, 0x1f0(3) // context->uc_mcontext.gp_regs[PT_MSR]
++  std 4, 0x1f8(3) // context->uc_mcontext.gp_regs[PT_ORIG_R3]
++  std 4, 0x220(3) // context->uc_mcontext.gp_regs[PT_MQ]
++  std 4, 0x228(3) // context->uc_mcontext.gp_regs[PT_TRAP]
++  std 4, 0x230(3) // context->uc_mcontext.gp_regs[PT_DAR]
++  std 4, 0x238(3) // context->uc_mcontext.gp_regs[PT_DSISR]
++  std 4, 0x240(3) // context->uc_mcontext.gp_regs[PT_RESULT]
++  std 4, 0x248(3) // context->uc_mcontext.gp_regs[PT_DSCR]
++
++  // Update context->uc_mcontext.regs to point to gp_regs
++  addi 0, 3, 0xe8
++  std 0, 0xe0(3)
++
++  // Save floating point registers 0-31
++  stfd 0, 0x268(3)  // context->uc_mcontext.fp_regs[0]
++  stfd 1, 0x270(3)  // context->uc_mcontext.fp_regs[1]
++  stfd 2, 0x278(3)  // context->uc_mcontext.fp_regs[2]
++  stfd 3, 0x280(3)  // context->uc_mcontext.fp_regs[3]
++  stfd 4, 0x288(3)  // context->uc_mcontext.fp_regs[4]
++  stfd 5, 0x290(3)  // context->uc_mcontext.fp_regs[5]
++  stfd 6, 0x298(3)  // context->uc_mcontext.fp_regs[6]
++  stfd 7, 0x2a0(3)  // context->uc_mcontext.fp_regs[7]
++  stfd 8, 0x2a8(3)  // context->uc_mcontext.fp_regs[8]
++  stfd 9, 0x2b0(3)  // context->uc_mcontext.fp_regs[9]
++  stfd 10, 0x2b8(3) // context->uc_mcontext.fp_regs[10]
++  stfd 11, 0x2c0(3) // context->uc_mcontext.fp_regs[11]
++  stfd 12, 0x2c8(3) // context->uc_mcontext.fp_regs[12]
++  stfd 13, 0x2d0(3) // context->uc_mcontext.fp_regs[13]
++  stfd 14, 0x2d8(3) // context->uc_mcontext.fp_regs[14]
++  stfd 15, 0x2e0(3) // context->uc_mcontext.fp_regs[15]
++  stfd 16, 0x2e8(3) // context->uc_mcontext.fp_regs[16]
++  stfd 17, 0x2f0(3) // context->uc_mcontext.fp_regs[17]
++  stfd 18, 0x2f8(3) // context->uc_mcontext.fp_regs[18]
++  stfd 19, 0x300(3) // context->uc_mcontext.fp_regs[19]
++  stfd 20, 0x308(3) // context->uc_mcontext.fp_regs[20]
++  stfd 21, 0x310(3) // context->uc_mcontext.fp_regs[21]
++  stfd 22, 0x318(3) // context->uc_mcontext.fp_regs[22]
++  stfd 23, 0x320(3) // context->uc_mcontext.fp_regs[23]
++  stfd 24, 0x328(3) // context->uc_mcontext.fp_regs[24]
++  stfd 25, 0x330(3) // context->uc_mcontext.fp_regs[25]
++  stfd 26, 0x338(3) // context->uc_mcontext.fp_regs[26]
++  stfd 27, 0x340(3) // context->uc_mcontext.fp_regs[27]
++  stfd 28, 0x348(3) // context->uc_mcontext.fp_regs[28]
++  stfd 29, 0x350(3) // context->uc_mcontext.fp_regs[29]
++  stfd 30, 0x358(3) // context->uc_mcontext.fp_regs[30]
++  stfd 31, 0x360(3) // context->uc_mcontext.fp_regs[31]
++
++  // FPSCR
++  mffs 0
++  stfd 0, 0x368(3) // context->uc_mcontext.fp_regs[32]
++
++  // Save VMX Vector registers
++  // Update r4 to contain the base address of vmx_reserve
++  addi 4, 3, 0x378
++  // Ensure that it is quadword aligned
++  andi. 5, 4, 0xF
++  beq 1f // No alignment is necessary
++  // Address is doubleword aligned and not quadword aligned, add 8
++  addi 4, 4, 8
++
++1:
++  // Store VMX registers 0-31
++  // r4 will contain the base address
++  // r5 will contain the index
++  li 5, 0
++  stvx 0, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 0]
++  addi 5, 5, 16
++  stvx 1, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 1]
++  addi 5, 5, 16
++  stvx 2, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 2]
++  addi 5, 5, 16
++  stvx 3, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 3]
++  addi 5, 5, 16
++  stvx 4, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 4]
++  addi 5, 5, 16
++  stvx 5, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 5]
++  addi 5, 5, 16
++  stvx 6, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 6]
++  addi 5, 5, 16
++  stvx 7, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 7]
++  addi 5, 5, 16
++  stvx 8, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 8]
++  addi 5, 5, 16
++  stvx 9, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 9]
++  addi 5, 5, 16
++  stvx 10, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 10]
++  addi 5, 5, 16
++  stvx 11, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 11]
++  addi 5, 5, 16
++  stvx 12, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 12]
++  addi 5, 5, 16
++  stvx 13, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 13]
++  addi 5, 5, 16
++  stvx 14, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 14]
++  addi 5, 5, 16
++  stvx 15, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 15]
++  addi 5, 5, 16
++  stvx 16, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 16]
++  addi 5, 5, 16
++  stvx 17, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 17]
++  addi 5, 5, 16
++  stvx 18, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 18]
++  addi 5, 5, 16
++  stvx 19, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 19]
++  addi 5, 5, 16
++  stvx 20, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 20]
++  addi 5, 5, 16
++  stvx 21, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 21]
++  addi 5, 5, 16
++  stvx 22, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 22]
++  addi 5, 5, 16
++  stvx 23, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 23]
++  addi 5, 5, 16
++  stvx 24, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 24]
++  addi 5, 5, 16
++  stvx 25, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 25]
++  addi 5, 5, 16
++  stvx 26, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 26]
++  addi 5, 5, 16
++  stvx 27, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 27]
++  addi 5, 5, 16
++  stvx 28, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 28]
++  addi 5, 5, 16
++  stvx 29, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 29]
++  addi 5, 5, 16
++  stvx 30, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 30]
++  addi 5, 5, 16
++  stvx 31, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 31]
++  addi 5, 5, 16
++
++  // VSCR
++  mfvscr 0
++  stvx 0, 4, 5
++  addi 5, 5, 16
++
++  // VRSAVE
++  mfvrsave 0
++  stwx 0, 4, 5
++
++  // Update context->uc_mcontext.v_regs to point to vmx_reserve + alignment.
++  std 4, 0x370(3)
++
++  // Zero out all unused fields
++  li 4, 0
++  std 4, 0xc8(3) // context->uc_mcontext.signal
++  std 4, 0xd0(3) // context->uc_mcontext.handler
++  std 4, 0xd8(3) // context->uc_mcontext.oldmask
++
++  blr
+ #endif  // __i386__
+diff --git third_party/crashpad/crashpad/util/misc/capture_context_test.cc third_party/crashpad/crashpad/util/misc/capture_context_test.cc
+index cf23c2def..5f264bc92 100644
+--- third_party/crashpad/crashpad/util/misc/capture_context_test.cc
++++ third_party/crashpad/crashpad/util/misc/capture_context_test.cc
+@@ -57,7 +57,7 @@ void TestCaptureContext() {
+   uintptr_t pc = ProgramCounterFromContext(context_1);
+ 
+ #if !defined(ADDRESS_SANITIZER) && !defined(ARCH_CPU_MIPS_FAMILY) && \
+-    !defined(MEMORY_SANITIZER)
++    !defined(MEMORY_SANITIZER) && !defined(ARCH_CPU_PPC64_FAMILY)
+   // Sanitizers can cause enough code bloat that the “nearby” check would
+   // likely fail.
+   const uintptr_t kReferencePC =
+diff --git third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
+index 30a2ab21d..60509f21d 100644
+--- third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
++++ third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
+@@ -35,6 +35,8 @@ void SanityCheckContext(const NativeCPUContext& context) {
+   EXPECT_EQ(context.uc_mcontext.regs[0], FromPointerCast<uintptr_t>(&context));
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   EXPECT_EQ(context.uc_mcontext.gregs[4], FromPointerCast<uintptr_t>(&context));
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  EXPECT_EQ(context.uc_mcontext.gp_regs[3], FromPointerCast<uintptr_t>(&context));
+ #endif
+ }
+ 
+@@ -49,6 +51,8 @@ uintptr_t ProgramCounterFromContext(const NativeCPUContext& context) {
+   return context.uc_mcontext.pc;
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   return context.uc_mcontext.pc;
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  return context.uc_mcontext.gp_regs[PT_NIP];
+ #endif
+ }
+ 
+@@ -63,6 +67,8 @@ uintptr_t StackPointerFromContext(const NativeCPUContext& context) {
+   return context.uc_mcontext.sp;
+ #elif defined(ARCH_CPU_MIPS_FAMILY)
+   return context.uc_mcontext.gregs[29];
++#elif defined(ARCH_CPU_PPC64_FAMILY)
++  return context.uc_mcontext.gp_regs[1];
+ #endif
+ }
+ 
+diff --git third_party/crashpad/crashpad/util/posix/signals_test.cc third_party/crashpad/crashpad/util/posix/signals_test.cc
+index 54cc2f19f..298b5c993 100644
+--- third_party/crashpad/crashpad/util/posix/signals_test.cc
++++ third_party/crashpad/crashpad/util/posix/signals_test.cc
+@@ -46,9 +46,9 @@ bool CanCauseSignal(int sig) {
+   return sig == SIGABRT ||
+          sig == SIGALRM ||
+          sig == SIGBUS ||
+-#if !defined(ARCH_CPU_ARM64)
++#if !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+          sig == SIGFPE ||
+-#endif  // !defined(ARCH_CPU_ARM64)
++#endif  // !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
+          sig == SIGILL ||
+ #endif  // defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
+@@ -117,9 +117,11 @@ void CauseSignal(int sig) {
+       break;
+     }
+ 
+-#if !defined(ARCH_CPU_ARM64)
++#if !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+     // ARM64 has hardware integer division instructions that don’t generate a
+     // trap for divide-by-zero, so this doesn’t produce SIGFPE.
++    //
++    // PPC64 fixed-point division by zero also doesn't produce a SIGFPE.
+     case SIGFPE: {
+       // Optimization makes this tricky, so get zero from a system call likely
+       // to succeed, and try to do something with the result.
+@@ -137,7 +139,7 @@ void CauseSignal(int sig) {
+       fstat(quotient, &stat_buf);
+       break;
+     }
+-#endif  // ARCH_CPU_ARM64
++#endif  // !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
+ 
+ #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
+     case SIGILL: {
+diff --git third_party/dav1d/BUILD.gn third_party/dav1d/BUILD.gn
+index 6b4566fc3..c07f732ad 100644
+--- third_party/dav1d/BUILD.gn
++++ third_party/dav1d/BUILD.gn
+@@ -184,6 +184,8 @@ static_library("dav1d_8bit") {
+     sources += arm_template_sources
+   } else if (current_cpu == "arm64") {
+     sources += arm_template_sources
++  } else if (current_cpu == "ppc64") {
++    sources += ppc64_template_sources
+   }
+ 
+   cflags = dav1d_copts
+@@ -212,6 +214,8 @@ static_library("dav1d_10bit") {
+     sources += arm_template_sources
+   } else if (current_cpu == "arm64") {
+     sources += arm_template_sources
++  } else if (current_cpu == "ppc64") {
++    sources += ppc64_template_sources
+   }
+ 
+   cflags = dav1d_copts
+@@ -263,6 +267,21 @@ if (current_cpu == "x86" || current_cpu == "x64") {
+       defines = [ "PREFIX" ]
+     }
+ 
++    cflags = dav1d_copts
++  }
++} else if (current_cpu == "ppc64") {
++  static_library("dav1d_ppc") {
++    sources = [
++      "libdav1d/src/ppc/cpu.c",
++      "libdav1d/src/ppc/cpu.h",
++    ]
++
++    configs -= [ "//build/config/compiler:chromium_code" ]
++    configs += [
++      "//build/config/compiler:no_chromium_code",
++      ":dav1d_config",
++    ]
++
+     cflags = dav1d_copts
+   }
+ }
+@@ -292,5 +311,7 @@ static_library("dav1d") {
+     }
+   } else if (current_cpu == "arm" || current_cpu == "arm64") {
+     deps += [ ":dav1d_arm" ]
++  } else if (current_cpu == "ppc64") {
++    deps += [ ":dav1d_ppc" ]
+   }
+ }
+diff --git third_party/dav1d/config/linux/ppc64/config.h third_party/dav1d/config/linux/ppc64/config.h
+new file mode 100644
+index 000000000..9fbbf75cc
+--- /dev/null
++++ third_party/dav1d/config/linux/ppc64/config.h
+@@ -0,0 +1,39 @@
++/*
++ * Autogenerated by the Meson build system.
++ * Do not edit, your changes will be lost.
++ */
++
++#pragma once
++
++#define ARCH_AARCH64 0
++
++#define ARCH_ARM 0
++
++#define ARCH_PPC64LE 1
++
++#define ARCH_X86 0
++
++#define ARCH_X86_32 0
++
++#define ARCH_X86_64 0
++
++#define CONFIG_16BPC 1
++
++#define CONFIG_8BPC 1
++
++// #define CONFIG_LOG 1 -- Logging is controlled by Chromium
++
++#define ENDIANNESS_BIG 0
++
++#define HAVE_ASM 1
++
++#define HAVE_CLOCK_GETTIME 1
++
++#define HAVE_DLSYM 1
++
++#define HAVE_GETAUXVAL 1
++
++#define HAVE_POSIX_MEMALIGN 1
++
++#define HAVE_UNISTD_H 1
++
+diff --git third_party/dav1d/dav1d_generated.gni third_party/dav1d/dav1d_generated.gni
+index c59cb0821..3060284a8 100644
+--- third_party/dav1d/dav1d_generated.gni
++++ third_party/dav1d/dav1d_generated.gni
+@@ -82,6 +82,11 @@ arm_template_sources = [
+   "libdav1d/src/arm/mc_init_tmpl.c",
+ ]
+ 
++ppc64_template_sources = [
++  "libdav1d/src/ppc/cdef_init_tmpl.c",
++  "libdav1d/src/ppc/looprestoration_init_tmpl.c",
++]
++
+ template_sources = [
+   "libdav1d/src/cdef_apply_tmpl.c",
+   "libdav1d/src/cdef_tmpl.c",
+diff --git third_party/dav1d/generate_source.py third_party/dav1d/generate_source.py
+index 9ab5e00b8..ad3feffee 100755
+--- third_party/dav1d/generate_source.py
++++ third_party/dav1d/generate_source.py
+@@ -50,7 +50,8 @@ def WriteGn(fd):
+   WriteArray(fd, "arm32_asm_sources", glob.glob("libdav1d/src/arm/32/*.S"))
+   WriteArray(fd, "arm64_asm_sources", glob.glob("libdav1d/src/arm/64/*.S"))
+   WriteArray(fd, "arm_template_sources", glob.glob("libdav1d/src/arm/*_tmpl.c"))
+-
++  WriteArray(fd, "ppc64_template_sources", glob.glob("libdav1d/src/ppc/*_tmpl.c"))
++ 
+   template_sources = glob.glob("libdav1d/src/*_tmpl.c")
+   WriteArray(fd, "template_sources", template_sources)
+ 
+diff --git third_party/dav1d/libdav1d/src/ppc/types.h third_party/dav1d/libdav1d/src/ppc/types.h
+index 0b4bd72f0..a0caa5e71 100644
+--- third_party/dav1d/libdav1d/src/ppc/types.h
++++ third_party/dav1d/libdav1d/src/ppc/types.h
+@@ -51,4 +51,19 @@
+ #define u16l_to_i32(v) ((i32x4) vec_mergel((u16x8) v, vec_splat_u16(0)))
+ #define i16l_to_i32(v) ((i32x4) vec_unpackl((i16x8)v))
+ 
++#if defined(__clang__)
++#undef vec_splats
++#define vec_splats(N)                     \
++    _Generic((N),                         \
++        unsigned char:      ((u8x16)(N)), \
++        signed char:        ((i8x16)(N)), \
++        unsigned short:     ((u16x8)(N)), \
++        signed short:       ((i16x8)(N)), \
++        unsigned int:       ((u32x4)(N)), \
++        signed int:         ((i32x4)(N)), \
++        unsigned long long: ((u64x2)(N)), \
++        signed long long:   ((i64x2)(N))  \
++    )
++#endif
++
+ #endif /* DAV1D_SRC_PPC_TYPES_H */
+diff --git third_party/lss/linux_syscall_support.h third_party/lss/linux_syscall_support.h
+index e4ac22644..1c57015db 100644
+--- third_party/lss/linux_syscall_support.h
++++ third_party/lss/linux_syscall_support.h
+@@ -3947,7 +3947,7 @@ struct kernel_statfs {
+       LSS_REG(2, buf);
+       LSS_BODY(void*, mmap2, "0"(__r2));
+     }
+-#else
++#elif !defined(__powerpc64__) /* ppc64 doesn't have mmap2 */
+     #define __NR__mmap2 __NR_mmap2
+     LSS_INLINE _syscall6(void*, _mmap2,            void*, s,
+                          size_t,                   l, int,               p,
+@@ -4058,7 +4058,7 @@ struct kernel_statfs {
+   #if defined(__i386__) ||                                                    \
+       defined(__ARM_ARCH_3__) || defined(__ARM_EABI__) ||                     \
+      (defined(__mips__) && _MIPS_SIM == _MIPS_SIM_ABI32) ||                   \
+-      defined(__PPC__) ||                                                     \
++     (defined(__PPC__) && !defined(__powerpc64__)) ||                                                     \
+      (defined(__s390__) && !defined(__s390x__))
+     /* On these architectures, implement mmap() with mmap2(). */
+     LSS_INLINE void* LSS_NAME(mmap)(void *s, size_t l, int p, int f, int d,
+diff --git third_party/pffft/src/pffft.c third_party/pffft/src/pffft.c
+index bdac4d784..51e0f2cac 100644
+--- third_party/pffft/src/pffft.c
++++ third_party/pffft/src/pffft.c
+@@ -100,6 +100,7 @@
+    Altivec support macros 
+ */
+ #if !defined(PFFFT_SIMD_DISABLE) && (defined(__ppc__) || defined(__ppc64__))
++#include <altivec.h>
+ typedef vector float v4sf;
+ #  define SIMD_SZ 4
+ #  define VZERO() ((vector float) vec_splat_u8(0))
+diff --git third_party/skia/src/sksl/SkSLString.cpp third_party/skia/src/sksl/SkSLString.cpp
+index ec3e56964..4cf8999a2 100644
+--- third_party/skia/src/sksl/SkSLString.cpp
++++ third_party/skia/src/sksl/SkSLString.cpp
+@@ -234,7 +234,12 @@ String to_string(double value) {
+     if (needsDotZero) {
+         buffer << ".0";
+     }
+-    return String(buffer.str().c_str());
++
++    std::string ret(buffer.str());
++    if (signbit(value) && ret[0] == '.') {
++        ret[0] = '-';
++    }
++    return String(ret.c_str());
+ }
+ 
+ bool stod(const StringFragment& s, SKSL_FLOAT* value) {
+diff --git third_party/sqlite/src/amalgamation/sqlite3.c third_party/sqlite/src/amalgamation/sqlite3.c
+index 6b4a7899d..b8c7fe414 100644
+--- third_party/sqlite/src/amalgamation/sqlite3.c
++++ third_party/sqlite/src/amalgamation/sqlite3.c
+@@ -14474,7 +14474,8 @@ typedef INT16_TYPE LogEst;
+ # if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
+      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
+      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
+-     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
++     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) ||   \
++     defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ #   define SQLITE_BYTEORDER    1234
+ # elif defined(sparc)     || defined(__ppc__) || \
+        defined(__ARMEB__) || defined(__AARCH64EB__)
+diff --git third_party/sqlite/src/amalgamation_dev/sqlite3.c third_party/sqlite/src/amalgamation_dev/sqlite3.c
+index d30c9b7de..cf75a69d9 100644
+--- third_party/sqlite/src/amalgamation_dev/sqlite3.c
++++ third_party/sqlite/src/amalgamation_dev/sqlite3.c
+@@ -14487,7 +14487,8 @@ typedef INT16_TYPE LogEst;
+ # if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
+      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
+      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
+-     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
++     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) ||   \
++     defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ #   define SQLITE_BYTEORDER    1234
+ # elif defined(sparc)     || defined(__ppc__) || \
+        defined(__ARMEB__) || defined(__AARCH64EB__)
+diff --git third_party/sqlite/src/ext/rtree/rtree.c third_party/sqlite/src/ext/rtree/rtree.c
+index f5b57a5e2..80a2d0ad8 100644
+--- third_party/sqlite/src/ext/rtree/rtree.c
++++ third_party/sqlite/src/ext/rtree/rtree.c
+@@ -450,7 +450,7 @@ struct RtreeMatchArg {
+ #if defined(i386)     || defined(__i386__)   || defined(_M_IX86) ||    \
+     defined(__x86_64) || defined(__x86_64__) || defined(_M_X64)  ||    \
+     defined(_M_AMD64) || defined(_M_ARM)     || defined(__x86)   ||    \
+-    defined(__arm__)
++    defined(__arm__) || defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ # define SQLITE_BYTEORDER    1234
+ #elif defined(sparc)    || defined(__ppc__)
+ # define SQLITE_BYTEORDER    4321
+diff --git third_party/sqlite/src/src/sqliteInt.h third_party/sqlite/src/src/sqliteInt.h
+index 245070d4f..b25164e95 100644
+--- third_party/sqlite/src/src/sqliteInt.h
++++ third_party/sqlite/src/src/sqliteInt.h
+@@ -877,7 +877,8 @@ typedef INT16_TYPE LogEst;
+ # if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
+      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
+      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
+-     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
++     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) || \
++     defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ #   define SQLITE_BYTEORDER    1234
+ # elif defined(sparc)     || defined(__ppc__) || \
+        defined(__ARMEB__) || defined(__AARCH64EB__)
+diff --git third_party/webrtc/modules/desktop_capture/differ_block.cc third_party/webrtc/modules/desktop_capture/differ_block.cc
+index 4f0c5430c..54ee0829e 100644
+--- third_party/webrtc/modules/desktop_capture/differ_block.cc
++++ third_party/webrtc/modules/desktop_capture/differ_block.cc
+@@ -30,11 +30,7 @@ bool VectorDifference(const uint8_t* image1, const uint8_t* image2) {
+   static bool (*diff_proc)(const uint8_t*, const uint8_t*) = nullptr;
+ 
+   if (!diff_proc) {
+-#if defined(WEBRTC_ARCH_ARM_FAMILY) || defined(WEBRTC_ARCH_MIPS_FAMILY)
+-    // For ARM and MIPS processors, always use C version.
+-    // TODO(hclam): Implement a NEON version.
+-    diff_proc = &VectorDifference_C;
+-#else
++#if defined(WEBRTC_ARCH_X86_FAMILY)
+     bool have_sse2 = GetCPUInfo(kSSE2) != 0;
+     // For x86 processors, check if SSE2 is supported.
+     if (have_sse2 && kBlockSize == 32) {
+@@ -44,6 +40,10 @@ bool VectorDifference(const uint8_t* image1, const uint8_t* image2) {
+     } else {
+       diff_proc = &VectorDifference_C;
+     }
++#else
++    // For other processors, always use C version.
++    // TODO(hclam): Implement a NEON version.
++    diff_proc = &VectorDifference_C;
+ #endif
+   }
+ 
+diff --git third_party/webrtc/rtc_base/system/arch.h third_party/webrtc/rtc_base/system/arch.h
+index be2367b85..be4ee4233 100644
+--- third_party/webrtc/rtc_base/system/arch.h
++++ third_party/webrtc/rtc_base/system/arch.h
+@@ -79,6 +79,18 @@
+ #elif defined(__EMSCRIPTEN__)
+ #define WEBRTC_ARCH_32_BITS
+ #define WEBRTC_ARCH_LITTLE_ENDIAN
++#elif defined(__PPC__)
++#define WEBRTC_ARCH_PPC_FAMILY
++#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
++#define WEBRTC_ARCH_LITTLE_ENDIAN
++#else
++#define WEBRTC_ARCH_BIG_ENDIAN
++#endif
++#if defined(__LP64__)
++#define WEBRTC_ARCH_64_BITS
++#else
++#define WEBRTC_ARCH_32_BITS
++#endif
+ #else
+ #error Please add support for your architecture in rtc_base/system/arch.h
+ #endif
+diff --git v8/BUILD.gn v8/BUILD.gn
+index f39529a3a..e84fc449e 100644
+--- v8/BUILD.gn
++++ v8/BUILD.gn
+@@ -850,6 +850,12 @@ config("toolchain") {
+     }
+     if (host_byteorder == "little") {
+       defines += [ "V8_TARGET_ARCH_PPC_LE" ]
++      cflags += [
++        # Enable usage of AltiVec, VSX, and other POWER8 and higher features
++        "-mcpu=power8",
++        "-maltivec",
++        "-mvsx",
++      ]
+     } else if (host_byteorder == "big") {
+       defines += [ "V8_TARGET_ARCH_PPC_BE" ]
+       if (current_os == "aix") {
+diff --git ui/gl/features.gni ui/gl/features.gni
+index 5fda9b6..3d2dd8b 100644
+--- ui/gl/features.gni
++++ ui/gl/features.gni
+@@ -32,5 +32,6 @@ declare_args() {
+                         (is_mac && use_egl) || is_chromeos_ash || is_fuchsia) &&
+                        (target_cpu == "x86" || target_cpu == "x64" ||
+                         target_cpu == "arm" || target_cpu == "arm64" ||
+-                        target_cpu == "mipsel" || target_cpu == "mips64el")
++                        target_cpu == "mipsel" || target_cpu == "mips64el" ||
++                        target_cpu == "ppc64")
+ }
+diff --git v8/test/BUILD.gn v8/test/BUILD.gn
+index fb872ad39..45fc585dd 100644
+--- v8/test/BUILD.gn
++++ v8/test/BUILD.gn
+@@ -36,7 +36,7 @@ group("gn_all") {
+       "benchmarks/cpp:gn_all",
+       "cctest:cctest",
+       "cctest:generate-bytecode-expectations",
+-      "unittests:unittests",
++      #"unittests:unittests",
+     ]
+   }
+ }
+@@ -78,7 +78,7 @@ group("v8_bot_default") {
+     "message:v8_message",
+     "mjsunit:v8_mjsunit",
+     "mkgrokdump:mkgrokdump",
+-    "unittests:unittests",
++    #"unittests:unittests",
+     "wasm-api-tests:wasm_api_tests",
+     "wasm-js:v8_wasm_js",
+     "wasm-spec-tests:v8_wasm_spec_tests",
+@@ -98,7 +98,7 @@ group("v8_default") {
+     "message:v8_message",
+     "mjsunit:v8_mjsunit",
+     "mkgrokdump:mkgrokdump",
+-    "unittests:unittests",
++    #"unittests:unittests",
+     "wasm-api-tests:wasm_api_tests",
+     "wasm-js:v8_wasm_js",
+     "wasm-spec-tests:v8_wasm_spec_tests",
diff --git a/srcpkgs/electron12/files/patches/chromium-xxx-ppc64le-swiftshader.patch b/srcpkgs/electron12/files/patches/chromium-xxx-ppc64le-swiftshader.patch
new file mode 100644
index 000000000000..53549d17f5ac
--- /dev/null
+++ b/srcpkgs/electron12/files/patches/chromium-xxx-ppc64le-swiftshader.patch
@@ -0,0 +1,18 @@
+--- third_party/swiftshader/third_party/llvm-10.0/BUILD.gn
++++ third_party/swiftshader/third_party/llvm-10.0/BUILD.gn
+@@ -574,6 +574,7 @@ swiftshader_llvm_source_set("swiftshader
+     "llvm/lib/MC/MCAsmInfoCOFF.cpp",
+     "llvm/lib/MC/MCAsmInfoDarwin.cpp",
+     "llvm/lib/MC/MCAsmInfoELF.cpp",
++    "llvm/lib/MC/MCAsmInfoXCOFF.cpp",
+     "llvm/lib/MC/MCAsmMacro.cpp",
+     "llvm/lib/MC/MCAsmStreamer.cpp",
+     "llvm/lib/MC/MCAssembler.cpp",
+@@ -629,6 +630,7 @@ swiftshader_llvm_source_set("swiftshader
+     "llvm/lib/MC/MCWinCOFFStreamer.cpp",
+     "llvm/lib/MC/MCWinEH.cpp",
+     "llvm/lib/MC/MCXCOFFStreamer.cpp",
++    "llvm/lib/MC/MCXCOFFObjectTargetWriter.cpp",
+     "llvm/lib/MC/MachObjectWriter.cpp",
+     "llvm/lib/MC/StringTableBuilder.cpp",
+     "llvm/lib/MC/SubtargetFeature.cpp",
diff --git a/srcpkgs/electron12/files/patches/electron-Add-a-script-to-list-patch-targets.patch.patch b/srcpkgs/electron12/files/patches/electron-Add-a-script-to-list-patch-targets.patch.patch
new file mode 100644
index 000000000000..916dba9dc3bc
--- /dev/null
+++ b/srcpkgs/electron12/files/patches/electron-Add-a-script-to-list-patch-targets.patch.patch
@@ -0,0 +1,42 @@
+From ff4122f236b70c272c746d0c336cdbd588d78cd1 Mon Sep 17 00:00:00 2001
+From: Elvis Pranskevichus <elvis@magic.io>
+Date: Thu, 12 Dec 2019 16:12:18 -0500
+Subject: [PATCH] Add a script to list patch targets
+
+---
+ script/list_patch_targets.py | 23 +++++++++++++++++++++++
+ 1 file changed, 23 insertions(+)
+ create mode 100755 script/list_patch_targets.py
+
+diff --git a/script/list_patch_targets.py b/script/list_patch_targets.py
+new file mode 100755
+index 000000000..55173bac9
+--- /dev/null
++++ b/script/list_patch_targets.py
+@@ -0,0 +1,23 @@
++#!/usr/bin/env python
++
++import argparse
++import json
++
++
++def parse_args():
++  parser = argparse.ArgumentParser(description='Apply Electron patches')
++  parser.add_argument('config', nargs='+',
++                      type=argparse.FileType('r'),
++                      help='patches\' config(s) in the JSON format')
++  return parser.parse_args()
++
++
++def main():
++  configs = parse_args().config
++  for config_json in configs:
++    for patch_dir, repo in json.load(config_json).iteritems():
++      print(repo)
++
++
++if __name__ == '__main__':
++  main()
+-- 
+2.23.0
+
diff --git a/srcpkgs/electron12/files/patches/electron-Build-fixes.patch.patch b/srcpkgs/electron12/files/patches/electron-Build-fixes.patch.patch
new file mode 100644
index 000000000000..298bfa9bcb2b
--- /dev/null
+++ b/srcpkgs/electron12/files/patches/electron-Build-fixes.patch.patch
@@ -0,0 +1,47 @@
+diff --git a/build/args/release.gn b/build/args/release.gn
+index e5017f6e1..59207b389 100644
+--- a/build/args/release.gn
++++ b/build/args/release.gn
+@@ -1,6 +1,4 @@
+ import("all.gn")
+-is_component_build = false
+-is_official_build = true
+ 
+ # This may be guarded behind is_chrome_branded alongside
+ # proprietary_codecs https://webrtc-review.googlesource.com/c/src/+/36321,
+@@ -8,9 +6,3 @@ is_official_build = true
+ # The initialization of the decoder depends on whether ffmpeg has
+ # been built with H.264 support.
+ rtc_use_h264 = proprietary_codecs
+-
+-# By default, Electron builds ffmpeg with proprietary codecs enabled. In order
+-# to facilitate users who don't want to ship proprietary codecs in ffmpeg, or
+-# who have an LGPL requirement to ship ffmpeg as a dynamically linked library,
+-# we build ffmpeg as a shared library.
+-is_component_ffmpeg = true
+diff --git a/build/npm.gni b/build/npm.gni
+index a1987d095..fb33a14c3 100644
+--- a/build/npm.gni
++++ b/build/npm.gni
+@@ -35,7 +35,6 @@ template("npm_action") {
+     if (!defined(deps)) {
+       deps = []
+     }
+-    deps += [ ":npm_pre_flight_" + target_name ]
+ 
+     script = "//electron/build/npm-run.py"
+     args = [
+diff --git a/patches/node/fix_add_default_values_for_enable_lto_and_build_v8_with_gn_in.patch b/patches/node/fix_add_default_values_for_enable_lto_and_build_v8_with_gn_in.patch
+index 0dc9916be..7eaa46bf5 100644
+--- a/patches/node/fix_add_default_values_for_enable_lto_and_build_v8_with_gn_in.patch
++++ b/patches/node/fix_add_default_values_for_enable_lto_and_build_v8_with_gn_in.patch
+@@ -30,7 +30,7 @@
+ +    # these values being accurate.
+ +    'build_v8_with_gn': 'false',
+ +    'enable_lto%': 'false',
+-+
+++    'openssl_fips': '',
+      'conditions': [
+        ['target_arch=="arm64"', {
+          # Disabled pending https://github.com/nodejs/node/issues/23913.
+
diff --git a/srcpkgs/electron12/files/patches/electron-dont-assume-python-is-python2.patch b/srcpkgs/electron12/files/patches/electron-dont-assume-python-is-python2.patch
new file mode 100644
index 000000000000..fb134748025b
--- /dev/null
+++ b/srcpkgs/electron12/files/patches/electron-dont-assume-python-is-python2.patch
@@ -0,0 +1,17 @@
+--- a/build/zip.py.orig	2020-04-27 17:59:53.499281667 +0200
++++ b/build/zip.py	2020-04-27 17:59:57.655839143 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ from __future__ import print_function
+ import os
+ import subprocess
+
+--- a/build/npm-run.py.orig	2020-04-27 17:59:50.829351807 +0200
++++ b/build/npm-run.py	2020-04-27 18:00:02.702373256 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ from __future__ import print_function
+ import os
+ import subprocess
diff --git a/srcpkgs/electron12/files/patches/electron-exclude-content-test-patches.patch b/srcpkgs/electron12/files/patches/electron-exclude-content-test-patches.patch
new file mode 100644
index 000000000000..456223644278
--- /dev/null
+++ b/srcpkgs/electron12/files/patches/electron-exclude-content-test-patches.patch
@@ -0,0 +1,10 @@
+--- a/script/apply_all_patches.py	2020-08-22 17:46:41.796707506 +0200
++++ -	2020-08-22 17:47:05.887813512 +0200
+@@ -14,6 +14,7 @@
+   for patch_dir, repo in dirs.items():
+     git.import_patches(repo=repo, patch_data=patch_from_dir(patch_dir),
+       threeway=threeway is not None,
++      exclude=['test/mjsunit/**', 'content/test/**', 'test/cctest/**', 'test/unittests/**', 'third_party/blink/web_tests/**'],
+       committer_name="Electron Scripts", committer_email="scripts@electron")
+ 
+ 
diff --git a/srcpkgs/electron12/files/sndio-files/audio_manager_openbsd.cc b/srcpkgs/electron12/files/sndio-files/audio_manager_openbsd.cc
new file mode 100644
index 000000000000..2c7aa8efa66f
--- /dev/null
+++ b/srcpkgs/electron12/files/sndio-files/audio_manager_openbsd.cc
@@ -0,0 +1,148 @@
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "base/metrics/histogram_macros.h"
+#include "base/memory/ptr_util.h"
+
+#include "media/audio/openbsd/audio_manager_openbsd.h"
+
+#include "media/audio/audio_device_description.h"
+#include "media/audio/audio_output_dispatcher.h"
+#include "media/audio/sndio/sndio_input.h"
+#include "media/audio/sndio/sndio_output.h"
+#include "media/base/limits.h"
+#include "media/base/media_switches.h"
+
+namespace media {
+
+// Maximum number of output streams that can be open simultaneously.
+static const int kMaxOutputStreams = 4;
+
+// Default sample rate for input and output streams.
+static const int kDefaultSampleRate = 48000;
+
+void AddDefaultDevice(AudioDeviceNames* device_names) {
+  DCHECK(device_names->empty());
+  device_names->push_front(AudioDeviceName::CreateDefault());
+}
+
+bool AudioManagerOpenBSD::HasAudioOutputDevices() {
+  return true;
+}
+
+bool AudioManagerOpenBSD::HasAudioInputDevices() {
+  return true;
+}
+
+void AudioManagerOpenBSD::GetAudioInputDeviceNames(
+    AudioDeviceNames* device_names) {
+  DCHECK(device_names->empty());
+  AddDefaultDevice(device_names);
+}
+
+void AudioManagerOpenBSD::GetAudioOutputDeviceNames(
+    AudioDeviceNames* device_names) {
+  AddDefaultDevice(device_names);
+}
+
+const char* AudioManagerOpenBSD::GetName() {
+  return "SNDIO";
+}
+
+AudioParameters AudioManagerOpenBSD::GetInputStreamParameters(
+    const std::string& device_id) {
+  static const int kDefaultInputBufferSize = 1024;
+
+  int user_buffer_size = GetUserBufferSize();
+  int buffer_size = user_buffer_size ?
+      user_buffer_size : kDefaultInputBufferSize;
+
+  return AudioParameters(
+      AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO,
+      kDefaultSampleRate, buffer_size);
+}
+
+AudioManagerOpenBSD::AudioManagerOpenBSD(std::unique_ptr<AudioThread> audio_thread,
+                                         AudioLogFactory* audio_log_factory)
+    : AudioManagerBase(std::move(audio_thread),
+                       audio_log_factory) {
+  DLOG(WARNING) << "AudioManagerOpenBSD";
+  SetMaxOutputStreamsAllowed(kMaxOutputStreams);
+}
+
+AudioManagerOpenBSD::~AudioManagerOpenBSD() {
+  Shutdown();
+}
+
+AudioOutputStream* AudioManagerOpenBSD::MakeLinearOutputStream(
+    const AudioParameters& params,
+    const LogCallback& log_callback) {
+  DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
+  return MakeOutputStream(params);
+}
+
+AudioOutputStream* AudioManagerOpenBSD::MakeLowLatencyOutputStream(
+    const AudioParameters& params,
+    const std::string& device_id,
+    const LogCallback& log_callback) {
+  DLOG_IF(ERROR, !device_id.empty()) << "Not implemented!";
+  DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
+  return MakeOutputStream(params);
+}
+
+AudioInputStream* AudioManagerOpenBSD::MakeLinearInputStream(
+    const AudioParameters& params,
+    const std::string& device_id,
+    const LogCallback& log_callback) {
+  DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
+  return MakeInputStream(params);
+}
+
+AudioInputStream* AudioManagerOpenBSD::MakeLowLatencyInputStream(
+    const AudioParameters& params,
+    const std::string& device_id,
+    const LogCallback& log_callback) {
+  DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
+  return MakeInputStream(params);
+}
+
+AudioParameters AudioManagerOpenBSD::GetPreferredOutputStreamParameters(
+    const std::string& output_device_id,
+    const AudioParameters& input_params) {
+  // TODO(tommi): Support |output_device_id|.
+  DLOG_IF(ERROR, !output_device_id.empty()) << "Not implemented!";
+  static const int kDefaultOutputBufferSize = 2048;
+
+  ChannelLayout channel_layout = CHANNEL_LAYOUT_STEREO;
+  int sample_rate = kDefaultSampleRate;
+  int buffer_size = kDefaultOutputBufferSize;
+  if (input_params.IsValid()) {
+    sample_rate = input_params.sample_rate();
+    channel_layout = input_params.channel_layout();
+    buffer_size = std::min(buffer_size, input_params.frames_per_buffer());
+  }
+
+  int user_buffer_size = GetUserBufferSize();
+  if (user_buffer_size)
+    buffer_size = user_buffer_size;
+
+  return AudioParameters(
+      AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout,
+      sample_rate, buffer_size);
+}
+
+AudioInputStream* AudioManagerOpenBSD::MakeInputStream(
+    const AudioParameters& params) {
+  DLOG(WARNING) << "MakeInputStream";
+  return new SndioAudioInputStream(this,
+             AudioDeviceDescription::kDefaultDeviceId, params);
+}
+
+AudioOutputStream* AudioManagerOpenBSD::MakeOutputStream(
+    const AudioParameters& params) {
+  DLOG(WARNING) << "MakeOutputStream";
+  return new SndioAudioOutputStream(params, this);
+}
+
+}  // namespace media
diff --git a/srcpkgs/electron12/files/sndio-files/audio_manager_openbsd.h b/srcpkgs/electron12/files/sndio-files/audio_manager_openbsd.h
new file mode 100644
index 000000000000..8c99db966d65
--- /dev/null
+++ b/srcpkgs/electron12/files/sndio-files/audio_manager_openbsd.h
@@ -0,0 +1,65 @@
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef MEDIA_AUDIO_OPENBSD_AUDIO_MANAGER_OPENBSD_H_
+#define MEDIA_AUDIO_OPENBSD_AUDIO_MANAGER_OPENBSD_H_
+
+#include <set>
+
+#include "base/compiler_specific.h"
+#include "base/macros.h"
+#include "base/memory/ref_counted.h"
+#include "base/threading/thread.h"
+#include "media/audio/audio_manager_base.h"
+
+namespace media {
+
+class MEDIA_EXPORT AudioManagerOpenBSD : public AudioManagerBase {
+ public:
+  AudioManagerOpenBSD(std::unique_ptr<AudioThread> audio_thread,
+                   AudioLogFactory* audio_log_factory);
+  ~AudioManagerOpenBSD() override;
+
+  // Implementation of AudioManager.
+  bool HasAudioOutputDevices() override;
+  bool HasAudioInputDevices() override;
+  void GetAudioInputDeviceNames(AudioDeviceNames* device_names) override;
+  void GetAudioOutputDeviceNames(AudioDeviceNames* device_names) override;
+  AudioParameters GetInputStreamParameters(
+      const std::string& device_id) override;
+  const char* GetName() override;
+
+  // Implementation of AudioManagerBase.
+  AudioOutputStream* MakeLinearOutputStream(
+      const AudioParameters& params,
+      const LogCallback& log_callback) override;
+  AudioOutputStream* MakeLowLatencyOutputStream(
+      const AudioParameters& params,
+      const std::string& device_id,
+      const LogCallback& log_callback) override;
+  AudioInputStream* MakeLinearInputStream(
+      const AudioParameters& params,
+      const std::string& device_id,
+      const LogCallback& log_callback) override;
+  AudioInputStream* MakeLowLatencyInputStream(
+      const AudioParameters& params,
+      const std::string& device_id,
+      const LogCallback& log_callback) override;
+
+ protected:
+  AudioParameters GetPreferredOutputStreamParameters(
+      const std::string& output_device_id,
+      const AudioParameters& input_params) override;
+
+ private:
+  // Called by MakeLinearOutputStream and MakeLowLatencyOutputStream.
+  AudioOutputStream* MakeOutputStream(const AudioParameters& params);
+  AudioInputStream* MakeInputStream(const AudioParameters& params);
+
+  DISALLOW_COPY_AND_ASSIGN(AudioManagerOpenBSD);
+};
+
+}  // namespace media
+
+#endif  // MEDIA_AUDIO_OPENBSD_AUDIO_MANAGER_OPENBSD_H_
diff --git a/srcpkgs/electron12/files/sndio-files/sndio_input.cc b/srcpkgs/electron12/files/sndio-files/sndio_input.cc
new file mode 100644
index 000000000000..ef5439b49a07
--- /dev/null
+++ b/srcpkgs/electron12/files/sndio-files/sndio_input.cc
@@ -0,0 +1,200 @@
+// Copyright 2013 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "base/bind.h"
+#include "base/logging.h"
+#include "base/macros.h"
+#include "media/base/audio_timestamp_helper.h"
+#include "media/audio/openbsd/audio_manager_openbsd.h"
+#include "media/audio/audio_manager.h"
+#include "media/audio/sndio/sndio_input.h"
+
+namespace media {
+
+static const SampleFormat kSampleFormat = kSampleFormatS16;
+
+void SndioAudioInputStream::OnMoveCallback(void *arg, int delta)
+{
+  SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);
+
+  self->hw_delay += delta;
+}
+
+void *SndioAudioInputStream::ThreadEntry(void *arg) {
+  SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);
+
+  self->ThreadLoop();
+  return NULL;
+}
+
+SndioAudioInputStream::SndioAudioInputStream(AudioManagerBase* manager,
+                                             const std::string& device_name,
+                                             const AudioParameters& params)
+    : manager(manager),
+      params(params),
+      audio_bus(AudioBus::Create(params)),
+      state(kClosed) {
+}
+
+SndioAudioInputStream::~SndioAudioInputStream() {
+  if (state != kClosed)
+    Close();
+}
+
+bool SndioAudioInputStream::Open() {
+  struct sio_par par;
+  int sig;
+
+  if (state != kClosed)
+    return false;
+
+  if (params.format() != AudioParameters::AUDIO_PCM_LINEAR &&
+      params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) {
+    LOG(WARNING) << "Unsupported audio format.";
+    return false;
+  }
+
+  sio_initpar(&par);
+  par.rate = params.sample_rate();
+  par.rchan = params.channels();
+  par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
+  par.bps = par.bits / 8;
+  par.sig = sig = par.bits != 8 ? 1 : 0;
+  par.le = SIO_LE_NATIVE;
+  par.appbufsz = params.frames_per_buffer();
+
+  hdl = sio_open(SIO_DEVANY, SIO_REC, 0);
+
+  if (hdl == NULL) {
+    LOG(ERROR) << "Couldn't open audio device.";
+    return false;
+  }
+
+  if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
+    LOG(ERROR) << "Couldn't set audio parameters.";
+    goto bad_close;
+  }
+
+  if (par.rate  != (unsigned int)params.sample_rate() ||
+      par.rchan != (unsigned int)params.channels() ||
+      par.bits  != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) ||
+      par.sig   != (unsigned int)sig ||
+      (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
+      (par.bits != par.bps * 8)) {
+    LOG(ERROR) << "Unsupported audio parameters.";
+    goto bad_close;
+  }
+  state = kStopped;
+  buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
+  sio_onmove(hdl, &OnMoveCallback, this);
+  return true;
+bad_close:
+  sio_close(hdl);
+  return false;
+}
+
+void SndioAudioInputStream::Start(AudioInputCallback* cb) {
+
+  StartAgc();
+
+  state = kRunning;
+  hw_delay = 0;
+  callback = cb;
+  sio_start(hdl);
+  if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) {
+    LOG(ERROR) << "Failed to create real-time thread for recording.";
+    sio_stop(hdl);
+    state = kStopped;
+  }
+}
+
+void SndioAudioInputStream::Stop() {
+
+  if (state == kStopped)
+    return;
+
+  state = kStopWait;
+  pthread_join(thread, NULL);
+  sio_stop(hdl);
+  state = kStopped;
+
+  StopAgc();
+}
+
+void SndioAudioInputStream::Close() {
+
+  if (state == kClosed)
+    return;
+
+  if (state == kRunning)
+    Stop();
+
+  state = kClosed;
+  delete [] buffer;
+  sio_close(hdl);
+
+  manager->ReleaseInputStream(this);
+}
+
+double SndioAudioInputStream::GetMaxVolume() {
+  // Not supported
+  return 0.0;
+}
+
+void SndioAudioInputStream::SetVolume(double volume) {
+  // Not supported. Do nothing.
+}
+
+double SndioAudioInputStream::GetVolume() {
+  // Not supported.
+  return 0.0;
+}
+
+bool SndioAudioInputStream::IsMuted() {
+  // Not supported.
+  return false;
+}
+
+void SndioAudioInputStream::SetOutputDeviceForAec(
+    const std::string& output_device_id) {
+  // Not supported.
+}
+
+void SndioAudioInputStream::ThreadLoop(void) {
+  size_t todo, n;
+  char *data;
+  unsigned int nframes;
+  double normalized_volume = 0.0;
+
+  nframes = audio_bus->frames();
+
+  while (state == kRunning && !sio_eof(hdl)) {
+
+    GetAgcVolume(&normalized_volume);
+
+    // read one block
+    todo = nframes * params.GetBytesPerFrame(kSampleFormat);
+    data = buffer;
+    while (todo > 0) {
+      n = sio_read(hdl, data, todo);
+      if (n == 0)
+        return;	// unrecoverable I/O error
+      todo -= n;
+      data += n;
+    }
+    hw_delay -= nframes;
+
+    // convert frames count to TimeDelta
+    const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
+      params.sample_rate());
+
+    // push into bus
+    audio_bus->FromInterleaved(buffer, nframes, SampleFormatToBytesPerChannel(kSampleFormat));
+
+    // invoke callback
+    callback->OnData(audio_bus.get(), base::TimeTicks::Now() - delay, 1.);
+  }
+}
+
+}  // namespace media
diff --git a/srcpkgs/electron12/files/sndio-files/sndio_input.h b/srcpkgs/electron12/files/sndio-files/sndio_input.h
new file mode 100644
index 000000000000..d868e0469db5
--- /dev/null
+++ b/srcpkgs/electron12/files/sndio-files/sndio_input.h
@@ -0,0 +1,91 @@
+// Copyright 2013 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
+#define MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
+
+#include <stdint.h>
+#include <string>
+#include <sndio.h>
+
+#include "base/compiler_specific.h"
+#include "base/macros.h"
+#include "base/memory/weak_ptr.h"
+#include "base/time/time.h"
+#include "media/audio/agc_audio_stream.h"
+#include "media/audio/audio_io.h"
+#include "media/audio/audio_device_description.h"
+#include "media/base/audio_parameters.h"
+
+namespace media {
+
+class AudioManagerBase;
+
+// Implementation of AudioOutputStream using sndio(7)
+class SndioAudioInputStream : public AgcAudioStream<AudioInputStream> {
+ public:
+  // Pass this to the constructor if you want to attempt auto-selection
+  // of the audio recording device.
+  static const char kAutoSelectDevice[];
+
+  // Create a PCM Output stream for the SNDIO device identified by
+  // |device_name|. If unsure of what to use for |device_name|, use
+  // |kAutoSelectDevice|.
+  SndioAudioInputStream(AudioManagerBase* audio_manager,
+                     const std::string& device_name,
+                     const AudioParameters& params);
+
+  ~SndioAudioInputStream() override;
+
+  // Implementation of AudioInputStream.
+  bool Open() override;
+  void Start(AudioInputCallback* callback) override;
+  void Stop() override;
+  void Close() override;
+  double GetMaxVolume() override;
+  void SetVolume(double volume) override;
+  double GetVolume() override;
+  bool IsMuted() override;
+  void SetOutputDeviceForAec(const std::string& output_device_id) override;
+
+ private:
+
+  enum StreamState {
+    kClosed,            // Not opened yet
+    kStopped,           // Device opened, but not started yet
+    kRunning,           // Started, device playing
+    kStopWait           // Stopping, waiting for the real-time thread to exit
+  };
+
+  // C-style call-backs
+  static void OnMoveCallback(void *arg, int delta);
+  static void* ThreadEntry(void *arg);
+
+  // Continuously moves data from the device to the consumer
+  void ThreadLoop();
+  // Our creator, the audio manager needs to be notified when we close.
+  AudioManagerBase* manager;
+  // Parameters of the source
+  AudioParameters params;
+  // We store data here for consumer
+  std::unique_ptr<AudioBus> audio_bus;
+  // Call-back that consumes recorded data
+  AudioInputCallback* callback;  // Valid during a recording session.
+  // Handle of the audio device
+  struct sio_hdl* hdl;
+  // Current state of the stream
+  enum StreamState state;
+  // High priority thread running ThreadLoop()
+  pthread_t thread;
+  // Number of frames buffered in the hardware
+  int hw_delay;
+  // Temporary buffer where data is stored sndio-compatible format
+  char* buffer;
+
+  DISALLOW_COPY_AND_ASSIGN(SndioAudioInputStream);
+};
+
+}  // namespace media
+
+#endif  // MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
diff --git a/srcpkgs/electron12/files/sndio-files/sndio_output.cc b/srcpkgs/electron12/files/sndio-files/sndio_output.cc
new file mode 100644
index 000000000000..a6719f9aac8d
--- /dev/null
+++ b/srcpkgs/electron12/files/sndio-files/sndio_output.cc
@@ -0,0 +1,183 @@
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "base/logging.h"
+#include "base/time/time.h"
+#include "base/time/default_tick_clock.h"
+#include "media/audio/audio_manager_base.h"
+#include "media/base/audio_timestamp_helper.h"
+#include "media/audio/sndio/sndio_output.h"
+
+namespace media {
+
+static const SampleFormat kSampleFormat = kSampleFormatS16;
+
+void SndioAudioOutputStream::OnMoveCallback(void *arg, int delta) {
+  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
+
+  self->hw_delay -= delta;
+}
+
+void SndioAudioOutputStream::OnVolCallback(void *arg, unsigned int vol) {
+  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
+
+  self->vol = vol;
+}
+
+void *SndioAudioOutputStream::ThreadEntry(void *arg) {
+  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
+
+  self->ThreadLoop();
+  return NULL;
+}
+
+SndioAudioOutputStream::SndioAudioOutputStream(const AudioParameters& params,
+                                               AudioManagerBase* manager)
+    : manager(manager),
+      params(params),
+      audio_bus(AudioBus::Create(params)),
+      state(kClosed),
+      mutex(PTHREAD_MUTEX_INITIALIZER) {
+}
+
+SndioAudioOutputStream::~SndioAudioOutputStream() {
+  if (state != kClosed)
+    Close();
+}
+
+bool SndioAudioOutputStream::Open() {
+  struct sio_par par;
+  int sig;
+
+  if (params.format() != AudioParameters::AUDIO_PCM_LINEAR &&
+      params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) {
+    LOG(WARNING) << "Unsupported audio format.";
+    return false;
+  }
+  sio_initpar(&par);
+  par.rate = params.sample_rate();
+  par.pchan = params.channels();
+  par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
+  par.bps = par.bits / 8;
+  par.sig = sig = par.bits != 8 ? 1 : 0;
+  par.le = SIO_LE_NATIVE;
+  par.appbufsz = params.frames_per_buffer();
+
+  hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0);
+  if (hdl == NULL) {
+    LOG(ERROR) << "Couldn't open audio device.";
+    return false;
+  }
+  if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
+    LOG(ERROR) << "Couldn't set audio parameters.";
+    goto bad_close;
+  }
+  if (par.rate  != (unsigned int)params.sample_rate() ||
+      par.pchan != (unsigned int)params.channels() ||
+      par.bits  != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) ||
+      par.sig   != (unsigned int)sig ||
+      (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
+      (par.bits != par.bps * 8)) {
+    LOG(ERROR) << "Unsupported audio parameters.";
+    goto bad_close;
+  }
+  state = kStopped;
+  volpending = 0;
+  vol = 0;
+  buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
+  sio_onmove(hdl, &OnMoveCallback, this);
+  sio_onvol(hdl, &OnVolCallback, this);
+  return true;
+ bad_close:
+  sio_close(hdl);
+  return false;
+}
+
+void SndioAudioOutputStream::Close() {
+  if (state == kClosed)
+    return;
+  if (state == kRunning)
+    Stop();
+  state = kClosed;
+  delete [] buffer;
+  sio_close(hdl);
+  manager->ReleaseOutputStream(this);  // Calls the destructor
+}
+
+void SndioAudioOutputStream::Start(AudioSourceCallback* callback) {
+  state = kRunning;
+  hw_delay = 0;
+  source = callback;
+  sio_start(hdl);
+  if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) {
+    LOG(ERROR) << "Failed to create real-time thread.";
+    sio_stop(hdl);
+    state = kStopped;
+  }
+}
+
+void SndioAudioOutputStream::Stop() {
+  if (state == kStopped)
+    return;
+  state = kStopWait;
+  pthread_join(thread, NULL);
+  sio_stop(hdl);
+  state = kStopped;
+}
+
+void SndioAudioOutputStream::SetVolume(double v) {
+  pthread_mutex_lock(&mutex);
+  vol = v * SIO_MAXVOL;
+  volpending = 1;
+  pthread_mutex_unlock(&mutex);
+}
+
+void SndioAudioOutputStream::GetVolume(double* v) {
+  pthread_mutex_lock(&mutex);
+  *v = vol * (1. / SIO_MAXVOL);
+  pthread_mutex_unlock(&mutex);
+}
+
+// This stream is always used with sub second buffer sizes, where it's
+// sufficient to simply always flush upon Start().
+void SndioAudioOutputStream::Flush() {}
+
+void SndioAudioOutputStream::ThreadLoop(void) {
+  int avail, count, result;
+
+  while (state == kRunning) {
+    // Update volume if needed
+    pthread_mutex_lock(&mutex);
+    if (volpending) {
+      volpending = 0;
+      sio_setvol(hdl, vol);
+    }
+    pthread_mutex_unlock(&mutex);
+
+    // Get data to play
+    const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
+	params.sample_rate());
+    count = source->OnMoreData(delay, base::TimeTicks::Now(), 0, audio_bus.get());
+    audio_bus->ToInterleaved(count, SampleFormatToBytesPerChannel(kSampleFormat), buffer);
+    if (count == 0) {
+      // We have to submit something to the device
+      count = audio_bus->frames();
+      memset(buffer, 0, count * params.GetBytesPerFrame(kSampleFormat));
+      LOG(WARNING) << "No data to play, running empty cycle.";
+    }
+
+    // Submit data to the device
+    avail = count * params.GetBytesPerFrame(kSampleFormat);
+    result = sio_write(hdl, buffer, avail);
+    if (result == 0) {
+      LOG(WARNING) << "Audio device disconnected.";
+      break;
+    }
+
+    // Update hardware pointer
+    hw_delay += count;
+  }
+}
+
+}  // namespace media
diff --git a/srcpkgs/electron12/files/sndio-files/sndio_output.h b/srcpkgs/electron12/files/sndio-files/sndio_output.h
new file mode 100644
index 000000000000..ead220ca96e7
--- /dev/null
+++ b/srcpkgs/electron12/files/sndio-files/sndio_output.h
@@ -0,0 +1,86 @@
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
+#define MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
+
+#include <pthread.h>
+#include <sndio.h>
+
+#include "base/time/tick_clock.h"
+#include "base/time/time.h"
+#include "media/audio/audio_io.h"
+
+namespace media {
+
+class AudioManagerBase;
+
+// Implementation of AudioOutputStream using sndio(7)
+class SndioAudioOutputStream : public AudioOutputStream {
+ public:
+  // The manager is creating this object
+  SndioAudioOutputStream(const AudioParameters& params,
+                         AudioManagerBase* manager);
+  virtual ~SndioAudioOutputStream();
+
+  // Implementation of AudioOutputStream.
+  bool Open() override;
+  void Close() override;
+  void Start(AudioSourceCallback* callback) override;
+  void Stop() override;
+  void SetVolume(double volume) override;
+  void GetVolume(double* volume) override;
+  void Flush() override;
+
+  friend void sndio_onmove(void *arg, int delta);
+  friend void sndio_onvol(void *arg, unsigned int vol);
+  friend void *sndio_threadstart(void *arg);
+
+ private:
+  enum StreamState {
+    kClosed,            // Not opened yet
+    kStopped,           // Device opened, but not started yet
+    kRunning,           // Started, device playing
+    kStopWait           // Stopping, waiting for the real-time thread to exit
+  };
+
+  // C-style call-backs
+  static void OnMoveCallback(void *arg, int delta);
+  static void OnVolCallback(void *arg, unsigned int vol);
+  static void* ThreadEntry(void *arg);
+
+  // Continuously moves data from the producer to the device
+  void ThreadLoop(void);
+
+  // Our creator, the audio manager needs to be notified when we close.
+  AudioManagerBase* manager;
+  // Parameters of the source
+  AudioParameters params;
+  // Source stores data here
+  std::unique_ptr<AudioBus> audio_bus;
+  // Call-back that produces data to play
+  AudioSourceCallback* source;
+  // Handle of the audio device
+  struct sio_hdl* hdl;
+  // Current state of the stream
+  enum StreamState state;
+  // High priority thread running ThreadLoop()
+  pthread_t thread;
+  // Protects vol, volpending and hw_delay
+  pthread_mutex_t mutex;
+  // Current volume in the 0..SIO_MAXVOL range
+  int vol;
+  // Set to 1 if volumes must be refreshed in the realtime thread
+  int volpending;
+  // Number of frames buffered in the hardware
+  int hw_delay;
+  // Temporary buffer where data is stored sndio-compatible format
+  char* buffer;
+
+  DISALLOW_COPY_AND_ASSIGN(SndioAudioOutputStream);
+};
+
+}  // namespace media
+
+#endif  // MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
diff --git a/srcpkgs/electron12/files/sndio-patches/media_audio_linux_audio_manager_linux.cc.patch b/srcpkgs/electron12/files/sndio-patches/media_audio_linux_audio_manager_linux.cc.patch
new file mode 100644
index 000000000000..cf8e81b11d67
--- /dev/null
+++ b/srcpkgs/electron12/files/sndio-patches/media_audio_linux_audio_manager_linux.cc.patch
@@ -0,0 +1,43 @@
+diff --git a/chromium/media/audio/linux/audio_manager_linux.cc b/chromium/media/audio/linux/audio_manager_linux.cc
+index 5d703549372..9e60b40c749 100644
+--- media/audio/linux/audio_manager_linux.cc
++++ media/audio/linux/audio_manager_linux.cc
+@@ -20,6 +20,10 @@
+ #include "media/audio/pulse/audio_manager_pulse.h"
+ #include "media/audio/pulse/pulse_util.h"
+ #endif
++#if defined(USE_SNDIO)
++#include <sndio.h>
++#include "media/audio/openbsd/audio_manager_openbsd.h"
++#endif
+ 
+ namespace media {
+ 
+@@ -27,7 +31,8 @@ enum LinuxAudioIO {
+   kPulse,
+   kAlsa,
+   kCras,
+-  kAudioIOMax = kCras  // Must always be equal to largest logged entry.
++  kSndio,
++  kAudioIOMax = kSndio  // Must always be equal to largest logged entry.
+ };
+ 
+ std::unique_ptr<media::AudioManager> CreateAudioManager(
+@@ -41,6 +46,17 @@ std::unique_ptr<media::AudioManager> CreateAudioManager(
+   }
+ #endif
+ 
++#if defined(USE_SNDIO)
++  struct sio_hdl * hdl = NULL;
++  if ((hdl=sio_open(SIO_DEVANY, SIO_PLAY, 1)) != NULL) {
++    sio_close(hdl);
++    UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kSndio, kAudioIOMax +1);
++    return std::make_unique<AudioManagerOpenBSD>(std::move(audio_thread),
++                                               audio_log_factory);
++  }
++  DVLOG(1) << "Sndio is not available on the OS";
++#endif
++
+ #if defined(USE_PULSEAUDIO)
+   pa_threaded_mainloop* pa_mainloop = nullptr;
+   pa_context* pa_context = nullptr;
diff --git a/srcpkgs/electron12/files/sndio-patches/src_3rdparty_chromium_media_BUILD.gn.patch b/srcpkgs/electron12/files/sndio-patches/src_3rdparty_chromium_media_BUILD.gn.patch
new file mode 100644
index 000000000000..ec6040026688
--- /dev/null
+++ b/srcpkgs/electron12/files/sndio-patches/src_3rdparty_chromium_media_BUILD.gn.patch
@@ -0,0 +1,12 @@
+--- media/BUILD.gn	2020-03-24 10:16:30.000000000 +0100
++++ -	2020-04-06 14:32:27.960817513 +0200
+@@ -65,6 +65,9 @@
+   if (use_cras) {
+     defines += [ "USE_CRAS" ]
+   }
++  if (use_sndio) {
++    defines += [ "USE_SNDIO" ]
++  }
+ }
+ 
+ # Internal grouping of the configs necessary to support sub-folders having their
diff --git a/srcpkgs/electron12/files/sndio-patches/src_3rdparty_chromium_media_audio_BUILD.gn.patch b/srcpkgs/electron12/files/sndio-patches/src_3rdparty_chromium_media_audio_BUILD.gn.patch
new file mode 100644
index 000000000000..c856de0bf2ec
--- /dev/null
+++ b/srcpkgs/electron12/files/sndio-patches/src_3rdparty_chromium_media_audio_BUILD.gn.patch
@@ -0,0 +1,23 @@
+--- media/audio/BUILD.gn	2020-03-24 10:16:30.000000000 +0100
++++ -	2020-04-06 14:31:28.871450217 +0200
+@@ -232,9 +232,19 @@
+     deps += [ "//media/base/android:media_jni_headers" ]
+   }
+ 
+-  if (is_linux) {
++  if (is_linux) {
+     sources += [ "linux/audio_manager_linux.cc" ]
+   }
++  if (use_sndio) {
++    libs += [ "sndio" ]
++    sources += [
++      "openbsd/audio_manager_openbsd.cc",
++      "sndio/sndio_input.cc",
++      "sndio/sndio_input.h",
++      "sndio/sndio_output.cc",
++      "sndio/sndio_output.h"
++   ]
++ }
+ 
+   if (use_alsa) {
+     libs += [ "asound" ]
diff --git a/srcpkgs/electron12/files/sndio-patches/src_3rdparty_chromium_media_media__options.gni.patch b/srcpkgs/electron12/files/sndio-patches/src_3rdparty_chromium_media_media__options.gni.patch
new file mode 100644
index 000000000000..14807d8e1d36
--- /dev/null
+++ b/srcpkgs/electron12/files/sndio-patches/src_3rdparty_chromium_media_media__options.gni.patch
@@ -0,0 +1,12 @@
+--- media/media_options.gni	2020-03-24 10:16:30.000000000 +0100
++++ -	2020-04-06 14:29:22.958630783 +0200
+@@ -114,6 +114,9 @@
+   # Enables runtime selection of ALSA library for audio.
+   use_alsa = false
+ 
++  # Enables runtime selection of sndio library for audio.
++  use_sndio = false
++
+   # Alsa should be used on non-Android, non-Mac POSIX systems.
+   # Alsa should be used on desktop Chromecast and audio-only Chromecast builds.
+   if (is_posix && !is_android && !is_mac &&
diff --git a/srcpkgs/electron12/template b/srcpkgs/electron12/template
new file mode 100644
index 000000000000..5df0eb8486a1
--- /dev/null
+++ b/srcpkgs/electron12/template
@@ -0,0 +1,369 @@
+# Template file for 'electron12'
+pkgname=electron12
+version=12.0.2
+_nodever=14.16.0
+_chromiumver=89.0.4389.90
+revision=1
+archs="x86_64* i686* aarch64* ppc64le*"
+build_wrksrc="src"
+create_wrksrc=yes
+hostmakedepends="$(vopt_if clang clang) python pkgconf perl gperf bison ninja nodejs hwids
+ libwebp-devel freetype-devel harfbuzz-devel libpng-devel nss-devel which git libevent-devel
+ pciutils-devel libatomic-devel ffmpeg-devel libxml2-devel libglib-devel yarn openjdk libxslt-devel
+ opus-devel libXcursor-devel libXcomposite-devel libXtst-devel libXrandr-devel libXScrnSaver-devel
+ alsa-lib-devel re2-devel snappy-devel mit-krb5-devel $(vopt_if pulseaudio pulseaudio-devel)
+ $(vopt_if sndio sndio-devel) jq"
+makedepends="libpng-devel gtk+-devel gtk+3-devel nss-devel pciutils-devel
+ libXi-devel libgcrypt-devel libgnome-keyring-devel cups-devel elfutils-devel
+ libXcomposite-devel speech-dispatcher-devel libXrandr-devel mit-krb5-devel
+ libXScrnSaver-devel alsa-lib-devel snappy-devel libdrm-devel
+ libxml2-devel libxslt-devel $(vopt_if pulseaudio pulseaudio-devel) libexif-devel
+ libXcursor-devel libflac-devel speex-devel libmtp-devel libwebp-devel
+ libjpeg-turbo-devel libevent-devel json-c-devel harfbuzz-devel
+ minizip-devel jsoncpp-devel zlib-devel libcap-devel libXdamage-devel
+ re2-devel fontconfig-devel freetype-devel opus-devel libatomic-devel
+ $(vopt_if sndio sndio-devel) ffmpeg-devel libva-devel libuv-devel c-ares-devel libnotify-devel
+ $(vopt_if pipewire pipewire-devel) wayland-devel"
+short_desc="Cross platform application development framework based on web technologies"
+maintainer="John <me@johnnynator.dev>"
+license="BSD-3-Clause"
+homepage="https://electronjs.org"
+distfiles="https://github.com/electron/electron/archive/v$version.tar.gz>electron-${version}.tar.gz
+ https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$_chromiumver.tar.xz
+ https://github.com/nodejs/node/archive/v$_nodever.tar.gz>node-$_nodever.tar.gz"
+checksum="e4e15ec16bd8a1541b066b98c9b204da4c01be20aa18808b4fe77f22793458de
+ 11c6089c5fdd921216aa4eb34b52818a9b091cad655a24aed0982d29e65b279a
+ bcdf869b0743405515ee897b1047b5e851a717e426b4974d26537c9b10dfd53a"
+
+case "$XBPS_TARGET_MACHINE" in
+	ppc64*-musl) makedepends+=" libucontext-devel" ;;
+esac
+
+no_generic_pkgconfig_link=yes
+lib32disabled=yes
+nopie=yes  # contains tools that are not PIE, enables PIE itself
+
+build_options="pulseaudio sndio clang pipewire"
+build_options_default="pulseaudio clang pipewire"
+
+if [ "$build_option_clang" ]; then
+	nocross="No proper setup for using clang as cross compiler in void yet"
+elif [ "${XBPS_TARGET_MACHINE%%-musl}" = "aarch64" ]; then
+	broken="Falls apart at runtime when compiled with gcc"
+fi
+
+_buildtype=Release
+_is_debug=false
+
+CFLAGS="-Wno-unknown-warning-option -fPIC"
+CXXFLAGS="-Wno-unknown-warning-option -fPIC"
+
+_apply_patch() {
+	local args="$1" pname="$(basename $2)"
+
+	if [ ! -f ".${pname}_done" ]; then
+		msg_normal "$pkgver: patching: ${pname}.\n"
+		patch -N $args -i $2
+		touch .${pname}_done
+	fi
+}
+
+_get_chromium_arch() {
+	case "$1" in
+		x86_64*) echo x64 ;;
+		i686*) echo x86 ;;
+		arm*) echo arm ;;
+		aarch64*) echo arm64 ;;
+		ppc64*) echo ppc64 ;;
+		ppc*) echo ppc ;;
+		mipsel*) echo mipsel ;;
+		mips*) echo mips ;;
+		*) msg_error "$pkgver: cannot be compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
+	esac
+}
+
+post_extract() {
+	ln -s chromium-$_chromiumver src
+	mkdir -p src/third_party/
+	ln -s ../../node-$_nodever src/third_party/electron_node
+	ln -s ../electron-${version} src/electron
+
+}
+post_patch() {
+	cd $wrksrc
+	for x in $FILESDIR/patches/*; do
+		case "${x##*/}" in
+			electron*.patch)
+				cd src/electron
+				_apply_patch -p1 "$x"
+				cd "$wrksrc";;
+		esac
+	done
+
+	# Sigh, electron uses git am...
+	if [ ! -f ".electron_patches_done" ]; then
+	mv src/electron/patches/config.json config.json.old
+	jq 'del(."src/electron/patches/Mantle", ."src/electron/patches/ReactiveObjC",
+		."src/electron/patches/squirrel.mac", ."src/electron/patches/nan")' \
+		config.json.old > src/electron/patches/config.json
+	
+	python2 src/electron/script/list_patch_targets.py src/electron/patches/config.json | while read -r repopath; do
+		cd "$wrksrc"/"$repopath"
+		git init -q
+		git config "gc.auto" 0
+		if [ "$repopath" != "src" ]; then
+			echo "/${repopath#src/}" >> "$wrksrc/$build_wrksrc/.gitignore"
+		fi
+		git add .
+		git -c 'user.name=Electron build' -c 'user.email=electron@ebuild' \
+			commit -q -m "." || true
+	done
+	cd $wrksrc
+	python2 src/electron/script/apply_all_patches.py src/electron/patches/config.json
+	touch .electron_patches_done
+	fi
+
+	for x in $FILESDIR/patches/*; do
+		case "${x##*/}" in
+			chromium*.patch)
+				cd src
+				_apply_patch -p0 "$x"
+				cd "$wrksrc";;
+		esac
+	done
+
+	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	for x in $FILESDIR/musl-patches/*; do
+		case "${x##*/}" in
+			chromium*.patch)
+				cd src
+				_apply_patch -p0 "$x"
+				cd "$wrksrc";;
+			electron*.patch)
+				cd src/electron
+				_apply_patch -p1 "$x"
+				cd "$wrksrc";;
+		esac
+	done
+	fi
+	if [ "$build_option_sndio" ]; then
+		mkdir -p ${wrksrc}/${build_wrksrc}/media/audio/{sndio,openbsd}
+		cp ${FILESDIR}/sndio-files/sndio_*put.* \
+			${wrksrc}/${build_wrksrc}/media/audio/sndio
+		cp ${FILESDIR}/sndio-files/audio_manager_openbsd.* \
+			${wrksrc}/${build_wrksrc}/media/audio/openbsd
+		for f in "${FILESDIR}"/sndio-patches/*.patch; do
+			cd src
+			_apply_patch -p0 "$f"
+			cd "$wrksrc"
+		done
+	fi
+}
+
+pre_configure() {
+	cd "$wrksrc/$build_wrksrc"
+
+	# https://groups.google.com/a/chromium.org/d/topic/chromium-packagers/9JX1N2nf4PU/discussion
+	touch chrome/test/data/webui/i18n_process_css_test.html
+	# Use the file at run time instead of effectively compiling it in
+	sed 's|//third_party/usb_ids/usb.ids|/usr/share/hwdata/usb.ids|g' \
+		-i services/device/public/cpp/usb/BUILD.gn
+
+	mkdir -p third_party/node/linux/node-linux-x64/bin
+	ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/
+
+	# reusable system library settings
+	local use_system="
+		ffmpeg
+		flac
+		fontconfig
+		freetype
+		harfbuzz-ng
+		libdrm
+		libevent
+		libjpeg
+		libpng
+		libwebp
+		libxml
+		libxslt
+		opus
+		re2
+		snappy
+		"
+	for _lib in $use_system libjpeg_turbo; do
+		msg_normal "Removing buildscripts for system provided $_lib\n"
+		find -type f -path "*third_party/$_lib/*" \
+			\! -path "*third_party/$_lib/chromium/*" \
+			\! -path "*third_party/$_lib/google/*" \
+			\! -path './base/third_party/icu/*' \
+			\! -path './third_party/pdfium/third_party/freetype/include/pstables.h' \
+			\! -path './third_party/harfbuzz-ng/utils/hb_scoped.h' \
+			\! -regex '.*\.\(gn\|gni\|isolate\|py\)' \
+			-delete
+	done
+
+
+	msg_normal "Replacing gn files\n"
+	python2 build/linux/unbundle/replace_gn_files.py --system-libraries \
+		$use_system
+	third_party/libaddressinput/chromium/tools/update-strings.py
+}
+
+do_configure() {
+	local target_arch="$(_get_chromium_arch ${XBPS_TARGET_MACHINE})"
+	local host_arch="$(_get_chromium_arch ${XBPS_MACHINE})"
+	# the build system will set march for use, adding it to cflags will break builds
+	export CXXFLAGS=$( shopt -s extglob; echo ${CXXFLAGS/-march=*([^ ])} )
+	export CFLAGS=$( shopt -s extglob; echo ${CFLAGS/-march=*([^ ])} )
+	export CFLAGS=${CFLAGS/-g/}
+	export CXXFLAGS=${CXXFLAGS/-g/}
+	local conf=()
+	cd third_party/electron_node
+	if [ "$CROSS_BUILD" ]; then
+		conf_args=" --dest-cpu=${target_arch} --cross-compiling"
+	fi
+	./configure --prefix=/usr \
+		--shared-zlib \
+		--shared-libuv \
+		--shared-openssl \
+		--shared-cares \
+		--openssl-use-def-ca-store \
+		--without-npm \
+		--without-dtrace \
+		--without-bundled-v8 \
+		${conf_args}
+
+	cd "$wrksrc/$build_wrksrc"/electron
+	yarn install
+	cd "$wrksrc/$build_wrksrc"
+
+	if [ "$build_option_clang" ]; then
+		export CC=clang
+		export CXX=clang++
+		export HOST_CC=clang
+		export HOST_CXX=clang++
+	else
+		export CXXFLAGS="$CXXFLAGS -fpermissive"
+		export BUILD_CXXFLAGS="$BUILD_CXXFLAGS -fpermissive"
+		export BUILD_AR="$AR_host"
+		export BUILD_NM="$NM_host"
+	fi
+
+	# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
+	# Note: These are for Void Linux use ONLY.
+	conf+=(
+		'google_api_key="AIzaSyA9gWazKaHaNIPPg2hrMj6_ZSG8AFmq738"'
+		'google_default_client_id="126659149423-hoo6ickbk3p1u2qjsdsp0ddciurfvb4t.apps.googleusercontent.com"'
+		'google_default_client_secret="_ozIx2D-DKm_se_2NPwV4l5b"'
+	)
+
+	conf+=(
+		'blink_symbol_level=0'
+		'clang_use_chrome_plugins=false'
+		'custom_toolchain="//build/toolchain/linux/unbundle:default"'
+	)
+	if [ "$CROSS_BUILD" ]; then
+		conf+=(
+			'host_toolchain="//build/toolchain/linux/unbundle:host"'
+			'v8_snapshot_toolchain="//build/toolchain/linux/unbundle:host"'
+			"host_pkg_config=\"$PKG_CONFIG_FOR_BUILD\""
+			"pkg_config=\"$PKG_CONFIG\""
+		)
+	else
+		conf+=(
+			'host_toolchain="//build/toolchain/linux/unbundle:default"'
+			'v8_snapshot_toolchain="//build/toolchain/linux/unbundle:default"'
+		)
+	fi
+	if [ "$build_option_sndio" ]; then
+		conf+=(
+			'use_sndio=true'
+		)
+	fi
+	if [ -n "$XBPS_DEBUG_PKGS" ]; then
+		conf+=('symbol_level=1')
+	else
+		conf+=('symbol_level=0')
+	fi
+	conf+=(
+		'enable_hangout_services_extension=true'
+		'enable_nacl_nonsfi=false'
+		'enable_nacl=false'
+		'enable_precompiled_headers=false'
+		'fatal_linker_warnings=false'
+		'ffmpeg_branding="Chrome"'
+		'fieldtrial_testing_like_official_build=true'
+		'gold_path="/usr/bin/ld.gold"'
+		'icu_use_data_file=true'
+		"is_clang=$(vopt_if clang true false)"
+		'is_component_build=false'
+		"is_debug=$_is_debug"
+		'proprietary_codecs=true'
+		'treat_warnings_as_errors=false'
+		'use_allocator_shim=false'
+		'use_allocator="none"'
+		'use_cups=true'
+		'use_custom_libcxx=false'
+		'use_gnome_keyring=false'
+		'use_gold=false'
+		'use_lld=false'
+		'use_system_libwayland=true'
+		"use_pulseaudio=$(vopt_if pulseaudio 'true' 'false')"
+		"rtc_use_pipewire=$(vopt_if pipewire true false)"
+		'rtc_pipewire_version="0.3"'
+		'use_sysroot=false'
+		'use_system_harfbuzz=true'
+		"target_cpu=\"$target_arch\""
+		"host_cpu=\"$host_arch\""
+		'import("//electron/build/args/release.gn")'
+	)
+
+	msg_normal "Bootstrapping GN\n"
+	CC="${CC_FOR_BUILD:-$CC}" CXX="${CXX_FOR_BUILD:-$CXX}" LD="${LD_FOR_BUILD:-$LD}" \
+	CFLAGS="${CFLAGS_FOR_BUILD:-$CFLAGS}" CXXFLAGS="${CXXFLAGS_FOR_BUILD:-$CXXFLAGS}" \
+	LDFLAGS="${XBPS_LDFLAGS}" \
+		python2 tools/gn/bootstrap/bootstrap.py -s -v --skip-generate-buildfiles
+
+	msg_normal "Configuring build\n"
+	out/Release/gn gen out/$_buildtype --args="${conf[*]}"
+}
+
+do_build() {
+	export CXXFLAGS=$( shopt -s extglob; echo ${CXXFLAGS/-march=*([^ ])} )
+	export CFLAGS=$( shopt -s extglob; echo ${CFLAGS/-march=*([^ ])} )
+	export CFLAGS=${CFLAGS/-g/}
+	export CXXFLAGS=${CXXFLAGS/-g/}
+	if [ "$build_option_clang" ]; then
+		export CC=clang
+		export CXX=clang++
+		export HOST_CC=clang
+		export HOST_CXX=clang++
+	else
+		export BUILD_CXXFLAGS="$BUILD_CXXFLAGS -fpermissive"
+		export CXXFLAGS="$CXXFLAGS -fpermissive"
+		export BUILD_AR="$AR_host"
+		export BUILD_NM="$NM_host"
+	fi
+	msg_normal "Ninja turtles GO!\n"
+	ninja ${makejobs} -C out/$_buildtype electron third_party/electron_node:headers
+	# finish rest of the build
+	strip -s out/$_buildtype/electron
+	ninja ${makejobs} -C out/$_buildtype electron_dist_zip
+}
+
+do_install() {
+	vmkdir /usr/lib/$pkgname
+	vmkdir /usr/include/$pkgname
+	bsdtar -xf out/$_buildtype/dist.zip -C "$DESTDIR/usr/lib/$pkgname"
+
+	chmod u+s "$DESTDIR/usr/lib/$pkgname/chrome-sandbox"
+
+	cp out/$_buildtype/gen/node_headers.tar.gz "$DESTDIR"/usr/include/$pkgname
+
+	vlicense ${wrksrc}/src/LICENSE chromium.LICENSE
+	vlicense ${wrksrc}/src/electron/LICENSE electron.LICENSE
+	vlicense ${wrksrc}/src/third_party/electron_node/LICENSE node.LICENSE
+
+	vmkdir /usr/bin
+	ln -s ../lib/$pkgname/electron "$DESTDIR"/usr/bin/$pkgname
+}
diff --git a/srcpkgs/electron12/update b/srcpkgs/electron12/update
new file mode 100644
index 000000000000..3af8e58b5358
--- /dev/null
+++ b/srcpkgs/electron12/update
@@ -0,0 +1,2 @@
+site=https://www.electronjs.org/releases/stable?version=${version%%.*}
+pattern='tag/v\K[\d\.]+(?=")'

From 05e22a0cdc19cdfe0a05e3676a00903dd7a4ece9 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Mon, 12 Apr 2021 22:39:25 +0300
Subject: [PATCH 1068/2024] element-desktop: update to 1.7.25

closes #30189
---
 srcpkgs/element-desktop/files/element-desktop | 2 +-
 srcpkgs/element-desktop/template              | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/element-desktop/files/element-desktop b/srcpkgs/element-desktop/files/element-desktop
index 41a9b4040204..bf3f41f39d55 100644
--- a/srcpkgs/element-desktop/files/element-desktop
+++ b/srcpkgs/element-desktop/files/element-desktop
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec electron10 /usr/lib/element-desktop/resources/app.asar "$@"
+exec electron12 /usr/lib/element-desktop/resources/app.asar "$@"
diff --git a/srcpkgs/element-desktop/template b/srcpkgs/element-desktop/template
index a83ef4ac93a1..2f6c753e247c 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.24
+version=1.7.25
 revision=1
 wrksrc="element-web-${version}"
 conf_files="/etc/${pkgname}/config.json"
@@ -9,7 +9,7 @@ hostmakedepends="git yarn nodejs rust cargo python3 curl
  app-builder"
 makedepends="libsecret-devel"
 depends="c-ares ffmpeg gtk+3 http-parser libevent
- libxslt minizip nss re2 snappy sqlcipher electron10"
+ libxslt minizip nss re2 snappy sqlcipher electron12"
 short_desc="Glossy Matrix collaboration client, desktop version"
 maintainer="projectmoon <projectmoon@agnos.is>"
 license="Apache-2.0"
@@ -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="b7031155c52985992f4ae920e3a37d6f6f37fe49d70552bcdcb58a59b768d898
- 57dcb4cd5a4387ef009047b66eaf40be7b7eb202e81dd2e22152c70dcb40e39d"
+checksum="33ddceb3538b9bf5ae6104c14d01ea2148e89c689b24d724dd5e60182bf5fe95
+ c38fc7e77c82c655457b244b0e7e5802618aa088ddbbaa9bae4db4185236b972"
 
 export USE_SYSTEM_APP_BUILDER=true
 

From df4b476f68df6e92b22693f015409837fd53a6ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Tue, 13 Apr 2021 20:21:32 +0200
Subject: [PATCH 1069/2024] exiftool: update to 12.24.

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

diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template
index 8a29db2e1e34..b8bf1d7970e8 100644
--- a/srcpkgs/exiftool/template
+++ b/srcpkgs/exiftool/template
@@ -1,6 +1,6 @@
 # Template file for 'exiftool'
 pkgname=exiftool
-version=12.23
+version=12.24
 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=825188ea0721b6db9c35a2fa4cd680342a129f6fa5bae41bb17da2d4299771d1
+checksum=4bbc925eda0072426ffb3b0a6dcedeff173da798fde1efff846a7579854a2f98

From 1c3cf9889da618f95660a2f1660ab22d69f5d72f Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Tue, 13 Apr 2021 17:25:45 +0200
Subject: [PATCH 1070/2024] sigil: update to 1.5.1.

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

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

From 917de5a3618de310d2607a63532b79a7beb03f9d Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Tue, 13 Apr 2021 17:19:58 +0200
Subject: [PATCH 1071/2024] jj: update to 1.7.5.

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

diff --git a/srcpkgs/jj/template b/srcpkgs/jj/template
index 1c2666174acb..2663888781af 100644
--- a/srcpkgs/jj/template
+++ b/srcpkgs/jj/template
@@ -1,6 +1,6 @@
 # Template file for 'jj'
 pkgname=jj
-version=1.7.4
+version=1.7.5
 revision=1
 build_style=go
 go_import_path="github.com/tidwall/jj"
@@ -10,7 +10,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://github.com/tidwall/jj"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=47c51b528754b5e3bea47024ff0b13d1141ee9dab0b8216f6e2472f9c0d83989
+checksum=aa6a0682778601c8d18a8fa334817724be961941213c0379cfca8bda430b3d48
 
 post_install() {
 	vlicense LICENSE

From deb183c3aeea614045a6b86b35cdec1d654b2498 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Tue, 13 Apr 2021 12:10:31 +0300
Subject: [PATCH 1072/2024] python3-adblock: update to 0.4.4

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

diff --git a/srcpkgs/python3-adblock/template b/srcpkgs/python3-adblock/template
index 9c01559bc98d..a5d23c0439f1 100644
--- a/srcpkgs/python3-adblock/template
+++ b/srcpkgs/python3-adblock/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-adblock'
 pkgname=python3-adblock
-version=0.4.3
+version=0.4.4
 revision=1
 wrksrc="${pkgname/python3/python}-${version}"
 build_style=python3-pep517
@@ -16,7 +16,7 @@ license="Apache-2.0, MIT"
 homepage="https://github.com/ArniDagur/python-adblock"
 changelog="https://raw.githubusercontent.com/ArniDagur/python-adblock/master/CHANGELOG.md"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=42f00ff33338eed83c5880ae5f12c70e38154b78fceb19d2f447e86ae34e0f60
+checksum=797cc2bff82e712f867fdb1b7b07ae0dda67020526bddf6413cc97519169d600
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*) broken="compiler throws SIGABRT on the psl crate" ;;

From 63006878c95196bce77db198c3c54afa67294b82 Mon Sep 17 00:00:00 2001
From: Gabriel Sanches <gabriel@gsr.dev>
Date: Mon, 12 Apr 2021 19:02:15 -0300
Subject: [PATCH 1073/2024] minikube: update to 1.19.0.

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

diff --git a/srcpkgs/minikube/template b/srcpkgs/minikube/template
index 7b35584e34a1..eaef07bd086b 100644
--- a/srcpkgs/minikube/template
+++ b/srcpkgs/minikube/template
@@ -1,6 +1,6 @@
 # Template file for 'minikube'
 pkgname=minikube
-version=1.18.1
+version=1.19.0
 revision=1
 build_style=go
 build_helper=qemu
@@ -15,7 +15,7 @@ license="Apache-2.0"
 homepage="https://github.com/kubernetes/minikube"
 changelog="https://raw.githubusercontent.com/kubernetes/minikube/master/CHANGELOG.md"
 distfiles="https://github.com/kubernetes/minikube/archive/v$version.tar.gz"
-checksum=4ade34adf8d33ddd141d436b33cb66d4183e059f8a112ea1aeb1edeae9302594
+checksum=89647d2bba64061154ffc15cf393df1834a9f860b618f699e84696992a1654b3
 
 pre_configure() {
 	case "$XBPS_TARGET_MACHINE" in

From 3fba820fa2cf128a76cf2698b309a53f64ea6a0e Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Tue, 13 Apr 2021 15:16:37 +0200
Subject: [PATCH 1074/2024] go: update to 1.16.3.

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

diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index 652abe8806bf..7ab8307d6974 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,6 +1,6 @@
 # Template file for 'go'
 pkgname=go
-version=1.16.2
+version=1.16.3
 revision=1
 create_wrksrc=yes
 build_wrksrc=go
@@ -11,7 +11,7 @@ license="BSD-3-Clause"
 homepage="http://golang.org/"
 changelog="https://golang.org/doc/devel/release.html"
 distfiles="https://golang.org/dl/go${version}.src.tar.gz"
-checksum=37ca14287a23cb8ba2ac3f5c3dd8adbc1f7a54b9701a57824bf19a0b271f83ea
+checksum=b298d29de9236ca47a023e382313bcc2d2eed31dfa706b60a04103ce83a71a25
 nostrip=yes
 noverifyrdeps=yes
 

From 1dee5e8bf9cf29820c1cf2205bc6b17becc72ccd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 13 Apr 2021 22:02:57 +0200
Subject: [PATCH 1075/2024] diffoscope: update to 172.

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

diff --git a/srcpkgs/diffoscope/template b/srcpkgs/diffoscope/template
index 517e9ee6465d..e84df9738c97 100644
--- a/srcpkgs/diffoscope/template
+++ b/srcpkgs/diffoscope/template
@@ -1,6 +1,6 @@
 # Template file for 'diffoscope'
 pkgname=diffoscope
-version=171
+version=172
 revision=1
 build_style=python3-module
 # file 5.39 causes errors there, see https://bugs.astron.com/view.php?id=170
@@ -16,4 +16,4 @@ license="GPL-3.0-or-later"
 homepage="https://diffoscope.org/"
 changelog="https://salsa.debian.org/reproducible-builds/diffoscope/raw/master/debian/changelog"
 distfiles="${PYPI_SITE}/d/diffoscope/diffoscope-${version}.tar.gz"
-checksum=a14af04a63dd526445b24f358b4856985e637891627b7a0fab90443990850f85
+checksum=5ffe7f38555c6409bc7e7edc277ed77dd78641fe1306fc38d153dbbe445ddea4

From 37f1b134af6d1af16c21e25ded7b3bd06dc43cba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 13 Apr 2021 22:02:58 +0200
Subject: [PATCH 1076/2024] python3-pytest: update to 6.2.3.

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

diff --git a/srcpkgs/python3-pytest/template b/srcpkgs/python3-pytest/template
index 6a38a983b04c..64e730d99d15 100644
--- a/srcpkgs/python3-pytest/template
+++ b/srcpkgs/python3-pytest/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pytest'
 pkgname=python3-pytest
-version=6.2.2
+version=6.2.3
 revision=1
 wrksrc="pytest-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ license="MIT"
 homepage="https://docs.pytest.org/en/latest/"
 changelog="https://docs.pytest.org/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/p/pytest/pytest-${version}.tar.gz"
-checksum=9d1edf9e7d0b84d72ea3dbcdfd22b35fb543a5e8f2a60092dd578936bf63d7f9
+checksum=671238a46e4df0f3498d1c3270e5deb9b32d25134c99b7d75370a68cfbe9b634
 alternatives="
  pytest:pytest:/usr/bin/pytest3
  pytest:py.test:/usr/bin/py.test3"

From fa987bb9d2c6a0aed3b585cce3ae2b72f0119171 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 13 Apr 2021 22:16:37 +0200
Subject: [PATCH 1077/2024] tox: ignore alpha releases

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

diff --git a/srcpkgs/tox/update b/srcpkgs/tox/update
new file mode 100644
index 000000000000..2c857beffb29
--- /dev/null
+++ b/srcpkgs/tox/update
@@ -0,0 +1 @@
+ignore="*a*"

From fca59cec05dab27d8c6d5d704a3f9399687ae98c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 13 Apr 2021 20:49:03 +0200
Subject: [PATCH 1078/2024] python3-PyICU: update to 2.7.1.

---
 srcpkgs/python3-PyICU/template | 17 +++++++++--------
 srcpkgs/python3-PyICU/update   |  1 +
 2 files changed, 10 insertions(+), 8 deletions(-)
 create mode 100644 srcpkgs/python3-PyICU/update

diff --git a/srcpkgs/python3-PyICU/template b/srcpkgs/python3-PyICU/template
index d1e0612a78a0..6d2da03b0536 100644
--- a/srcpkgs/python3-PyICU/template
+++ b/srcpkgs/python3-PyICU/template
@@ -1,22 +1,23 @@
 # Template file for 'python3-PyICU'
 pkgname=python3-PyICU
-version=2.6
+version=2.7.1
 revision=1
-wrksrc="PyICU-${version}"
+wrksrc="pyicu-v${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel icu-devel"
+depends="python3"
 checkdepends="python3-pytest python3-six"
 short_desc="Python extension wrapping the ICU C++ API (Python3)"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="MIT"
-homepage="https://github.com/ovalhub/pyicu"
-changelog="https://raw.githubusercontent.com/ovalhub/pyicu/master/CHANGES"
-distfiles="${PYPI_SITE}/P/PyICU/PyICU-${version}.tar.gz"
-checksum=a9a5bf6833360f8f69e9375b91c1a7dd6e0c9157a42aee5bb7d6891804d96371
+homepage="https://pypi.org/project/PyICU/"
+changelog="https://gitlab.pyicu.org/main/pyicu/-/raw/main/CHANGES"
+distfiles="https://gitlab.pyicu.org/main/pyicu/-/archive/v${version}/pyicu-v${version}.tar.bz2"
+checksum=c36114e39ab62a7c0fba56e8c5256c1eeae05d5207c766d3dd7ed422a8d877a3
 
-do_check() {
-	python3 setup.py test
+pre_check() {
+	export PYTHONPATH=$(cd build/lib* && pwd)
 }
 
 post_install() {
diff --git a/srcpkgs/python3-PyICU/update b/srcpkgs/python3-PyICU/update
new file mode 100644
index 000000000000..879536c9701e
--- /dev/null
+++ b/srcpkgs/python3-PyICU/update
@@ -0,0 +1 @@
+pkgname=pyicu

From 21c27195f5b442d412ab3e2688e47cce67499c64 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 13 Apr 2021 22:47:58 +0200
Subject: [PATCH 1079/2024] electron12: fix ordering of gn bootstrap to fix
 ppc64le build

---
 srcpkgs/electron12/template | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/electron12/template b/srcpkgs/electron12/template
index 5df0eb8486a1..7d1d14eec961 100644
--- a/srcpkgs/electron12/template
+++ b/srcpkgs/electron12/template
@@ -172,6 +172,28 @@ pre_configure() {
 	mkdir -p third_party/node/linux/node-linux-x64/bin
 	ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/
 
+	# compile gn early, so it can be used to generate gni stuff
+	msg_normal "Bootstrapping GN\n"
+	CC="${CC_FOR_BUILD:-$CC}" CXX="${CXX_FOR_BUILD:-$CXX}" LD="${LD_FOR_BUILD:-$LD}" \
+	CFLAGS="${CFLAGS_FOR_BUILD:-$CFLAGS}" CXXFLAGS="${CXXFLAGS_FOR_BUILD:-$CXXFLAGS}" \
+	LDFLAGS="${XBPS_LDFLAGS}" \
+		python2 tools/gn/bootstrap/bootstrap.py -s -v --skip-generate-buildfiles
+
+	# we need to generate ppc64 stuff for libvpx as it's not shipped
+	# this has to be done before unbundling, but after gn is built
+	# comment out if we switch back to system libvpx again later
+	case "$XBPS_TARGET_MACHINE" in
+		ppc64*)
+			pushd third_party/libvpx
+			mkdir -p source/config/linux/ppc64
+			# need PATH to find gn
+			PATH="${wrksrc}/${build_wrksrc}/out/Release:$PATH" \
+				./generate_gni.sh || \
+					msg_error "failed to generate libvpx gni"
+			popd
+			;;
+	esac
+
 	# reusable system library settings
 	local use_system="
 		ffmpeg
@@ -318,12 +340,6 @@ do_configure() {
 		'import("//electron/build/args/release.gn")'
 	)
 
-	msg_normal "Bootstrapping GN\n"
-	CC="${CC_FOR_BUILD:-$CC}" CXX="${CXX_FOR_BUILD:-$CXX}" LD="${LD_FOR_BUILD:-$LD}" \
-	CFLAGS="${CFLAGS_FOR_BUILD:-$CFLAGS}" CXXFLAGS="${CXXFLAGS_FOR_BUILD:-$CXXFLAGS}" \
-	LDFLAGS="${XBPS_LDFLAGS}" \
-		python2 tools/gn/bootstrap/bootstrap.py -s -v --skip-generate-buildfiles
-
 	msg_normal "Configuring build\n"
 	out/Release/gn gen out/$_buildtype --args="${conf[*]}"
 }

From 6c5d91845ac789ae82cbb08480af84679a42bb7d Mon Sep 17 00:00:00 2001
From: Gabriel Sanches <gabriel@gsr.dev>
Date: Mon, 12 Apr 2021 18:12:19 -0300
Subject: [PATCH 1080/2024] kubernetes-kind: set up shell completions.

---
 srcpkgs/kubernetes-kind/template | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/kubernetes-kind/template b/srcpkgs/kubernetes-kind/template
index 4bc298a46685..018127c7818b 100644
--- a/srcpkgs/kubernetes-kind/template
+++ b/srcpkgs/kubernetes-kind/template
@@ -1,9 +1,10 @@
 # Template file for 'kubernetes-kind'
 pkgname=kubernetes-kind
 version=0.10.0
-revision=1
+revision=2
 wrksrc="kind-${version}"
 build_style=go
+build_helper=qemu
 go_import_path="sigs.k8s.io/kind"
 short_desc="Kind is a tool for running local Kubernetes clusters using Docker"
 maintainer="Andy Cobaugh <andrew.cobaugh@gmail.com>"
@@ -11,3 +12,17 @@ license="Apache-2.0"
 homepage="https://kind.sigs.k8s.io/"
 distfiles="https://github.com/kubernetes-sigs/kind/archive/v${version}.tar.gz"
 checksum=@e5511659e3e1735531d4845405782d869d4fb425b545ea89151fd76208a12a49
+_completions="bash zsh fish"
+
+post_build() {
+	local cli=$(find $GOPATH/bin -name kind)
+	for shell in $_completions; do
+		vtargetrun $cli completion $shell > "kind.${shell}"
+	done
+}
+
+post_install() {
+	for shell in $_completions; do
+		vcompletion "kind.${shell}" $shell kind
+	done
+}

From a97391db34c152cc58bea118e295654c48bdb4f8 Mon Sep 17 00:00:00 2001
From: eater <=@eater.me>
Date: Tue, 13 Apr 2021 17:38:11 +0200
Subject: [PATCH 1081/2024] musikcube: update to 0.96.5

---
 .../patches/fix-install-locations.patch       | 143 +++++++++---------
 srcpkgs/musikcube/patches/microhttpd.patch    |  16 --
 srcpkgs/musikcube/template                    |   6 +-
 3 files changed, 74 insertions(+), 91 deletions(-)
 delete mode 100644 srcpkgs/musikcube/patches/microhttpd.patch

diff --git a/srcpkgs/musikcube/patches/fix-install-locations.patch b/srcpkgs/musikcube/patches/fix-install-locations.patch
index 9693c233b571..aaa0d7c16721 100644
--- a/srcpkgs/musikcube/patches/fix-install-locations.patch
+++ b/srcpkgs/musikcube/patches/fix-install-locations.patch
@@ -1,18 +1,68 @@
 Currently all ELF files (binaries and libraries), get installed to /usr/share/musikcube.
 This patch moves all those files to their normal locations and fixes the code to expect that
 
-diff --git src/core/support/Common.cpp src/core/support/Common.cpp
-index f31cde146f..bad24a40b4 100644
---- src/core/support/Common.cpp
-+++ src/core/support/Common.cpp
-@@ -102,65 +102,11 @@ static inline void silentDelete(const std::string fn) {
- namespace musik { namespace core {
+diff --git CMakeLists.txt CMakeLists.txt
+index 7e0ea437..896d45d4 100644
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -193,7 +193,7 @@ if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
+   install(FILES ${plugins} DESTINATION share/musikcube/plugins)
+ else ()
+   file(GLOB plugins "bin/plugins/*.so")
+-  install(FILES ${plugins} DESTINATION share/musikcube/plugins)
++  install(FILES ${plugins} DESTINATION lib/musikcube/plugins)
+ endif ()
+ 
+ file(GLOB sdk_headers "src/musikcore/sdk/*.h")
+@@ -228,20 +228,12 @@ endif()
+ if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
+   install(FILES "bin/libmusikcore.dylib" DESTINATION share/musikcube)
+ else()
+-  install(FILES "bin/libmusikcore.so" DESTINATION share/musikcube)
++  install(FILES "bin/libmusikcore.so" DESTINATION lib/)
+ endif()
+ 
+ # executable and shell script for musikcube
+ install(
+   FILES bin/musikcube
+-  DESTINATION share/musikcube
+-  PERMISSIONS
+-    OWNER_EXECUTE OWNER_READ OWNER_WRITE
+-    GROUP_EXECUTE GROUP_READ GROUP_WRITE
+-    WORLD_EXECUTE WORLD_READ)
+-
+-install(
+-  FILES "${CMAKE_CURRENT_BINARY_DIR}/src/musikcube/musikcube"
+   DESTINATION bin/
+   PERMISSIONS
+     OWNER_EXECUTE OWNER_READ OWNER_WRITE
+@@ -251,14 +243,6 @@ install(
+ # executable and shell script for daemon
+ install(
+   FILES bin/musikcubed
+-  DESTINATION share/musikcube
+-  PERMISSIONS
+-    OWNER_EXECUTE OWNER_READ OWNER_WRITE
+-    GROUP_EXECUTE GROUP_READ GROUP_WRITE
+-    WORLD_EXECUTE WORLD_READ)
+-
+-install(
+-  FILES "${CMAKE_CURRENT_BINARY_DIR}/src/musikcubed/musikcubed"
+   DESTINATION bin/
+   PERMISSIONS
+     OWNER_EXECUTE OWNER_READ OWNER_WRITE
+diff --git src/musikcore/support/Common.cpp src/musikcore/support/Common.cpp
+index 9e327b63..08f49351 100644
+--- src/musikcore/support/Common.cpp
++++ src/musikcore/support/Common.cpp
+@@ -86,64 +86,11 @@ namespace musik { namespace core {
+     }
  
      std::string GetPluginDirectory() {
 -        std::string path(GetApplicationDirectory());
 -        path.append("/plugins/");
 -        return path;
-+        return std::string("/usr/lib/musikcube/plugins");
++      return std::string("/usr/lib/musikcube/plugins");
      }
  
      std::string GetApplicationDirectory() {
@@ -43,83 +93,32 @@ index f31cde146f..bad24a40b4 100644
 -                size_t bufsize = sizeof(pathbuf);
 -                sysctl(mib, 4, pathbuf, &bufsize, nullptr, 0);
 -            #elif defined  __OpenBSD__
--			    int mib[4];
--			    char **argv;
--			    size_t len = ARG_MAX;
+-                int mib[4];
+-                char **argv;
+-                size_t len = ARG_MAX;
 -
--			    mib[0] = CTL_KERN;
--			    mib[1] = KERN_PROC_ARGS;
--			    mib[2] = getpid();
--			    mib[3] = KERN_PROC_ARGV;
+-                mib[0] = CTL_KERN;
+-                mib[1] = KERN_PROC_ARGS;
+-                mib[2] = getpid();
+-                mib[3] = KERN_PROC_ARGV;
 -
--			    argv = new char*[len];
--			    if (sysctl(mib, 4, argv, &len, nullptr, 0) < 0) abort();
+-                argv = new char*[len];
+-                if (sysctl(mib, 4, argv, &len, nullptr, 0) < 0) abort();
 -
--			    boost::filesystem::path command = boost::filesystem::system_complete(argv[0]);
--			    realpath(command.c_str(), pathbuf);
--			    delete[] argv;
+-                boost::filesystem::path command = boost::filesystem::system_complete(argv[0]);
+-                realpath(command.c_str(), pathbuf);
+-                delete[] argv;
 -            #else
 -                std::string pathToProc = u8fmt("/proc/%d/exe", (int) getpid());
 -                readlink(pathToProc.c_str(), pathbuf, PATH_MAX);
--	    #endif
--
+-        #endif
 -            result.assign(pathbuf);
 -            size_t last = result.find_last_of("/");
 -            result = result.substr(0, last); /* remove filename component */
 -        #endif
 -
 -        return result;
-+	return std::string("/usr/share/musikcube");
++      return std::string("/usr/share/musikcube");
      }
  
      std::string GetHomeDirectory() {
-diff --git CMakeLists.txt CMakeLists.txt
-index 3850e4050f..063e09f718 100644
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -223,7 +223,7 @@ if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
-   install(FILES ${plugins} DESTINATION share/musikcube/plugins)
- else ()
-   file(GLOB plugins "bin/plugins/*.so")
--  install(FILES ${plugins} DESTINATION share/musikcube/plugins)
-+  install(FILES ${plugins} DESTINATION lib/musikcube/plugins)
- endif ()
- 
- file(GLOB sdk_headers "src/core/sdk/*.h")
-@@ -257,20 +257,12 @@ endif()
- if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
-   install(FILES "bin/libmusikcore.dylib" DESTINATION share/musikcube)
- else()
--  install(FILES "bin/libmusikcore.so" DESTINATION share/musikcube)
-+  install(FILES "bin/libmusikcore.so" DESTINATION lib/)
- endif()
- 
- # executable and shell script for musikcube
- install(
-   FILES bin/musikcube
--  DESTINATION share/musikcube
--  PERMISSIONS
--    OWNER_EXECUTE OWNER_READ OWNER_WRITE
--    GROUP_EXECUTE GROUP_READ GROUP_WRITE
--    WORLD_EXECUTE WORLD_READ)
--
--install(
--  FILES "${CMAKE_CURRENT_BINARY_DIR}/src/musikcube/musikcube"
-   DESTINATION bin/
-   PERMISSIONS
-     OWNER_EXECUTE OWNER_READ OWNER_WRITE
-@@ -280,14 +272,6 @@ install(
- # executable and shell script for daemon
- install(
-   FILES bin/musikcubed
--  DESTINATION share/musikcube
--  PERMISSIONS
--    OWNER_EXECUTE OWNER_READ OWNER_WRITE
--    GROUP_EXECUTE GROUP_READ GROUP_WRITE
--    WORLD_EXECUTE WORLD_READ)
--
--install(
--  FILES "${CMAKE_CURRENT_BINARY_DIR}/src/musikcubed/musikcubed"
-   DESTINATION bin/
-   PERMISSIONS
-     OWNER_EXECUTE OWNER_READ OWNER_WRITE
diff --git a/srcpkgs/musikcube/patches/microhttpd.patch b/srcpkgs/musikcube/patches/microhttpd.patch
deleted file mode 100644
index dc807dbf6bf4..000000000000
--- a/srcpkgs/musikcube/patches/microhttpd.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Although musikcube thinks that MHD (microhttpd) version 0.9.70
-defines MHD_Result, the headers installed by our version 0.9.70
-(see PR 247180) don't define that type. So bump the version
-check here trivially, to keep using int.
- 
---- src/plugins/server/HttpServer.h.orig	2020-07-18 17:58:19 UTC
-+++ src/plugins/server/HttpServer.h
-@@ -43,7 +43,7 @@ extern "C" {
- #include <mutex>
- #include <vector>
- 
--#if MHD_VERSION < 0x00097000
-+#if MHD_VERSION < 0x00097001
- #define MHD_Result int
- #endif
- 
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index bf42f9e53c25..633432afe5ad 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
 # Template file for 'musikcube'
 pkgname=musikcube
-version=0.93.1
-revision=3
+version=0.96.4
+revision=1
 build_style=cmake
 make_cmd=make
 configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=true -DDISABLE_STRIP=true"
@@ -15,7 +15,7 @@ maintainer="eater <=@eater.me>"
 license="BSD-3-Clause"
 homepage="https://musikcube.com/"
 distfiles="https://github.com/clangen/musikcube/archive/${version}.tar.gz"
-checksum=e84e060acaab40266cc3d866f50f727c770c42273a5219fff5d6757186dbad21
+checksum=c184fe12a62da15f6dfabab885a991f5ad49065fcc7e1bef2b2892b15ed7bb99
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 431cedf2776c96584f89defa331ed09779a11904 Mon Sep 17 00:00:00 2001
From: Gadzhi Kharkharov <me@kkga.me>
Date: Wed, 14 Apr 2021 00:57:57 +0300
Subject: [PATCH 1082/2024] lf: update to r22.

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

diff --git a/srcpkgs/lf/template b/srcpkgs/lf/template
index e3a467f9aa9d..ad24f6d971f7 100644
--- a/srcpkgs/lf/template
+++ b/srcpkgs/lf/template
@@ -1,6 +1,6 @@
 # Template file for 'lf'
 pkgname=lf
-version=r21
+version=r22
 revision=1
 build_style=go
 go_import_path="github.com/gokcehan/${pkgname}"
@@ -10,7 +10,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"
 homepage="https://github.com/gokcehan/lf"
 distfiles="https://github.com/gokcehan/lf/archive/${version}.tar.gz"
-checksum=088510cc1f86084c02353d55e56a8c44576b5dbfc37327daabaa86ae6b287a20
+checksum=2da82d8c6108b14ce866f49a308d2c7afc0d79bc4254a395e5b4cf07f3fe2c97
 
 post_install() {
 	vlicense LICENSE

From 38201d64f390e035134723d7378a5610f2dd6641 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 13 Apr 2021 22:16:03 -0400
Subject: [PATCH 1083/2024] sof-firmware: update to 1.7

The installation method utilizing the go.sh script included in the tarball no longer works.
As per the issue created on the topic (thesofproject/sof-bin#38), I have used rsync to copy
the files into the correct DESTDIR directories.
---
 srcpkgs/sof-firmware/template | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/sof-firmware/template b/srcpkgs/sof-firmware/template
index 544ce9c5893e..677fe02c3b79 100644
--- a/srcpkgs/sof-firmware/template
+++ b/srcpkgs/sof-firmware/template
@@ -1,23 +1,23 @@
 # Template file for 'sof-firmware'
 pkgname=sof-firmware
-version=1.6.1
-revision=2
+version=1.7
+revision=1
 archs="i686* x86_64*"
 wrksrc="sof-bin-${version}"
+hostmakedepends="rsync"
 depends="alsa-ucm-conf"
 short_desc="Sound Open Firmware and topology binaries"
 maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="BSD-3-Clause"
 homepage="https://thesofproject.github.io/latest/index.html"
-distfiles="https://github.com/thesofproject/sof-bin/archive/v${version}.tar.gz"
-checksum=587b320030bc84de1aacba5d86d89ba1a4f67201baf8b9b61bb885af60643bfb
+distfiles="https://github.com/thesofproject/sof-bin/archive/refs/tags/v${version}.tar.gz"
+checksum=895d0199c06fc9b8bd8452fffff4f0d53134af451f63ffd1b78f04b10ef6c251
 
 do_install() {
-	vlicense LICENCE.NXP
-
-	export ROOT="${DESTDIR}/usr"
-	export SOF_VERSION="v${version}"
+	vmkdir usr/lib/firmware/intel/sof
+	vmkdir usr/lib/firmware/intel/sof-tplg
+	rsync -a "sof-v${version}/" "${DESTDIR}/usr/lib/firmware/intel/sof"
+	rsync -a "sof-tplg-v${version}/" "${DESTDIR}/usr/lib/firmware/intel/sof-tplg"
 
-	vmkdir usr/lib/firmware/intel
-	./go.sh
+	vlicense LICENCE.NXP
 }

From b2a2bcc86d0a4bb9f29fd4cefe5a787438468065 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 22:14:50 -0700
Subject: [PATCH 1084/2024] hitori: update to 3.38.1, fix test, fix license

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

diff --git a/srcpkgs/hitori/template b/srcpkgs/hitori/template
index 061990af5058..8a50efea3e63 100644
--- a/srcpkgs/hitori/template
+++ b/srcpkgs/hitori/template
@@ -1,13 +1,14 @@
 # Template file for 'hitori'
 pkgname=hitori
-version=3.38.0
+version=3.38.1
 revision=1
 build_style=meson
 hostmakedepends="gettext glib-devel intltool itstool pkg-config"
 makedepends="gtk+3-devel"
+checkdepends="gtk+3-demo"
 short_desc="GNOME eponymous puzzle game"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Hitori"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d8bd64e91e2eef2e65614374508d5b070a285de4fc3c2989e21c55ff085c4b3e
+checksum=02bd2c421d4e2180265714e854bd12efd3c6d156ddf21f79e7df60011d4e4184

From 2d41bcb52090db891abd3ebfb734ab822a94510c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 14 Apr 2021 10:52:58 +0200
Subject: [PATCH 1085/2024] linux5.10: update to 5.10.30.

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

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 1159ae5b9639..3c1bd00d1975 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.29
+version=5.10.30
 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=158c6746c11a90645b4d40bdb5c049d9fac7e4c9ed381c9b7aa94db1a8e7e9ec
+checksum=d40269b5ac5c8424ec808f4484c7f80947f8f2d549b1ef1a5149aec5b6a20640
 python_version=3
 patch_args="-Np1"
 

From fd018c0a9db15332ca50818f81ca7b80d7449e48 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Wed, 14 Apr 2021 11:05:40 +0200
Subject: [PATCH 1086/2024] vscode: update to 1.55.2

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

diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index b3d037f65314..16c925c3d90d 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.55.1
+version=1.55.2
 revision=1
 _electronver=9.4.1
 hostmakedepends="pkg-config python nodejs yarn tar git"
@@ -11,7 +11,7 @@ maintainer="shizonic <realtiaz@gmail.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=6fe56f9328ded06b38b29de4f545fc82007006cac18bdea8961637e25025d4a2
+checksum=43cb929a0fd3d569ff8a734df7a97a02c3d1107eda4c195d97835e6d08432cbc
 patch_args="-Np1"
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then

From 758cfb155136ad049ae6e9a5f3caec3864d948be Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Wed, 14 Apr 2021 11:15:30 +0200
Subject: [PATCH 1087/2024] volta: update to 1.0.3

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

diff --git a/srcpkgs/volta/template b/srcpkgs/volta/template
index d6b4f67774a2..7f82c979afaa 100644
--- a/srcpkgs/volta/template
+++ b/srcpkgs/volta/template
@@ -1,6 +1,6 @@
 # Template file for 'volta'
 pkgname=volta
-version=1.0.2
+version=1.0.3
 revision=2
 archs="x86_64" # Due to volta pulling pre-built binaries later. Evil.
 build_style="cargo"
@@ -11,7 +11,7 @@ maintainer="Alex Lohr <alex.lohr@logmein.com>"
 license="BSD-2-Clause"
 homepage="https://volta.sh/"
 distfiles="https://github.com/volta-cli/volta/archive/v${version}.tar.gz"
-checksum=83659888099408dbc44d47a6bba6c3d450ebd11580f74fd3e64ab6c1adbb5724
+checksum=19edec309676d5d345e0686cc3ea2cd0a5815f01a12e88e5b7c63a7ce961c6d1
 
 post_install() {
 	vlicense LICENSE

From 5c624f3bb09e097d1423d8d8d870ac8f8b46c74e Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Wed, 14 Apr 2021 11:20:05 +0200
Subject: [PATCH 1088/2024] google-chrome: update to 89.0.4389.128

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

diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template
index a9663b7e8949..ce901a7eb546 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,5 +1,5 @@
 # Template file for 'google-chrome'
-_chromeVersion=89.0.4389.114
+_chromeVersion=89.0.4389.128
 _chromeRevision=1
 _channel=stable
 
@@ -22,7 +22,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=0ab92895e8b1b93a8d2591e0f89b32554af2ffc5a6f2bf9c1860a4ecb7a78b1b
+checksum=1903d5f17ccdbc47bf8e07e15529a22118b192b847846a1b74f54883b11fa41e
 
 do_extract() {
 	mkdir -p ${DESTDIR}

From e5e1fcaa018a13b3a9c2da9495b078ae8ef19074 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 14 Apr 2021 12:26:14 +0300
Subject: [PATCH 1089/2024] notcurses: update to 2.2.6.

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

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

From a962f72c7c61ecdabcfa210bee35b713665c7ffc Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 14 Apr 2021 12:39:43 +0300
Subject: [PATCH 1090/2024] exo: update to 4.16.2.

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

diff --git a/srcpkgs/exo/template b/srcpkgs/exo/template
index 67f2d595f2cc..65ff908fb98b 100644
--- a/srcpkgs/exo/template
+++ b/srcpkgs/exo/template
@@ -1,6 +1,6 @@
 # Template file for 'exo'
 pkgname=exo
-version=4.16.1
+version=4.16.2
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --with-locales-dir=/usr/share/locale"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://xfce.org/"
 distfiles="https://archive.xfce.org/src/xfce/exo/${version%.*}/exo-${version}.tar.bz2"
-checksum=528dac256315ffc2a4a53b3b421979327962121989886e3cf920aeff9912b53b
+checksum=4e89f5536afbf1cb9191cceb720fb2764df1a4fae3459512b7320841ab5a9e9d
 
 pre_configure() {
 	if [ "$CROSS_BUILD" ]; then

From ae9fe5c6abb9a5b70deb15d43421c7a38b4959a9 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 14 Apr 2021 12:44:49 +0300
Subject: [PATCH 1091/2024] git-extras: update to 6.2.0.

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

diff --git a/srcpkgs/git-extras/template b/srcpkgs/git-extras/template
index 8aa97990db5c..948e5e01f929 100644
--- a/srcpkgs/git-extras/template
+++ b/srcpkgs/git-extras/template
@@ -1,6 +1,6 @@
 # Template file for 'git-extras'
 pkgname=git-extras
-version=6.1.0
+version=6.2.0
 revision=1
 build_style=gnu-makefile
 depends="bash git"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/tj/git-extras"
 distfiles="https://github.com/tj/git-extras/archive/${version}.tar.gz"
-checksum=7be0b15ee803d76d2c2e8036f5d9db6677f2232bb8d2c4976691ff7ae026a22f
+checksum=151bc129f717179c1f7b6c83faf1d4829eeddef8b7c501dac05dc38c28270c3e
 
 post_patch() {
 	vsed -i 's|$(SYSCONFDIR)/bash_completion.d|/usr/share/bash-completion/completions|' Makefile

From b59bdf6892b2d67ed48d20b8e7789ce619bb6717 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 14 Apr 2021 12:54:07 +0300
Subject: [PATCH 1092/2024] xfce4-settings: update to 4.16.1.

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

diff --git a/srcpkgs/xfce4-settings/template b/srcpkgs/xfce4-settings/template
index 90b07210e85f..eff276773715 100644
--- a/srcpkgs/xfce4-settings/template
+++ b/srcpkgs/xfce4-settings/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-settings'
 pkgname=xfce4-settings
-version=4.16.0
-revision=3
+version=4.16.1
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale
  --enable-sound-settings --enable-pluggable-dialogs --enable-xrandr"
@@ -16,4 +16,4 @@ license="GPL-2.0-only"
 homepage="https://xfce.org/"
 changelog="https://raw.githubusercontent.com/xfce-mirror/xfce4-settings/xfce-4.14/NEWS"
 distfiles="https://archive.xfce.org/src/xfce/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=67a1404fc754c675c6431e22a8fe0e5d79644fdfadbfe25a4523d68e1442ddc2
+checksum=bb28e1be7aa34d0edb1cfbaacc509a4267db56828b36cd6be312a202973635c6

From 8d7c960dd4f719a42daa580e3815aba23998a14c Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 18:34:28 -0700
Subject: [PATCH 1093/2024] hans: fix license

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

diff --git a/srcpkgs/hans/template b/srcpkgs/hans/template
index 58624c9802c7..6a63dbd5f327 100644
--- a/srcpkgs/hans/template
+++ b/srcpkgs/hans/template
@@ -1,10 +1,10 @@
 # Template file for 'hans'
 pkgname=hans
 version=1.0
-revision=1
+revision=2
 short_desc="ICMP tunneling software"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="http://code.gerade.org/hans/"
 distfiles="https://github.com/friedrich/$pkgname/archive/v$version.tar.gz"
 checksum=53090083d440466e573b35f2eeab0b4b0dcd3e6290f797c999b4f5a0b5caaba2

From 424db9db61506a1ff0d79f87b0d1cfa79a1695ad Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 21:47:42 -0700
Subject: [PATCH 1094/2024] hdf5: clarify license

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

diff --git a/srcpkgs/hdf5/template b/srcpkgs/hdf5/template
index e035fa670ab7..915d287cd32f 100644
--- a/srcpkgs/hdf5/template
+++ b/srcpkgs/hdf5/template
@@ -1,14 +1,14 @@
 # Template file for 'hdf5'
 pkgname=hdf5
 version=1.10.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-cxx --enable-fortran"
 hostmakedepends="gcc-fortran"
 makedepends="zlib-devel"
 short_desc="Data model, library, and file format for storing and managing data"
 maintainer="pulux <pulux@pf4sh.de>"
-license="custom"
+license="custom:BSD-3-Clause-LBNL-alike"
 homepage="https://hdfgroup.org"
 distfiles="https://www.hdfgroup.org/ftp/HDF5/current/src/hdf5-${version}.tar.gz"
 checksum=6d4ce8bf902a97b050f6f491f4268634e252a63dadd6656a1a9be5b7b7726fa8

From 2633cbc40af94203f5b7cdab60ad1c4a0464e509 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 22:00:18 -0700
Subject: [PATCH 1095/2024] hex2hcd: fix license

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

diff --git a/srcpkgs/hex2hcd/template b/srcpkgs/hex2hcd/template
index 60e4997021ab..c8d066ed3a45 100644
--- a/srcpkgs/hex2hcd/template
+++ b/srcpkgs/hex2hcd/template
@@ -1,12 +1,12 @@
 # Template file for 'hex2hcd'
 pkgname=hex2hcd
 version=2016.02.21
-revision=2
+revision=3
 build_style=gnu-makefile
 short_desc="Convert *.hex firmware files to *.hcd format"
 maintainer="Antonio Malcolm <antonio@antoniomalcolm.com>"
+license="GPL-2.0-or-later"
 homepage="https://github.com/antonio-malcolm/hex2hcd"
-license="GPL-2"
 distfiles="${homepage}/archive/${version}.tar.gz"
 checksum=45cab33daa404c6e66979abea975f11cb5705152c7723a2a16391f5fd1ba847b
 conflicts="bluez" # /usr/bin/hex2hcd

From d426ed83528e0fa8e75a137a57f00ea4545d5afc Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 22:02:22 -0700
Subject: [PATCH 1096/2024] heyu: fix license

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

diff --git a/srcpkgs/heyu/template b/srcpkgs/heyu/template
index 6c2999fd29f5..93b3ad7cc582 100644
--- a/srcpkgs/heyu/template
+++ b/srcpkgs/heyu/template
@@ -1,13 +1,13 @@
 # Template file for 'heyu'
 pkgname=heyu
 version=2.10.1
-revision=2
+revision=3
 build_style=configure
 configure_script="./Configure"
 configure_args="linux"
 short_desc="X10 automation for Linux"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="http://www.heyu.org"
 distfiles="https://github.com/HeyuX10Automation/heyu/archive/v${version}.tar.gz"
 checksum=621a20f45eef62070b3f95ad17ecbc3e7e1f7352d25dac86093ff6938b606baa

From 2f6d7593047dc25daccdd4331d4d5f5676569fbe Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 22:18:23 -0700
Subject: [PATCH 1097/2024] hnb: fix license

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

diff --git a/srcpkgs/hnb/template b/srcpkgs/hnb/template
index 5721e32d121c..45460afa1fd1 100644
--- a/srcpkgs/hnb/template
+++ b/srcpkgs/hnb/template
@@ -1,11 +1,11 @@
 # Template file for 'hnb'
 pkgname=hnb
 version=1.9.17
-revision=2
+revision=3
 makedepends="ncurses-devel"
-short_desc="A curses program to structure many kinds of data in one place"
+short_desc="Curses program to structure many kinds of data in one place"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://hnb.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/hnb/hnb/${version}/hnb-${version}.tar.gz"
 checksum=c233c00aaef5b7fb93759d7888c885f99f40aec689a7f3e0d5d8b5797bf80cd4

From 92109375e271e976400491ae4d5ced9874fa3f42 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 22:25:12 -0700
Subject: [PATCH 1098/2024] httpry: fix license, other lint

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

diff --git a/srcpkgs/httpry/template b/srcpkgs/httpry/template
index fca0351703bc..b1f1890cdaca 100644
--- a/srcpkgs/httpry/template
+++ b/srcpkgs/httpry/template
@@ -1,19 +1,19 @@
 # Template file for 'httpry'
 pkgname=httpry
 version=0.1.8
-revision=1
+revision=2
+wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-makefile
 makedepends="libpcap-devel"
 short_desc="HTTP logging and information retrieval tool"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
+license="GPL-2.0-only"
 homepage="http://dumpsterventures.com/jason/httpry/"
-license="GPL-2"
 distfiles="https://github.com/jbittel/${pkgname}/archive/${pkgname}-${version}.tar.gz"
 checksum=b3bcbec3fc6b72342022e940de184729d9cdecb30aa754a2c994073447468cf0
-wrksrc="${pkgname}-${pkgname}-${version}"
 
 post_extract() {
-	sed -i -e'/^CC /d' \
+	vsed -i -e'/^CC /d' \
 		-e 's/^CCFLAGS .*/CCFLAGS=$(CFLAGS) $(LDFLAGS)/' Makefile
 }
 

From 935b2f61f87cb306dd0285501cd637418e510f10 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 22:31:04 -0700
Subject: [PATCH 1099/2024] httrack: fix license, other lint

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

diff --git a/srcpkgs/httrack/template b/srcpkgs/httrack/template
index 090ec56ca85d..31dcf7ebe1e9 100644
--- a/srcpkgs/httrack/template
+++ b/srcpkgs/httrack/template
@@ -1,16 +1,16 @@
 # Template file for 'httrack'
 pkgname=httrack
 version=3.49.2
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--disable-static --with-zlib=${XBPS_CROSS_BASE}/usr"
-short_desc="A free and easy-to-use offline browser utility"
+makedepends="zlib-devel openssl-devel"
+short_desc="Free and easy-to-use offline browser utility"
 maintainer="mid-kid <esteve.varela@gmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="http://www.httrack.com"
 distfiles="http://mirror.httrack.com/httrack-${version}.tar.gz"
 checksum=3477a0e5568e241c63c9899accbfcdb6aadef2812fcce0173688567b4c7d4025
-makedepends="zlib-devel openssl-devel"
 
 httrack-devel_package() {
 	short_desc+=" - development files"

From adc336ed85f47706472165d6ab2aca832591920c Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 22:37:57 -0700
Subject: [PATCH 1100/2024] hyphen: fix license

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

diff --git a/srcpkgs/hyphen/template b/srcpkgs/hyphen/template
index 601c94277c09..3bbc84659c41 100644
--- a/srcpkgs/hyphen/template
+++ b/srcpkgs/hyphen/template
@@ -1,16 +1,20 @@
-# Template file for 'altlinuxHyph'
+# Template file for 'hyphen'
 pkgname=hyphen
 version=2.8.8
-revision=2
+revision=3
 build_style=gnu-configure
-short_desc="ALTLinux hyphenation library"
 hostmakedepends="perl"
+short_desc="ALTLinux hyphenation library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-3"
+license="GPL-2.0-or-later, LGPL-2.1-or-later, MPL-1.1"
 homepage="http://sourceforge.net/projects/hunspell/files/Hyphen"
 distfiles="${SOURCEFORGE_SITE}/hunspell/$pkgname-$version.tar.gz"
 checksum=304636d4eccd81a14b6914d07b84c79ebb815288c76fe027b9ebff6ff24d5705
 
+post_install() {
+	vlicense COPYING
+}
+
 hyphen-tools_package() {
 	depends="hyphen>=${version}_${revision}"
 	short_desc+=" - tools"

From 1a6c186d96f7be8c1c3c57acfa8fe263b23cf24d Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Tue, 13 Apr 2021 22:15:10 +0200
Subject: [PATCH 1101/2024] mkvtoolnix: update to 56.1.0, enable unit tests

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

diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index a6606d0adca1..efce272baacb 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,6 +1,6 @@
 # Template file for 'mkvtoolnix'
 pkgname=mkvtoolnix
-version=55.0.0
+version=56.1.0
 revision=1
 build_style=gnu-configure
 build_helper=qmake
@@ -10,13 +10,14 @@ hostmakedepends="autoconf docbook-xsl gettext libxslt pkg-config qt5-tools-devel
 makedepends="boost-devel cmark-devel file-devel fmt-devel json-c++ libdvdread-devel
  libflac-devel libmatroska-devel libvorbis-devel pcre2-devel pugixml-devel
  qt5-multimedia-devel qt5-tools-devel"
+checkdepends="gtest-devel"
 short_desc="Create, alter and inspect Matroska videos"
 maintainer="Matthias von Faber <mvf@gmx.eu>"
 license="GPL-2.0-only"
 homepage="https://mkvtoolnix.download"
 changelog="https://mkvtoolnix.download/doc/NEWS.md"
 distfiles="https://mkvtoolnix.download/sources/${pkgname}-${version}.tar.xz"
-checksum=6061639bda18adbf5c49264d5498fd2abab420113ba680d0eb441a9aa02afba6
+checksum=75ff6476e7c4eab10c315af4e2dd78f1399d35da7c4611a8f93f4c3c0b475f72
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boost=${XBPS_CROSS_BASE}/usr"
@@ -28,6 +29,9 @@ pre_configure() {
 do_build() {
 	rake ${makejobs}
 }
+do_check() {
+	rake tests:run_unit
+}
 do_install() {
 	rake DESTDIR=${DESTDIR} install
 }

From ff3ec0ff1ee9a935106c289bb934dcff08e6cb28 Mon Sep 17 00:00:00 2001
From: Warren Daniel <warren@vaft.net>
Date: Sun, 11 Apr 2021 23:54:39 -0400
Subject: [PATCH 1102/2024] sabnzbd: update to 3.2.1.

Also add dependency python3-Cheroot, per requirements.txt:
https://github.com/sabnzbd/sabnzbd/blob/3.2.1/requirements.txt

Closes: #30175 [via git-merge-pr]
---
 srcpkgs/sabnzbd/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/sabnzbd/template b/srcpkgs/sabnzbd/template
index ed3dd23016ba..1d3c9f9942b7 100644
--- a/srcpkgs/sabnzbd/template
+++ b/srcpkgs/sabnzbd/template
@@ -1,12 +1,12 @@
 # Template file for 'sabnzbd'
 pkgname=sabnzbd
-version=3.0.2
+version=3.2.1
 revision=1
 wrksrc="SABnzbd-${version}"
 pycompile_dirs="/usr/share/sabnzbd"
 hostmakedepends="python3 gettext"
 depends="par2cmdline python3-sabyenc3 python3-cheetah3 python3-cryptography
- python3-feedparser python3-configobj python3-CherryPy
+ python3-feedparser python3-configobj python3-CherryPy python3-Cheroot
  python3-portend python3-chardet python3-notify2 unzip"
 short_desc="Open Source Binary Newsreader written in Python"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later, custom:Bundled"
 homepage="https://sabnzbd.org/"
 changelog="https://github.com/sabnzbd/sabnzbd/releases"
 distfiles="https://github.com/sabnzbd/sabnzbd/releases/download/${version}/SABnzbd-${version}-src.tar.gz"
-checksum=c93f95d9193061ba653c2ab592704c7a8e9b6146817f80e4e2420b3f74b976b2
+checksum=79c2bb46e41f2316e4c2827b61598157fbc9467ecddaca6fc4f0b2f4e7b8f809
 python_version=3
 
 post_extract() {

From 88570d537a9e061d04fb24083e119798782195f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 14 Apr 2021 09:03:23 -0300
Subject: [PATCH 1103/2024] curl: update to 7.76.1.

Includes fix for <time.h> and gmtime_r usage.
---
 srcpkgs/curl/template | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index f8a721a2cbad..7a9d588d9ecb 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -1,7 +1,7 @@
 # Template file for 'curl'
 pkgname=curl
-version=7.76.0
-revision=2
+version=7.76.1
+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,15 +21,12 @@ license="MIT"
 homepage="https://curl.haxx.se"
 changelog="https://curl.haxx.se/changes.html#${version//./_}"
 distfiles="${homepage}/download/${pkgname}-${version}.tar.bz2"
-checksum=e29bfe3633701590d75b0071bbb649ee5ca4ca73f00649268bd389639531c49a
+checksum=7a8e184d7d31312c4ebf6a8cb59cd757e61b2b2833a9ed4f9bf708066e7695e9
 patch_args="-Np1"
 build_options="gnutls gssapi ldap rtmp ssh ssl zstd"
 build_options_default="ssh ssl zstd"
 vopt_conflict ssl gnutls
 
-# force usage of gmtime_r, fix in https://github.com/curl/curl/pull/6859
-CFLAGS="-DHAVE_GMTIME_R -DTIME_WITH_SYS_TIME"
-
 pre_configure() {
 	export CFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=2/}"
 	export CFLAGS="${CFLAGS/-I${XBPS_CROSS_BASE}\/usr\/include/}"

From 1836f35ef19e054028addf73a84e45ea353b43f6 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Tue, 13 Apr 2021 03:36:18 +0200
Subject: [PATCH 1104/2024] grub-btrfs: update to 4.9.

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

diff --git a/srcpkgs/grub-btrfs/template b/srcpkgs/grub-btrfs/template
index 8c1a2f5954c9..0e646c9c3f82 100644
--- a/srcpkgs/grub-btrfs/template
+++ b/srcpkgs/grub-btrfs/template
@@ -1,6 +1,6 @@
 # Template file for 'grub-btrfs'
 pkgname=grub-btrfs
-version=4.8.1
+version=4.9
 revision=1
 build_style=gnu-makefile
 depends="grub bash"
@@ -9,7 +9,7 @@ maintainer="Anjandev Momi <anjan@momi.ca>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Antynea/grub-btrfs"
 distfiles="https://github.com/Antynea/grub-btrfs/archive/v${version}.tar.gz"
-checksum=a0092e705adc91fbb73804327abe68002fa705ea7a4948bb21467134c7f69830
+checksum=62461133c697643e98a608239773f500edee3e4055c5729fef6639d1cd610243
 
 post_install() {
 	rm -rf -- "${DESTDIR}"/usr/lib/systemd

From 36dfbe7dd0226050df661e4bd3eb53a578c2f9d5 Mon Sep 17 00:00:00 2001
From: Mate GABRI <mate.gabri@playhq.com>
Date: Mon, 12 Apr 2021 08:54:55 +1000
Subject: [PATCH 1105/2024] kubernetes-helm: update to 3.5.3

---
 srcpkgs/kubernetes-helm/template | 23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/srcpkgs/kubernetes-helm/template b/srcpkgs/kubernetes-helm/template
index 42f8d1bd443c..b5c1b398bf27 100644
--- a/srcpkgs/kubernetes-helm/template
+++ b/srcpkgs/kubernetes-helm/template
@@ -1,7 +1,7 @@
 # Template file for 'kubernetes-helm'
 pkgname=kubernetes-helm
-version=3.3.1
-revision=1
+version=3.5.3
+revision=2
 wrksrc="helm-${version}"
 hostmakedepends="go make git mercurial tar"
 short_desc="Kubernetes Package Manager"
@@ -9,7 +9,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="Apache-2.0"
 homepage="https://helm.sh/"
 distfiles="https://github.com/helm/helm/archive/v${version}.tar.gz"
-checksum=7a0ca710683d264bfa79eeed61f1dfd90db2cc755cbc1d1e9ccbb43ec55917b6
+checksum=bd3e2488011e0a73650e810cf540fcfcfcb828ff1480cc2c5a1e50934cad9d82
 conflicts="helm"
 nopie=true
 
@@ -35,23 +35,10 @@ do_extract() {
 		helm-${version}
 }
 
-pre_build() {
-	export GOPATH="$(pwd)/golib"
-
-	## The current version of glide in the repository has
-	## a bug that prevents building, so pull the current
-	## version from git.
-	CC=/bin/gcc go get github.com/Masterminds/glide
-	CC=/bin/gcc go get github.com/mitchellh/gox
-	CC=/bin/gcc go install github.com/Masterminds/glide
-	CC=/bin/gcc go install github.com/mitchellh/gox
-	PATH="$PATH:$(pwd)/golib/bin/"
-	export PATH
-}
-
 do_build() {
 	cd golib/src/k8s.io/helm
-	make build-cross TARGETS="linux/${_go_target_arch} linux/${_go_host_arch}" APP="..." LDFLAGS="-X k8s.io/helm/pkg/version.Version=v${version} -X k8s.io/helm/pkg/version.BuildMetadata="
+	go mod tidy # can be removed with 3.6.0; see https://github.com/helm/helm/issues/9479
+	make build-cross TARGETS="linux/${_go_target_arch} linux/${_go_host_arch}" APP="..." LDFLAGS="-X helm.sh/helm/v3/internal/version.version=v${version} -X helm.sh/helm/v3/internal/version.metadata="
 
 	_dist/linux-${_go_host_arch}/helm completion bash > completion.bash
 	_dist/linux-${_go_host_arch}/helm completion zsh > completion.zsh

From 3d72c886881d91593c5405500b5ddab8a49fe663 Mon Sep 17 00:00:00 2001
From: Clyybber <darkmine956@gmail.com>
Date: Tue, 16 Mar 2021 15:26:49 +0100
Subject: [PATCH 1106/2024] qtractor: update to 0.9.21.

Closes: #29509 [via git-merge-pr]
---
 srcpkgs/qtractor/template | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/qtractor/template b/srcpkgs/qtractor/template
index a8fb195156cd..8ea7f5fcd6e2 100644
--- a/srcpkgs/qtractor/template
+++ b/srcpkgs/qtractor/template
@@ -1,11 +1,13 @@
 # Template file for 'qtractor'
 pkgname=qtractor
-version=0.9.14
+version=0.9.21
 revision=1
 wrksrc="qtractor-qtractor_${version//./_}"
 build_style=gnu-configure
-configure_args="--enable-debug"
-hostmakedepends="automake pkg-config"
+build_helper=qmake
+configure_args="--enable-debug ac_cv_qmake=${XBPS_WRAPPERDIR}/qmake
+ ac_cv_libsuil_gtk2_in_qt5=yes ac_cv_libsuil_x11_in_qt5=yes"
+hostmakedepends="automake pkg-config qt5-qmake qt5-host-tools"
 makedepends="dssi-devel jack-devel ladspa-sdk liblo-devel libmad-devel
  libsamplerate-devel lilv-devel qt5-tools-devel qt5-x11extras-devel
  rubberband-devel sratom-devel suil-devel vamp-plugin-sdk-devel"
@@ -16,10 +18,7 @@ license="GPL-2.0-or-later"
 homepage="http://qtractor.org"
 changelog="https://raw.githubusercontent.com/rncbc/qtractor/master/ChangeLog"
 distfiles="https://github.com/rncbc/qtractor/archive/qtractor_${version//./_}.tar.gz"
-checksum=16795d130ab4e79e76cd535251ff3d5f827731c628b9aee658c2c48e6f326e4d
-
-# configure fails to find qt5 headers
-nocross="https://build.voidlinux.org/builders/armv7l-musl_builder/builds/3458/steps/shell_3/logs/stdio"
+checksum=3e8c89d6d6a7a8d84280b5254020515640ef61b8ec356d8aaa3e0da118738daa
 
 pre_configure() {
 	autoreconf -if

From 1814b1457b5e005250a2149b00bd33b2b04c208b 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, 14 Apr 2021 19:26:58 +0700
Subject: [PATCH 1107/2024] grub-btrfs: remove root requirement

---
 srcpkgs/grub-btrfs/patches/no-root-please.patch | 15 +++++++++++++++
 srcpkgs/grub-btrfs/template                     |  1 +
 2 files changed, 16 insertions(+)
 create mode 100644 srcpkgs/grub-btrfs/patches/no-root-please.patch

diff --git a/srcpkgs/grub-btrfs/patches/no-root-please.patch b/srcpkgs/grub-btrfs/patches/no-root-please.patch
new file mode 100644
index 000000000000..4e0a32803fd1
--- /dev/null
+++ b/srcpkgs/grub-btrfs/patches/no-root-please.patch
@@ -0,0 +1,15 @@
+Index: grub-btrfs-4.9/Makefile
+===================================================================
+--- grub-btrfs-4.9.orig/Makefile
++++ grub-btrfs-4.9/Makefile
+@@ -9,10 +9,6 @@ LIB_DIR = $(DESTDIR)$(PREFIX)/lib
+ .PHONY: install uninstall help
+ 
+ install:
+-	@if test "$(shell id -u)" != 0; then \
+-		echo "You are not root, run this target as root please."; \
+-		exit 1; \
+-	fi
+ 	@install -Dm755 -t "$(DESTDIR)/etc/grub.d/" 41_snapshots-btrfs
+ 	@install -Dm644 -t "$(DESTDIR)/etc/default/grub-btrfs/" config
+ 	@install -Dm644 -t "$(LIB_DIR)/systemd/system/" grub-btrfs.service
diff --git a/srcpkgs/grub-btrfs/template b/srcpkgs/grub-btrfs/template
index 0e646c9c3f82..2527806d6999 100644
--- a/srcpkgs/grub-btrfs/template
+++ b/srcpkgs/grub-btrfs/template
@@ -10,6 +10,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/Antynea/grub-btrfs"
 distfiles="https://github.com/Antynea/grub-btrfs/archive/v${version}.tar.gz"
 checksum=62461133c697643e98a608239773f500edee3e4055c5729fef6639d1cd610243
+patch_args=-Np1
 
 post_install() {
 	rm -rf -- "${DESTDIR}"/usr/lib/systemd

From eb010930d1907193306869deb0773ee05d0bb086 Mon Sep 17 00:00:00 2001
From: cptpcrd <31829097+cptpcrd@users.noreply.github.com>
Date: Mon, 12 Apr 2021 07:54:04 -0400
Subject: [PATCH 1108/2024] watchexec: update to 1.15.0, orphan.

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

diff --git a/srcpkgs/watchexec/template b/srcpkgs/watchexec/template
index 8b62e5ee01d1..a9be5777c606 100644
--- a/srcpkgs/watchexec/template
+++ b/srcpkgs/watchexec/template
@@ -1,14 +1,14 @@
 # Template file for 'watchexec'
 pkgname=watchexec
-version=1.14.1
+version=1.15.0
 revision=1
 build_style=cargo
 short_desc="Executes commands in response to file modifications"
-maintainer="cptpcrd <cptpcrd.git@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/watchexec/watchexec"
 distfiles="https://github.com/watchexec/watchexec/archive/${version}.tar.gz"
-checksum=23ca90f1f070b0d30e821667c8b9deaf174d020373ea032e9e22f1a78adcfa1c
+checksum=536366e294047480ebfd440edc473690c226f23d07ea166023d1a7e8953c4f34
 
 post_install() {
 	vdoc README.md

From c9fd9c5c910fbd6d39f56cdc0b6e7bcac4873022 Mon Sep 17 00:00:00 2001
From: cptpcrd <31829097+cptpcrd@users.noreply.github.com>
Date: Mon, 12 Apr 2021 09:38:09 -0400
Subject: [PATCH 1109/2024] birdtray: orphan.

Closes: #30182 [via git-merge-pr]
---
 srcpkgs/birdtray/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/birdtray/template b/srcpkgs/birdtray/template
index b77f328c4de0..8695820eccec 100644
--- a/srcpkgs/birdtray/template
+++ b/srcpkgs/birdtray/template
@@ -6,7 +6,7 @@ build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-svg-devel qt5-x11extras-devel qt5-tools-devel"
 short_desc="Run Thunderbird with a system tray icon"
-maintainer="cptpcrd <cptpcrd.git@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/gyunaev/birdtray"
 distfiles="https://github.com/gyunaev/birdtray/archive/v${version}.tar.gz"

From c092a4f3d96d34bd0a1ef1a6ee30c7d377bd3319 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 7 Apr 2021 17:05:12 -0300
Subject: [PATCH 1110/2024] hunspell-fr_FR: move INSTALL.msg to
 README.voidlinux.

---
 srcpkgs/hunspell-fr_FR/INSTALL.msg            | 20 -------------------
 srcpkgs/hunspell-fr_FR/files/README.voidlinux | 14 +++++++++++++
 srcpkgs/hunspell-fr_FR/template               |  3 ++-
 3 files changed, 16 insertions(+), 21 deletions(-)
 delete mode 100644 srcpkgs/hunspell-fr_FR/INSTALL.msg
 create mode 100644 srcpkgs/hunspell-fr_FR/files/README.voidlinux

diff --git a/srcpkgs/hunspell-fr_FR/INSTALL.msg b/srcpkgs/hunspell-fr_FR/INSTALL.msg
deleted file mode 100644
index be1ddea8be9b..000000000000
--- a/srcpkgs/hunspell-fr_FR/INSTALL.msg
+++ /dev/null
@@ -1,20 +0,0 @@
- NOTICE:
- -----------------------------------------------------------------------
- This Package install the "classique" variant of the french dictionary:
-
- If you don't like this variant select the package with your desidered 
- variant of the dictionary following this table:
-
-
- hunspell-fr_FR_moderne           ==>  Dictionnaire “Moderne”        
- 
- hunspell-fr_FR_reforme1990       ==>  Dictionnaire “Réforme 1990” 
- 
- hunspell-fr_FR_toutesvariantes   ==>  Dictionnaire “Toutes variantes”
-
- See the README_dict_fr.txt in the doc directory for the explanation of 
- the variants.
-
- 
- -----------------------------------------------------------------------
- Void Mantainers
diff --git a/srcpkgs/hunspell-fr_FR/files/README.voidlinux b/srcpkgs/hunspell-fr_FR/files/README.voidlinux
new file mode 100644
index 000000000000..662f74cbc61f
--- /dev/null
+++ b/srcpkgs/hunspell-fr_FR/files/README.voidlinux
@@ -0,0 +1,14 @@
+ The hunspell-fr-FR package installs the "classique" variant of the
+ french dictionary.
+
+ If you don't like this variant, select the package with your desidered 
+ variant of the dictionary following this table:
+
+ hunspell-fr_FR_moderne           ==>  Dictionnaire “Moderne”        
+ 
+ hunspell-fr_FR_reforme1990       ==>  Dictionnaire “Réforme 1990” 
+ 
+ hunspell-fr_FR_toutesvariantes   ==>  Dictionnaire “Toutes variantes”
+
+ See the README_dict_fr.txt file in this directory for the explanation of 
+ the variants.
diff --git a/srcpkgs/hunspell-fr_FR/template b/srcpkgs/hunspell-fr_FR/template
index fa74fc8c598e..221b53b561ef 100644
--- a/srcpkgs/hunspell-fr_FR/template
+++ b/srcpkgs/hunspell-fr_FR/template
@@ -1,7 +1,7 @@
 # Template file for 'hunspell-fr_FR'
 pkgname=hunspell-fr_FR
 version=7.0
-revision=1
+revision=2
 create_wrksrc=yes
 hostmakedepends="unzip"
 short_desc="French dictionary for hunspell"
@@ -16,6 +16,7 @@ do_install() {
 	vinstall fr-${_variant}.aff 644 /usr/share/hunspell fr_FR.aff
 	vinstall fr-${_variant}.dic 644 /usr/share/hunspell fr_FR.dic
 	vdoc README_dict_fr.txt
+	vdoc $FILESDIR/README.voidlinux
 }
 
 hunspell-fr_FR-reforme1990_package() {

From 52e1837d5d3a5c178cc419b272d9b6624e0bc566 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Wed, 14 Apr 2021 14:34:05 +0200
Subject: [PATCH 1111/2024] postfix: update to 3.5.10.

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

diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index ea2df7449793..dc76f50f8166 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
-version=3.5.9
-revision=3
+version=3.5.10
+revision=1
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="IPL-1.0, EPL-2.0"
 homepage="http://www.postfix.org/"
 distfiles="http://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${version}.tar.gz"
-checksum=51ced5a3165a415beba812b6c9ead0496b7172ac6c3beb654d2ccd9a1b00762b
+checksum=5bb4d7d72d7512b58f3a31426dcbd394fd354e0a43de21da89466b057a0228f8
 
 system_accounts="postfix"
 postfix_homedir="/var/spool/postfix"

From 6c45992a084c7cc3fdd846f3770438391949ac69 Mon Sep 17 00:00:00 2001
From: Sebastian Uharek <uharek@friendship-systems.com>
Date: Wed, 14 Apr 2021 13:26:03 +0200
Subject: [PATCH 1112/2024] zoom: update to 5.6.13632.0328_1

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

diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template
index 616082b99a6d..abb73eabe225 100644
--- a/srcpkgs/zoom/template
+++ b/srcpkgs/zoom/template
@@ -1,6 +1,6 @@
 # Template file for 'zoom'
 pkgname=zoom
-version=5.6.13558.0321
+version=5.6.13632.0328
 revision=1
 archs="x86_64"
 wrksrc=zoom
@@ -13,7 +13,7 @@ maintainer="Daniel Santana <daniel@santana.tech>"
 license="custom:Proprietary"
 homepage="https://zoom.us/"
 distfiles="https://cdn.zoom.us/prod/${version}/zoom_x86_64.rpm"
-checksum=543a73a7d5a1c4bdf9af9d8af83a03cd3cc2d832315356d51e8861bec1d46f02
+checksum=afad3a1c359d36aa8ac78e44fea46abbd2f4e05dd8f54757b001cc6f3457df2b
 repository=nonfree
 noshlibprovides=yes
 noverifyrdeps=yes

From 509ae1ebefc357f20279a52f2f606b40dacacf11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Wed, 14 Apr 2021 15:30:38 +0200
Subject: [PATCH 1113/2024] doctl: update to 1.59.0.

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

diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index 6fdcf4816af2..beb0376be3db 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,6 +1,6 @@
 # Template file for 'doctl'
 pkgname=doctl
-version=1.58.0
+version=1.59.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=f4a7d608f4718a2a5e9ce5d1fcec25c16ee03d05f78ebf134faf23c261abefdf
+checksum=b37b693635af48da8b2b222486be3e315e9ba6eb8fdb0b0e976bff1e63f9c520

From 87ab6d6fc240e51260db8750cb3f2626312acef2 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, 14 Apr 2021 21:33:30 +0700
Subject: [PATCH 1114/2024] notcurses: restore lost symbol

---
 .../patches/restore-lost-symbol.patch         | 66 +++++++++++++++++++
 srcpkgs/notcurses/template                    |  3 +-
 2 files changed, 68 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/notcurses/patches/restore-lost-symbol.patch

diff --git a/srcpkgs/notcurses/patches/restore-lost-symbol.patch b/srcpkgs/notcurses/patches/restore-lost-symbol.patch
new file mode 100644
index 000000000000..b938a35ed30e
--- /dev/null
+++ b/srcpkgs/notcurses/patches/restore-lost-symbol.patch
@@ -0,0 +1,66 @@
+From da2a897544b9d239515b85ed31c8db4d90d23883 Mon Sep 17 00:00:00 2001
+From: nick black <dankamongmen@gmail.com>
+Date: Wed, 14 Apr 2021 10:04:28 -0400
+Subject: [PATCH] fix unintended cell abi breakage #1532
+
+cell_release() and cell_duplicate() were deprecated in 2.2.6,
+but replaced with static inlines. this breaks the abi, forcing
+recompiles from client programs. restore them as exported
+functions.
+---
+ include/notcurses/notcurses.h | 10 ++--------
+ src/lib/render.c              |  9 +++++++++
+ 2 files changed, 11 insertions(+), 8 deletions(-)
+
+diff --git a/include/notcurses/notcurses.h b/include/notcurses/notcurses.h
+index aece8cb6d..9d98ea19f 100644
+--- a/include/notcurses/notcurses.h
++++ b/include/notcurses/notcurses.h
+@@ -677,18 +677,12 @@ cell_prime(struct ncplane* n, nccell* c, const char* gcluster,
+ // failure, and 0 on success.
+ API int nccell_duplicate(struct ncplane* n, nccell* targ, const nccell* c);
+ 
+-__attribute__ ((deprecated)) static inline int
+-cell_duplicate(struct ncplane* n, nccell* targ, const nccell* c){
+-  return nccell_duplicate(n, targ, c);
+-}
++__attribute__ ((deprecated)) API int cell_duplicate(struct ncplane* n, nccell* targ, const nccell* c);
+ 
+ // Release resources held by the nccell 'c'.
+ API void nccell_release(struct ncplane* n, nccell* c);
+ 
+-__attribute__ ((deprecated)) static inline void
+-cell_release(struct ncplane* n, nccell* c){
+-  nccell_release(n, c);
+-}
++__attribute__ ((deprecated)) API void cell_release(struct ncplane* n, nccell* c);
+ 
+ #define NCSTYLE_MASK      0x03ffu
+ #define NCSTYLE_STANDOUT  0x0080u
+diff --git a/src/lib/render.c b/src/lib/render.c
+index ad95cd878..e1334416f 100644
+--- a/src/lib/render.c
++++ b/src/lib/render.c
+@@ -175,6 +175,11 @@ void nccell_release(ncplane* n, nccell* c){
+   pool_release(&n->pool, c);
+ }
+ 
++// FIXME deprecated, goes away in abi3
++void cell_release(ncplane* n, nccell* c){
++  nccell_release(n, c);
++}
++
+ // Duplicate one cell onto another when they share a plane. Convenience wrapper.
+ int nccell_duplicate(ncplane* n, nccell* targ, const nccell* c){
+   if(cell_duplicate_far(&n->pool, targ, n, c) < 0){
+@@ -184,6 +189,10 @@ int nccell_duplicate(ncplane* n, nccell* targ, const nccell* c){
+   return 0;
+ }
+ 
++int cell_duplicate(struct ncplane* n, nccell* targ, const nccell* c){
++  return nccell_duplicate(n, targ, c);
++}
++
+ // Emit fchannel with RGB changed to contrast effectively against bchannel.
+ static uint32_t
+ highcontrast(uint32_t bchannel){
diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index 7aea010bab84..f2bc3e9ae1bd 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,7 +1,7 @@
 # Template file for 'notcurses'
 pkgname=notcurses
 version=2.2.6
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUSE_STATIC=ON $(vopt_bool man USE_PANDOC)"
 hostmakedepends="pkg-config $(vopt_if man pandoc)"
@@ -15,6 +15,7 @@ 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=0507e507f9843a494aa66f31e419add5fbdbceb8fbc9345f3e6d4b55ed8a89d9
+patch_args=-Np1
 
 build_options="man"
 desc_option_man="Use pandoc for manpages"

From e2b55e46ca3da26828c9a07faee4bbbfc14bcaf1 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 14 Apr 2021 19:34:37 +0200
Subject: [PATCH 1115/2024] electron12: make musl ppc64le patch actually apply

this had the same name as the main ppc64le patch for glibc, and
the _apply_patch checks for `if [ ! -f ".${pname}_done" ]; then`,
which means the patch was never applied and the build failed
---
 ...-xxx-ppc64le-support.patch => chromium-musl-xxx-ppc64le.patch} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename srcpkgs/electron12/files/musl-patches/{chromium-xxx-ppc64le-support.patch => chromium-musl-xxx-ppc64le.patch} (100%)

diff --git a/srcpkgs/electron12/files/musl-patches/chromium-xxx-ppc64le-support.patch b/srcpkgs/electron12/files/musl-patches/chromium-musl-xxx-ppc64le.patch
similarity index 100%
rename from srcpkgs/electron12/files/musl-patches/chromium-xxx-ppc64le-support.patch
rename to srcpkgs/electron12/files/musl-patches/chromium-musl-xxx-ppc64le.patch

From 5c7bf4d8b262a9ce56ab6b60daa1c9da660d06e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 14 Apr 2021 12:29:41 -0300
Subject: [PATCH 1116/2024] linux5.11: update to 5.11.14.

---
 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 61162540a83d..d4e86720cad7 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.13
+version=5.11.14
 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
- d38e0f7f732ec95c247182ad1c97dd433e9fbb1619c99f7a0a8a24fddd001c82"
+ f4bc3454b5068ac94e5c42bea7e6f37641ec1cea0ff8c438be6bf1317afe32ed"
 skip_extraction="patch-${version}.xz"
 python_version=3
 patch_args="-Np1"

From 7c0c90678feec455487b948f5e990d78fd2c940f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Wed, 14 Apr 2021 20:07:33 +0200
Subject: [PATCH 1117/2024] visidata: update to 2.4.

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

diff --git a/srcpkgs/visidata/template b/srcpkgs/visidata/template
index 21be128580d4..73798ca45860 100644
--- a/srcpkgs/visidata/template
+++ b/srcpkgs/visidata/template
@@ -1,6 +1,6 @@
 # Template file for 'visidata'
 pkgname=visidata
-version=2.3
+version=2.4
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,4 +12,4 @@ license="GPL-3.0-only"
 homepage="https://visidata.org/"
 changelog="https://raw.githubusercontent.com/saulpw/visidata/stable/CHANGELOG.md"
 distfiles="https://github.com/saulpw/visidata/archive/v${version}.tar.gz"
-checksum=11a859ef45a7932b10da34bb0978975d052933e747303c055a2d40ccc0472b30
+checksum=9340f84b0c3e1820e2658d7372522b177ca6620fd8a65015391e738338d70838

From e5a4c978d32d86aca91dfa22e4f78b471edfce1d Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Tue, 13 Apr 2021 19:23:35 +0200
Subject: [PATCH 1118/2024] fluidsynth: update to 2.2.0.

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

diff --git a/common/shlibs b/common/shlibs
index 865ebcbe799d..3f35575eeadc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -957,7 +957,7 @@ libfftw3l_omp.so.3 libfftw-3.3.5_1
 libfftw3f_threads.so.3 libfftw-3.3_1
 libfftw3f.so.3 libfftw-3.3_1
 libfftw3f_omp.so.3 libfftw-3.3.5_1
-libfluidsynth.so.2 libfluidsynth-2.1.1_1
+libfluidsynth.so.3 libfluidsynth-2.2.0_1
 liblo.so.7 liblo-0.26_1
 libvamp-sdk.so.2 libvamp-plugin-sdk-2.2_1
 librubberband.so.2 librubberband-1.6.0_1
diff --git a/srcpkgs/fluidsynth/template b/srcpkgs/fluidsynth/template
index ab9f741e9b99..91a6b55a33ce 100644
--- a/srcpkgs/fluidsynth/template
+++ b/srcpkgs/fluidsynth/template
@@ -1,6 +1,6 @@
 # Template file for 'fluidsynth'
 pkgname=fluidsynth
-version=2.1.8
+version=2.2.0
 revision=1
 build_style=cmake
 make_check_target=check
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://www.fluidsynth.org/"
 distfiles="https://github.com/FluidSynth/fluidsynth/archive/v${version}.tar.gz"
-checksum=a254efceff5d99f8d658d12d25318317f37307e6df852ec9baeb7da173496967
+checksum=928fb16f307507485bd1d9b010dafba8c747bce5de2ba47ab1705944c87013b6
 
 libfluidsynth_package() {
 	short_desc+=" - runtime library"

From 86d16c4483c6014b9175fc84d8f40468f7d74458 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Tue, 13 Apr 2021 20:07:33 +0200
Subject: [PATCH 1119/2024] Carla: rebuild for fluidsynth-2.2.0

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

diff --git a/srcpkgs/Carla/template b/srcpkgs/Carla/template
index 2a13d9d5e8e0..701fd0ea30f7 100644
--- a/srcpkgs/Carla/template
+++ b/srcpkgs/Carla/template
@@ -1,7 +1,7 @@
 # Template file for 'Carla'
 pkgname=Carla
 version=2.1
-revision=2
+revision=3
 archs="x86_64* i686* aarch64* arm*"
 build_style=gnu-makefile
 pycompile_dirs="usr/share/carla"

From 8759c6aba954f12a5bf2c1151a5b2393d9ce330f Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Tue, 13 Apr 2021 20:07:33 +0200
Subject: [PATCH 1120/2024] SLADE: rebuild for fluidsynth-2.2.0

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

diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template
index b7ec0f0749c8..030aac7a61b2 100644
--- a/srcpkgs/SLADE/template
+++ b/srcpkgs/SLADE/template
@@ -1,7 +1,7 @@
 # Template file for 'SLADE'
 pkgname=SLADE
 version=3.1.12a
-revision=4
+revision=5
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 hostmakedepends="pkg-config p7zip which"

From f1b40a097463268e66244bb8e4c14986c74062f8 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Tue, 13 Apr 2021 20:07:34 +0200
Subject: [PATCH 1121/2024] alure: rebuild for fluidsynth-2.2.0

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

diff --git a/srcpkgs/alure/template b/srcpkgs/alure/template
index af57f0f163c4..d8c3f41648b9 100644
--- a/srcpkgs/alure/template
+++ b/srcpkgs/alure/template
@@ -1,7 +1,7 @@
 # Template file for 'alure'
 pkgname=alure
 version=1.2
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DMODPLUG=ON -DDYNLOAD=OFF"
 hostmakedepends="pkg-config"

From 3a3c7e38a33f22cce6876ed283bd529e4c936098 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Tue, 13 Apr 2021 20:07:36 +0200
Subject: [PATCH 1122/2024] audacious-plugins: rebuild for fluidsynth-2.2.0

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

diff --git a/srcpkgs/audacious-plugins/template b/srcpkgs/audacious-plugins/template
index 8c8d4d58954f..d0724c54b0ad 100644
--- a/srcpkgs/audacious-plugins/template
+++ b/srcpkgs/audacious-plugins/template
@@ -2,7 +2,7 @@
 #Keep in sync with audacious!
 pkgname=audacious-plugins
 version=4.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="$(vopt_enable gtk) $(vopt_enable qt)"
 hostmakedepends="gettext pkg-config glib-devel"

From 67604f525a8fc01dd5cc0031a2a9a7f5911a1657 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Tue, 13 Apr 2021 20:07:37 +0200
Subject: [PATCH 1123/2024] calf: rebuild for fluidsynth-2.2.0

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

diff --git a/srcpkgs/calf/template b/srcpkgs/calf/template
index 8826ba7711d5..929f40ad902c 100644
--- a/srcpkgs/calf/template
+++ b/srcpkgs/calf/template
@@ -1,7 +1,7 @@
 # Template file for 'calf'
 pkgname=calf
 version=0.90.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-experimental"
 hostmakedepends="automake libtool pkg-config"

From bb50677dc88288144dd48e359870500386c34538 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Tue, 13 Apr 2021 20:07:37 +0200
Subject: [PATCH 1124/2024] csound: rebuild for fluidsynth-2.2.0

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

diff --git a/srcpkgs/csound/template b/srcpkgs/csound/template
index b4c67632ca8a..f02f97bc6325 100644
--- a/srcpkgs/csound/template
+++ b/srcpkgs/csound/template
@@ -1,7 +1,7 @@
 # Template file for 'csound'
 pkgname=csound
 version=6.15.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="
  -DLUA_MODULE_INSTALL_DIR=${XBPS_CROSS_BASE}/usr/lib/lua/5.1

From dca8eda6f06be4c1f592f009f2c4c38edc4ee3f0 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Tue, 13 Apr 2021 20:07:38 +0200
Subject: [PATCH 1125/2024] gst-plugins-bad1: rebuild for fluidsynth-2.2.0

---
 srcpkgs/gst-plugins-bad1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 446eac2f4091..7b97a3e3184b 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-bad1'
 pkgname=gst-plugins-bad1
 version=1.18.4
-revision=2
+revision=3
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
 build_style=meson

From a7235f47aa89ca26c6389b69f9568ae989e793c8 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Tue, 13 Apr 2021 20:07:39 +0200
Subject: [PATCH 1126/2024] lmms: rebuild for fluidsynth-2.2.0

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

diff --git a/srcpkgs/lmms/template b/srcpkgs/lmms/template
index 3ec4eb068c91..15b67a8f222c 100644
--- a/srcpkgs/lmms/template
+++ b/srcpkgs/lmms/template
@@ -1,7 +1,7 @@
 # Template file for 'lmms'
 pkgname=lmms
 version=1.2.2
-revision=1
+revision=2
 archs="~armv6*"
 wrksrc=${pkgname}
 build_style=cmake

From 71726abe75ad05e06fbd3025ecfc22a798fcbb9d Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Tue, 13 Apr 2021 20:07:40 +0200
Subject: [PATCH 1127/2024] prboom-plus: rebuild for fluidsynth-2.2.0

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

diff --git a/srcpkgs/prboom-plus/template b/srcpkgs/prboom-plus/template
index b492e41874e4..cbb15d2f184c 100644
--- a/srcpkgs/prboom-plus/template
+++ b/srcpkgs/prboom-plus/template
@@ -1,7 +1,7 @@
 # Template file for 'prboom-plus'
 pkgname=prboom-plus
 version=2.5.1.4
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--disable-cpu-opt --disable-dogs"
 hostmakedepends="pcre-devel fluidsynth-devel libmad-devel SDL_mixer-devel SDL_net-devel

From cf03c2e14d05da7914df8d481a5f932fd4abee5a Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Tue, 13 Apr 2021 20:07:40 +0200
Subject: [PATCH 1128/2024] qsynth: rebuild for fluidsynth-2.2.0

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

diff --git a/srcpkgs/qsynth/template b/srcpkgs/qsynth/template
index 8873baf43ced..1b8712148464 100644
--- a/srcpkgs/qsynth/template
+++ b/srcpkgs/qsynth/template
@@ -1,7 +1,7 @@
 # Template file for 'qsynth'
 pkgname=qsynth
 version=0.9.2
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper=qmake
 hostmakedepends="pkg-config qt5-tools"

From 90995bb61088b9a312d7d56a47f46729d41ed89c Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Tue, 13 Apr 2021 20:26:56 +0200
Subject: [PATCH 1129/2024] tuxguitar: rebuild for fluidsynth-2.2.0

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

diff --git a/srcpkgs/tuxguitar/template b/srcpkgs/tuxguitar/template
index 19a3420936b3..2c9fc380923f 100644
--- a/srcpkgs/tuxguitar/template
+++ b/srcpkgs/tuxguitar/template
@@ -1,7 +1,7 @@
 # Template file for 'tuxguitar'
 pkgname=tuxguitar
 version=1.5.4
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}-src"
 hostmakedepends="apache-maven openjdk8"
 makedepends="alsa-lib-devel fluidsynth-devel jack-devel"

From 42139a9cb62ac9479cddf16e179e686931ad74c4 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Tue, 13 Apr 2021 20:07:41 +0200
Subject: [PATCH 1130/2024] residualvm: rebuild for fluidsynth-2.2.0; lint
 template

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

diff --git a/srcpkgs/residualvm/template b/srcpkgs/residualvm/template
index 4a9ed863296b..b0abb4052a9c 100644
--- a/srcpkgs/residualvm/template
+++ b/srcpkgs/residualvm/template
@@ -1,7 +1,7 @@
 # Template file for 'residualvm'
 pkgname=residualvm
 version=0.3.1
-revision=4
+revision=5
 build_style=configure
 configure_args="--prefix=/usr --enable-all-engines --enable-release
  --enable-flac --enable-faad --enable-fluidsynth $(vopt_enable sndio)"
@@ -11,7 +11,7 @@ makedepends="SDL2-devel libvorbis-devel libmad-devel libjpeg-turbo-devel
  glew-devel libflac-devel fluidsynth-devel faad2-devel $(vopt_if sndio sndio-devel)"
 short_desc="Cross-platform 3D game interpreter"
 maintainer="newbluemoon <blaumolch@mailbox.org>"
-license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later, BSD, ISC, MIT, Zlib"
+license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later, BSD-3-Clause, ISC, MIT, Zlib"
 homepage="https://www.residualvm.org/"
 distfiles="https://www.residualvm.org/downloads/release/${version}/residualvm-${version}-sources.tar.bz2"
 checksum=f50c83bbc55a8121eefc279e83982b6ec590e608e145b7f750006619dd0bf9e9
@@ -41,4 +41,7 @@ post_install() {
 	# move licenses to the right place
 	vmkdir usr/share/licenses/residualvm
 	mv ${DESTDIR}/usr/share/doc/residualvm/COPYING* ${DESTDIR}/usr/share/licenses/residualvm/
+	vlicense COPYING.BSD
+	vlicense COPYING.ISC
+	vlicense COPYING.MIT
 }

From 5a73e47586b1e047517aa04e5ad458be030467d4 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Tue, 13 Apr 2021 20:07:35 +0200
Subject: [PATCH 1131/2024] ardour: rebuild for fluidsynth-2.2.0; fix build

---
 srcpkgs/ardour/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index 6be4257f2331..b4870e26190c 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,7 +1,7 @@
 # Template file for 'ardour'
 pkgname=ardour
 version=6.6
-revision=1
+revision=2
 _commit="e4e21f4d073ab00b1a0bb6ff6ca49f28b02fd68a"
 build_style=waf3
 configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
@@ -19,6 +19,8 @@ maintainer="tibequadorian <tibequadorian@posteo.de>"
 license="GPL-2.0-or-later"
 homepage="http://ardour.org"
 
+CXXFLAGS="-fpermissive"
+
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*)  configure_args+=" --dist-target=x86_64" ;;
 	i686*)    configure_args+=" --dist-target=i686" ;;

From b42a11f28b40df6f62a1006c7daf4f4c063787a8 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Tue, 13 Apr 2021 20:27:40 +0200
Subject: [PATCH 1132/2024] scummvm: rebuild for fluidsynth-2.2.0; fix
 distfiles url

patch adapted from https://github.com/scummvm/scummvm/commit/d0d38b0199dae9a1dbfecc53db54dd0a070694b4
---
 srcpkgs/scummvm/patches/fluidsynth-2.2.0.diff | 25 +++++++++++++++++++
 srcpkgs/scummvm/template                      |  4 +--
 2 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/scummvm/patches/fluidsynth-2.2.0.diff

diff --git a/srcpkgs/scummvm/patches/fluidsynth-2.2.0.diff b/srcpkgs/scummvm/patches/fluidsynth-2.2.0.diff
new file mode 100644
index 000000000000..c771107514e4
--- /dev/null
+++ b/srcpkgs/scummvm/patches/fluidsynth-2.2.0.diff
@@ -0,0 +1,25 @@
+--- audio/softsynth/fluidsynth.cpp
++++ audio/softsynth/fluidsynth.cpp
+@@ -144,11 +144,11 @@
+ 	return p;
+ }
+ 
+-static int SoundFontMemLoader_read(void *buf, int count, void *handle) {
++static int SoundFontMemLoader_read(void *buf, fluid_long_long_t count, void *handle) {
+ 	return ((Common::SeekableReadStream *) handle)->read(buf, count) == (uint32)count ? FLUID_OK : FLUID_FAILED;
+ }
+ 
+-static int SoundFontMemLoader_seek(void *handle, long offset, int origin) {
++static int SoundFontMemLoader_seek(void *handle, fluid_long_long_t offset, int origin) {
+ 	return ((Common::SeekableReadStream *) handle)->seek(offset, origin) ? FLUID_OK : FLUID_FAILED;
+ }
+ 
+@@ -157,7 +157,7 @@
+ 	return FLUID_OK;
+ }
+ 
+-static long SoundFontMemLoader_tell(void *handle) {
++static fluid_long_long_t SoundFontMemLoader_tell(void *handle) {
+ 	return ((Common::SeekableReadStream *) handle)->pos();
+ }
+ #endif
diff --git a/srcpkgs/scummvm/template b/srcpkgs/scummvm/template
index 3256722fd0c4..0cec3ab176d7 100644
--- a/srcpkgs/scummvm/template
+++ b/srcpkgs/scummvm/template
@@ -1,7 +1,7 @@
 # Template file for 'scummvm'
 pkgname=scummvm
 version=2.2.0
-revision=1
+revision=2
 build_style=configure
 configure_args="--prefix=/usr --enable-release-mode
  --with-sdl-prefix=${XBPS_CROSS_BASE}/usr"
@@ -14,7 +14,7 @@ short_desc="Free implementation of LucasArts' SCUMM interpreter"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://www.scummvm.org/"
-distfiles="https://www.scummvm.org/frs/${pkgname}/${version}/${pkgname}-${version}.tar.xz"
+distfiles="https://downloads.scummvm.org/frs/${pkgname}/${version}/${pkgname}-${version}.tar.xz"
 checksum=1469657e593bd8acbcfac0b839b086f640ebf120633e93f116cab652b5b27387
 
 case "$XBPS_TARGET_MACHINE" in

From 791bd86d3814eee8d275dc03eda524ac5e6cb7c7 Mon Sep 17 00:00:00 2001
From: Lorem <notloremipsum@protonmail.com>
Date: Mon, 12 Apr 2021 14:39:48 +0530
Subject: [PATCH 1133/2024] budgie-desktop: add patch from upstream

 fixes crash when launching budgie-desktop-settings
 while gnome-settings-daemon version >=40.0 is installed.
---
 .../fix-budgie-desktop-settings-crash.patch   | 65 +++++++++++++++++++
 srcpkgs/budgie-desktop/template               |  2 +-
 2 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/budgie-desktop/patches/fix-budgie-desktop-settings-crash.patch

diff --git a/srcpkgs/budgie-desktop/patches/fix-budgie-desktop-settings-crash.patch b/srcpkgs/budgie-desktop/patches/fix-budgie-desktop-settings-crash.patch
new file mode 100644
index 000000000000..84fbce6616e0
--- /dev/null
+++ b/srcpkgs/budgie-desktop/patches/fix-budgie-desktop-settings-crash.patch
@@ -0,0 +1,65 @@
+From: Joshua Strobl <joshua@streambits.io>
+Date: Mon, 12 Apr 2021 06:14:04 +0300
+Subject: [PATCH] Support moved font anti-aliasing and hinting in GSD 40. Fixes
+ #2121.
+
+---
+ src/panel/meson.build                  |  4 ++++
+ src/panel/settings/settings_fonts.vala | 11 ++++++++++-
+ 2 files changed, 14 insertions(+), 1 deletion(-)
+
+diff --git src/panel/meson.build src/panel/meson.build
+index ee610868..5451c278 100644
+--- src/panel/meson.build
++++ src/panel/meson.build
+@@ -72,6 +72,10 @@ budgie_panel_vala_args = [
+         '--gresources=' + gresource,
+ ]
+ 
++if dep_gsd.version().version_compare('>=40.0')
++    budgie_panel_vala_args += ['-D', 'HAVE_GSD_40']
++endif
++
+ budgie_panel_c_args = [
+     '-DWNCK_I_KNOW_THIS_IS_UNSTABLE'
+ ]
+diff --git src/panel/settings/settings_fonts.vala src/panel/settings/settings_fonts.vala
+index fc17622f..f750b926 100644
+--- src/panel/settings/settings_fonts.vala
++++ src/panel/settings/settings_fonts.vala
+@@ -24,7 +24,10 @@ namespace Budgie {
+ 
+ 		private Settings ui_settings;
+ 		private Settings wm_settings;
++
++#if !HAVE_GSD_40
+ 		private Settings x_settings;
++#endif
+ 
+ 		public FontPage() {
+ 			Object(group: SETTINGS_GROUP_APPEARANCE,
+@@ -135,14 +138,20 @@ namespace Budgie {
+ 			/* Hook up settings */
+ 			ui_settings = new Settings("org.gnome.desktop.interface");
+ 			wm_settings = new Settings("org.gnome.desktop.wm.preferences");
+-			x_settings = new Settings("org.gnome.settings-daemon.plugins.xsettings");
+ 			ui_settings.bind("document-font-name", fontbutton_document, "font-name", SettingsBindFlags.DEFAULT);
+ 			ui_settings.bind("font-name", fontbutton_interface, "font-name", SettingsBindFlags.DEFAULT);
+ 			ui_settings.bind("monospace-font-name", fontbutton_monospace, "font-name", SettingsBindFlags.DEFAULT);
+ 			wm_settings.bind("titlebar-font", fontbutton_title, "font-name", SettingsBindFlags.DEFAULT);
+ 			ui_settings.bind("text-scaling-factor", spinbutton_scaling, "value", SettingsBindFlags.DEFAULT);
++
++#if HAVE_GSD_40
++			ui_settings.bind("font-antialiasing", combobox_antialias, "active-id", SettingsBindFlags.DEFAULT);
++			ui_settings.bind("font-hinting", combobox_hinting, "active-id", SettingsBindFlags.DEFAULT);
++#else
++			x_settings = new Settings("org.gnome.settings-daemon.plugins.xsettings");
+ 			x_settings.bind("hinting", combobox_hinting, "active-id", SettingsBindFlags.DEFAULT);
+ 			x_settings.bind("antialiasing", combobox_antialias, "active-id", SettingsBindFlags.DEFAULT);
++#endif
+ 		}
+ 	}
+ }
+-- 
+2.31.1
+
diff --git a/srcpkgs/budgie-desktop/template b/srcpkgs/budgie-desktop/template
index e989feaea31e..4e9a7f63b3df 100644
--- a/srcpkgs/budgie-desktop/template
+++ b/srcpkgs/budgie-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'budgie-desktop'
 pkgname=budgie-desktop
 version=10.5.2
-revision=2
+revision=3
 build_style=meson
 build_helper=gir
 configure_args="-Dwith-gtk-doc=false"

From c9f28281890cfe5faaeeb33980e96ba8df2670b8 Mon Sep 17 00:00:00 2001
From: radiden <gabriel2012688@gmail.com>
Date: Thu, 8 Apr 2021 01:28:33 +0200
Subject: [PATCH 1134/2024] composer: update to 2.0.12.

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

diff --git a/srcpkgs/composer/template b/srcpkgs/composer/template
index 2bf256dc0d20..43de0a369029 100644
--- a/srcpkgs/composer/template
+++ b/srcpkgs/composer/template
@@ -1,6 +1,6 @@
 # Template file for 'composer'
 pkgname=composer
-version=1.10.13
+version=2.0.12
 revision=1
 build_style=fetch
 depends="php"
@@ -10,7 +10,7 @@ license="MIT"
 homepage="https://getcomposer.org/"
 distfiles="https://github.com/composer/composer/releases/download/${version}/composer.phar
  https://raw.githubusercontent.com/composer/composer/master/LICENSE"
-checksum="5ca7445cfd48dd27c5a84aa005a47b4d9fd91132313830609875df3a6973708f
+checksum="82ea8c1537cfaceb7e56f6004c7ccdf99ddafce7237c07374d920e635730a631
  7855ac293067aebe7e51afdd23b9dea54b8be24187dbecc9b9142581c37f596c"
 
 do_install() {

From 08280cc2c8b3be8483e6b90f084d5dd6a846a14b Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Mon, 5 Apr 2021 11:49:43 -0700
Subject: [PATCH 1135/2024] geis: fix license

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

diff --git a/srcpkgs/geis/template b/srcpkgs/geis/template
index e31cd8bc785c..ddad320d93a7 100644
--- a/srcpkgs/geis/template
+++ b/srcpkgs/geis/template
@@ -1,15 +1,15 @@
 # Template file for 'geis'
 pkgname=geis
 version=2.2.17
-revision=7
-hostmakedepends="pkg-config python3-devel"
-makedepends="dbus-devel grail-devel frame-devel libXi-devel python3-devel xorg-server-devel"
+revision=8
 build_style="gnu-configure"
 configure_args="--disable-static"
+hostmakedepends="pkg-config python3-devel"
+makedepends="dbus-devel grail-devel frame-devel libXi-devel python3-devel xorg-server-devel"
+short_desc="Gesture Engine Interface and Support"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-3"
+license="GPL-3.0-only"
 homepage="https://launchpad.net/geis"
-short_desc="Gesture Engine Interface and Support"
 distfiles="https://launchpad.net/geis/trunk/$version/+download/geis-$version.tar.xz"
 checksum=8a60f5683852094038904e690d23cc5a90a980fc52da67f0f28890baa25c70eb
 
@@ -27,7 +27,6 @@ geis-devel_package() {
 	}
 }
 geis-python3_package() {
-	pycompile_module="geis geisview"
 	short_desc+=" - Python3 bindings"
 	pkg_install() {
 		vmove usr/bin/pygeis

From 593d7604e9adb773e38172805123aa97c7d82092 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Mon, 5 Apr 2021 11:51:50 -0700
Subject: [PATCH 1136/2024] genext2fs: fix license

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

diff --git a/srcpkgs/genext2fs/template b/srcpkgs/genext2fs/template
index 987cfaaa272e..284df8428720 100644
--- a/srcpkgs/genext2fs/template
+++ b/srcpkgs/genext2fs/template
@@ -1,12 +1,12 @@
 # Template file for 'genext2fs'
 pkgname=genext2fs
 version=1.4.1
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="ac_cv_have_working_snprintf=yes ac_cv_have_working_vsnprintf=yes"
 short_desc="Generates an ext2 filesystem as a normal (i.e. non-root) user"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="http://genext2fs.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 checksum=404dbbfa7a86a6c3de8225c8da254d026b17fd288e05cec4df2cc7e1f4feecfc

From 03b0bd0f2351e20d398cac2a1563f0831ce69c01 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Mon, 5 Apr 2021 11:58:47 -0700
Subject: [PATCH 1137/2024] geoip: fix license

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

diff --git a/srcpkgs/geoip/template b/srcpkgs/geoip/template
index 2c08ba395a7d..dcdf58971869 100644
--- a/srcpkgs/geoip/template
+++ b/srcpkgs/geoip/template
@@ -1,7 +1,7 @@
 # Template file for 'geoip'
 pkgname=geoip
 version=1.6.12
-revision=2
+revision=3
 wrksrc="GeoIP-${version}"
 build_style=gnu-configure
 configure_args="--mandir=/usr/share/man --sysconfdir=/etc/geoip"
@@ -9,8 +9,8 @@ hostmakedepends="automake libtool"
 makedepends="zlib-devel"
 short_desc="Non-DNS IP-to-country resolver C library and utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="LGPL-2.1-or-later"
 homepage="http://www.maxmind.com/app/c"
-license="GPL-2"
 distfiles="https://github.com/maxmind/geoip-api-c/releases/download/v$version/GeoIP-$version.tar.gz"
 checksum=1dfb748003c5e4b7fd56ba8c4cd786633d5d6f409547584f6910398389636f80
 

From d57fbf3087bc0b273acf7a62b83ed1508bf009f8 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Mon, 5 Apr 2021 12:01:47 -0700
Subject: [PATCH 1138/2024] gforth: fix license

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

diff --git a/srcpkgs/gforth/template b/srcpkgs/gforth/template
index 71117b69f470..f0df03991086 100644
--- a/srcpkgs/gforth/template
+++ b/srcpkgs/gforth/template
@@ -1,17 +1,17 @@
 # Template file for 'gforth'
 pkgname=gforth
 version=0.7.3
-revision=2
+revision=3
 build_style=gnu-configure
-disable_parallel_build=yes
 hostmakedepends="m4"
 makedepends="libffi-devel"
 short_desc="GNU Forth, a fast and portable implementation of ANS Forth"
 maintainer="ZweiSpeedruns <zcm727@gmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/gforth/"
 distfiles="${GNU_SITE}/gforth/gforth-${version}.tar.gz"
 checksum=2f62f2233bf022c23d01c920b1556aa13eab168e3236b13352ac5e9f18542bb0
+disable_parallel_build=yes
 
 nocross="Configure script is picky: https://api.travis-ci.org/jobs/158049419/log.txt?deansi=true"
 case "${XBPS_TARGET_MACHINE}" in

From f6ca18046ae8d737f2d0bf9b78c720af0db89a0d Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Mon, 5 Apr 2021 12:05:16 -0700
Subject: [PATCH 1139/2024] gftp: fix license

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

diff --git a/srcpkgs/gftp/template b/srcpkgs/gftp/template
index 2ce0a9e872f4..0820b29da2d3 100644
--- a/srcpkgs/gftp/template
+++ b/srcpkgs/gftp/template
@@ -1,13 +1,13 @@
 # Template file for 'gftp'
 pkgname=gftp
 version=2.0.19
-revision=8
+revision=9
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="gtk+-devel openssl-devel"
 short_desc="Graphical file transfer client"
 maintainer="psylence <psylence@protonmail.com>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://www.gftp.org"
 distfiles="https://sources.voidlinux.org/gftp-${version}/gftp-${version}.tar.bz2"
 checksum=5306a46be96d6f4d23906cb1836fb3d732039621a6c7fcfa921acc21ac110bfd

From caa62bbfdc72c02549c3e5392e85ec530d654c1e Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Mon, 5 Apr 2021 12:21:27 -0700
Subject: [PATCH 1140/2024] git-crypt: fix license

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

diff --git a/srcpkgs/git-crypt/template b/srcpkgs/git-crypt/template
index 0f81c8dc313c..f5c4c79b664d 100644
--- a/srcpkgs/git-crypt/template
+++ b/srcpkgs/git-crypt/template
@@ -1,16 +1,16 @@
 # Template file for 'git-crypt'
 pkgname=git-crypt
 version=0.6.0
-revision=7
+revision=8
 build_style=gnu-makefile
 make_use_env=yes
-makedepends="openssl-devel"
-hostmakedepends="libxslt docbook-xsl"
 make_build_args="ENABLE_MAN=yes"
 make_install_args="ENABLE_MAN=yes"
+hostmakedepends="libxslt docbook-xsl"
+makedepends="openssl-devel"
 short_desc="Transparent file encryption in git"
 maintainer="Andy Cobaugh <andrewcobaugh@gmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="https://www.agwa.name/projects/git-crypt/"
 distfiles="https://github.com/AGWA/git-crypt/archive/${version}.tar.gz"
 checksum=777c0c7aadbbc758b69aff1339ca61697011ef7b92f1d1ee9518a8ee7702bb78
@@ -21,6 +21,4 @@ post_install() {
 	vdoc NEWS
 	vdoc doc/multiple_keys.md
 	vman man/man1/git-crypt.1
-	vlicense COPYING
 }
-

From 21b77405ec9bf350cff03a94f24a63a5bc7a5f23 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Mon, 5 Apr 2021 12:21:37 -0700
Subject: [PATCH 1141/2024] glpk: fix license

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

diff --git a/srcpkgs/glpk/template b/srcpkgs/glpk/template
index b98f24f344a7..6724c10e5dd0 100644
--- a/srcpkgs/glpk/template
+++ b/srcpkgs/glpk/template
@@ -1,13 +1,13 @@
 # Template file for 'glpk'
 pkgname=glpk
 version=5.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-gmp"
 makedepends="gmp-devel"
 short_desc="GNU Linear Programming Kit to solve LP, MIP and other problems"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/glpk/glpk.html"
 distfiles="${GNU_SITE}/glpk/${pkgname}-${version}.tar.gz"
 checksum=4a1013eebb50f728fc601bdd833b0b2870333c3b3e5a816eeba921d95bec6f15

From bdd1a3a127cdc22be1c4bf3b5d9177056c11c2b1 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Mon, 5 Apr 2021 12:27:27 -0700
Subject: [PATCH 1142/2024] glu: fix license

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

diff --git a/srcpkgs/glu/template b/srcpkgs/glu/template
index f6f079e03b5e..b655d49fe569 100644
--- a/srcpkgs/glu/template
+++ b/srcpkgs/glu/template
@@ -1,14 +1,14 @@
 # Template file for 'glu'
 pkgname=glu
 version=9.0.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config"
 makedepends="MesaLib-devel"
 short_desc="Mesa OpenGL utility library (GLU)"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
+license="SGI-B-2.0"
 homepage="http://cgit.freedesktop.org/mesa/glu/"
 distfiles="https://mesa.freedesktop.org/archive/glu/glu-${version}.tar.gz"
 checksum=f6f484cfcd51e489afe88031afdea1e173aa652697e4c19ddbcb8260579a10f7

From 99894bd038a78500890f3c69f27d86e72ec2af3d Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Mon, 5 Apr 2021 12:32:51 -0700
Subject: [PATCH 1143/2024] glyr: fix license

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

diff --git a/srcpkgs/glyr/template b/srcpkgs/glyr/template
index eb59ece2e9cc..30dbe4e87f8e 100644
--- a/srcpkgs/glyr/template
+++ b/srcpkgs/glyr/template
@@ -1,20 +1,20 @@
 # Template file for 'glyr'
 pkgname=glyr
-version="1.0.10"
-revision=1
+version=1.0.10
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="libcurl-devel glib-devel sqlite-devel"
-short_desc="A music metadata searchengine utility and library"
+short_desc="Music metadata searchengine utility and library"
 maintainer="Michal Koutenský <koutak.m@gmail.com>"
-license="LGPL-3"
+license="LGPL-3.0-or-later"
 homepage="https://github.com/sahib/glyr"
 distfiles="https://github.com/sahib/glyr/archive/${version}.tar.gz"
 checksum=77e8da60221c8d27612e4a36482069f26f8ed74a1b2768ebc373c8144ca806e8
 
 glyr-devel_package() {
 	depends="glyr>=${version}_${revision}"
-	short_desc="A music metadata searchengine utility and library - development files"
+	short_desc="Music metadata searchengine utility and library - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig

From 99868cfd0137d4da384c28c26b560fd793543ccf Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Mon, 5 Apr 2021 12:42:18 -0700
Subject: [PATCH 1144/2024] gmtp: fix license

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

diff --git a/srcpkgs/gmtp/template b/srcpkgs/gmtp/template
index 69de28c2c3d4..55516a916605 100644
--- a/srcpkgs/gmtp/template
+++ b/srcpkgs/gmtp/template
@@ -1,14 +1,14 @@
 # Template file for 'gmtp'
 pkgname=gmtp
 version=1.3.11
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config glib-devel"
 makedepends="libmtp-devel libflac-devel libid3tag-devel libvorbis-devel gtk+3-devel"
 depends="desktop-file-utils"
-short_desc="A simple MP3 player client for MTP based devices"
+short_desc="Simple MP3 player client for MTP based devices"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD"
+license="BSD-3-Clause"
 homepage="http://gmtp.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/gmtp/gmtp-${version}.tar.gz"
 checksum=5a830c9c448aa2caf7a844aaa9ba38c2ac0239547366c1e6874e0080bd5f0613

From d5147756d4a1a99ad1f777679869231ff656a206 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Mon, 5 Apr 2021 12:43:46 -0700
Subject: [PATCH 1145/2024] gnome-epub-thumbnailer: fix license

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

diff --git a/srcpkgs/gnome-epub-thumbnailer/template b/srcpkgs/gnome-epub-thumbnailer/template
index c6e1c02b9d30..a9fae3dc6804 100644
--- a/srcpkgs/gnome-epub-thumbnailer/template
+++ b/srcpkgs/gnome-epub-thumbnailer/template
@@ -1,13 +1,13 @@
 # Template file for 'gnome-epub-thumbnailer'
 pkgname=gnome-epub-thumbnailer
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="gdk-pixbuf-devel libarchive-devel libxml2-devel"
 short_desc="Thumbnailer for EPub and MOBI books"
 maintainer="Alif Rachmawadi <arch@subosito.com>"
-license="GPL-3"
+license="GPL-2.0-or-later"
 homepage="https://git.gnome.org/browse/gnome-epub-thumbnailer"
 distfiles="${GNOME_SITE}/${pkgname}/${version}/${pkgname}-${version}.tar.xz"
 checksum=b502420d9b02ea0b0fc7986ef5a091a12b2286be14fed9e47594fe9fa0c5898e

From 8665065bb7edbbcd35bc9538a5084380baeab078 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 00:56:39 -0700
Subject: [PATCH 1146/2024] gnugo: fix license

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

diff --git a/srcpkgs/gnugo/template b/srcpkgs/gnugo/template
index 81c21903ea86..30b4f91184bc 100644
--- a/srcpkgs/gnugo/template
+++ b/srcpkgs/gnugo/template
@@ -1,14 +1,14 @@
 # Template file for 'gnugo'
 pkgname=gnugo
 version=3.8
-revision=1
-nocross=yes
+revision=2
 build_style=gnu-configure
 short_desc="Free program that plays the game Go"
 maintainer="Brandon Wilson <x@wilsonb.com>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/gnugo/"
 distfiles="${GNU_SITE}/gnugo/${pkgname}-${version}.tar.gz"
 checksum=da68d7a65f44dcf6ce6e4e630b6f6dd9897249d34425920bfdd4e07ff1866a72
+nocross=yes
 
 CFLAGS="-fcommon"

From cf5219a6818b0f3977fb3490c8e0c6c687649b91 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 00:59:56 -0700
Subject: [PATCH 1147/2024] gnupod: fix license

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

diff --git a/srcpkgs/gnupod/template b/srcpkgs/gnupod/template
index 91b093221354..09c35988a9d8 100644
--- a/srcpkgs/gnupod/template
+++ b/srcpkgs/gnupod/template
@@ -1,14 +1,14 @@
 # Template file for 'gnupod'
 pkgname=gnupod
 version=0.99.8
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="perl-Digest-SHA1 perl-XML-Parser perl-Unicode-String perl-MP3-Info perl-TimeDate"
 makedepends="${hostmakedepends}"
 depends="${makedepends}"
 short_desc="Command line tools for managing data on iPods"
 maintainer="Evan Deaubl <evan@deaubl.name>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/gnupod/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tgz"
 checksum=bd566295a2e14352e6d05f5c816cab36b0e80d3ab36d29c4bbb45c581d3f3c31

From 9d9ae88db97437d5f5ce05e2525fc0a616d7effb Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 08:45:54 -0700
Subject: [PATCH 1148/2024] gnurobbo: fix license, use vsed

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

diff --git a/srcpkgs/gnurobbo/template b/srcpkgs/gnurobbo/template
index 49d4b52577f2..d8225df323d2 100644
--- a/srcpkgs/gnurobbo/template
+++ b/srcpkgs/gnurobbo/template
@@ -1,14 +1,14 @@
 # Template file for 'gnurobbo'
 pkgname=gnurobbo
 version=0.68
-revision=3
+revision=4
 build_wrksrc=gnurobbo
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
 makedepends="SDL_mixer-devel SDL_image-devel SDL_ttf-devel"
 short_desc="Reimplementation of Janusz Pelc's Robbo for Atari XE/XL"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://gnurobbo.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/gnurobbo/gnurobbo/gnurobbo%20${version}/gnurobbo-${version}-source.tar.gz"
 checksum=6c7e9e425655da02c2442d13b5fa8f542af62d2c8f253db2fb63470c5c0c3db8
@@ -16,7 +16,7 @@ checksum=6c7e9e425655da02c2442d13b5fa8f542af62d2c8f253db2fb63470c5c0c3db8
 CFLAGS="-fcommon"
 
 pre_build() {
-	sed -i Makefile \
+	vsed -i Makefile \
 		-e "s;\(CFLAGS\?+=\)-d;\1;" \
 		-e "s;CFLAGS+\?=;\0 ${CFLAGS} ;" \
 		-e "s;LDFLAGS+\?=;\0 ${LDFLAGS} ;" \

From 0a1aba75d645db9a1ee116d00f4a1e2290ffb39c Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 08:48:32 -0700
Subject: [PATCH 1149/2024] gopm: fix license, fix homepage

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

diff --git a/srcpkgs/gopm/template b/srcpkgs/gopm/template
index cf9e8258395d..ae3a0d2ca491 100644
--- a/srcpkgs/gopm/template
+++ b/srcpkgs/gopm/template
@@ -1,14 +1,14 @@
-# Template build file for 'gopm'
+# Template file for 'gopm'
 pkgname=gopm
 version=0.7.2.20150801
-revision=14
+revision=15
 _commit=4295c22189eb27deedc13fd33e05c1a4da07aa3d
 wrksrc="${pkgname}-${_commit}"
 build_style=go
 go_import_path="github.com/gpmgo/gopm"
 short_desc="Go Package Manager"
 maintainer="John Regan <john@jrjrtech.com>"
-license="Apache"
-homepage="http://gopm.io/"
+license="Apache-2.0"
+homepage="https://github.com/gpmgo/gopm"
 distfiles="https://github.com/gpmgo/gopm/archive/${_commit}.tar.gz"
 checksum="67fd6c8940eab9adca178f880d217095ef54db8c608b0d000144d9ba7880c3f8"

From 50ad2fe858270b809245a55d2db01fbd4ac921d8 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 08:56:11 -0700
Subject: [PATCH 1150/2024] gosh: fix license

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

diff --git a/srcpkgs/gosh/template b/srcpkgs/gosh/template
index 34388757f28e..dc364cfba67a 100644
--- a/srcpkgs/gosh/template
+++ b/srcpkgs/gosh/template
@@ -1,12 +1,12 @@
 # Template file for 'gosh'
 pkgname=gosh
 version=0.2.3
-revision=12
+revision=13
 build_style=go
 go_import_path="github.com/mkouhei/gosh"
 short_desc="Interactive shell for Golang"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="https://github.com/mkouhei/gosh"
 distfiles="https://github.com/mkouhei/gosh/archive/v${version}.tar.gz"
 checksum=0b601b467a57d809134a13c8e52c4986eb328931a4db3c237630cdcd9891a707

From 9672b4b5007828edc88e6a14c72a98ca02760914 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 08:56:16 -0700
Subject: [PATCH 1151/2024] govendor: fix license

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

diff --git a/srcpkgs/govendor/template b/srcpkgs/govendor/template
index 76b83b36abb7..e18a8fb0d11c 100644
--- a/srcpkgs/govendor/template
+++ b/srcpkgs/govendor/template
@@ -1,12 +1,12 @@
 # Template file for 'govendor'
 pkgname=govendor
 version=1.0.9
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/kardianos/govendor"
 short_desc="Go vendor tool that works with the standard vendor file"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="BSD"
+license="BSD-3-Clause"
 homepage="https://github.com/kardianos/govendor"
 distfiles="https://github.com/kardianos/govendor/archive/v${version}.tar.gz"
 checksum=d303abf194838792234a1451c3a1e87885d1b2cd21774867b592c1f7db00551e

From 3b6df2f80ed3cd78b8a2c6ca5cb3d4777732b236 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 08:57:58 -0700
Subject: [PATCH 1152/2024] gperf: fix license

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

diff --git a/srcpkgs/gperf/template b/srcpkgs/gperf/template
index 4fb373ec885b..023fe89d6c56 100644
--- a/srcpkgs/gperf/template
+++ b/srcpkgs/gperf/template
@@ -1,11 +1,11 @@
 # Template file for 'gperf'
 pkgname=gperf
 version=3.1
-revision=2
+revision=3
 build_style=gnu-configure
 short_desc="Perfect hash function generator"
-homepage="https://www.gnu.org/software/gperf/"
-license="GPL-3"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="https://www.gnu.org/software/gperf/"
 distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.gz"
 checksum=588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2

From e9a562080c9ec9543c4d7b7555300875b530190f Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 09:00:53 -0700
Subject: [PATCH 1153/2024] gpm: fix license

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

diff --git a/srcpkgs/gpm/template b/srcpkgs/gpm/template
index d95a6c1a6377..360f58668c53 100644
--- a/srcpkgs/gpm/template
+++ b/srcpkgs/gpm/template
@@ -1,13 +1,13 @@
 # Template file for 'gpm'
 pkgname=gpm
 version=1.20.7
-revision=9
+revision=10
 build_style=gnu-configure
 hostmakedepends="automake libtool flex texinfo"
 makedepends="ncurses-devel libfl-devel"
 short_desc="Mouse server for the console and xterm"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://www.nico.schottelius.org/software/gpm/"
 distfiles="http://www.nico.schottelius.org/software/gpm/archives/gpm-${version}.tar.lzma"
 checksum=a955053b36556ffa7c628ce18fd6de7d625966573fa412fb08869533d8f7385c

From d528435b033278e9223578ce157ceafd37ad321d Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 09:42:09 -0700
Subject: [PATCH 1154/2024] grail: fix license, other lint

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

diff --git a/srcpkgs/grail/template b/srcpkgs/grail/template
index 7d4a374512b3..3f4382a7f3f4 100644
--- a/srcpkgs/grail/template
+++ b/srcpkgs/grail/template
@@ -1,17 +1,17 @@
-# Template build file for 'grail'
+# Template file for 'grail'
 pkgname=grail
 version=3.1.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-x11"
+hostmakedepends="pkg-config"
+makedepends="frame-devel libXfixes-devel libXi-devel"
 short_desc="Gesture Recognition And Instantiation Library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="LGPL-3"
+license="LGPL-3.0-only"
 homepage="https://launchpad.net/grail"
 distfiles="https://launchpad.net/${pkgname}/trunk/${version}/+download/${pkgname}-${version}.tar.bz2"
 checksum=5eed1f650f042481daa3a2de5e7d43261fe343b2a1b1e240f3b7fc26572c9df3
-hostmakedepends="pkg-config"
-makedepends="frame-devel libXfixes-devel libXi-devel"
-configure_args="--with-x11"
 
 grail-devel_package() {
 	depends="grail>=${version}_${revision}"

From 5fd8c9db122e8147bd7d75f19260718974e57f5c Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 10:11:23 -0700
Subject: [PATCH 1155/2024] gsimplecal-gtk2: fix license, other lint

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

diff --git a/srcpkgs/gsimplecal-gtk2/template b/srcpkgs/gsimplecal-gtk2/template
index 4712e1d854d3..73cf3bd39b88 100644
--- a/srcpkgs/gsimplecal-gtk2/template
+++ b/srcpkgs/gsimplecal-gtk2/template
@@ -1,20 +1,21 @@
 # Template file for 'gsimplecal-gtk2'
 pkgname=gsimplecal-gtk2
 version=2.1
-revision=3
+revision=4
 wrksrc="${pkgname%-*}-${version}"
 build_style=gnu-configure
 configure_args="--enable-gtk2"
-makedepends="gtk+-devel"
 hostmakedepends="automake pkg-config"
-replaces="gsimplecal-gtk3>=0"
+makedepends="gtk+-devel"
 short_desc="Simple and lightweight GTK calendar"
 maintainer="Jarbowski <jarbowski@gmail.com>"
-license="BSD"
+license="BSD-3-Clause"
 homepage="http://dmedvinsky.github.io/gsimplecal/"
 distfiles="https://github.com/dmedvinsky/${pkgname%-*}/archive/v${version}.tar.gz"
 checksum="660cac7333d3507203a008e142e2b8f5dfcf0735b6ccabdd8d3d902b5d2c40e9"
 
+replaces="gsimplecal-gtk3>=0"
+
 pre_configure() {
 	./autogen.sh
 }

From 4fbbedcfaa0599b0ec0e90af06220e376d1036b5 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 10:21:46 -0700
Subject: [PATCH 1156/2024] gsl-ucg: fix license

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

diff --git a/srcpkgs/gsl-ucg/template b/srcpkgs/gsl-ucg/template
index 840a2be23e02..5ae1d27e5f8f 100644
--- a/srcpkgs/gsl-ucg/template
+++ b/srcpkgs/gsl-ucg/template
@@ -1,14 +1,14 @@
 # Template file for 'gsl-ucg'
 pkgname=gsl-ucg
 version=4.1.5
-revision=1
+revision=2
 wrksrc="gsl-${version}"
 build_wrksrc="src"
 build_style=gnu-makefile
 makedepends="pcre-devel"
 short_desc="Generator Scripting Language - Universal Code Generator"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="https://github.com/zeromq/gsl"
 distfiles="https://github.com/zeromq/gsl/archive/v${version}.tar.gz"
 checksum=c1c3d61a1d89b65d0d1161c803bcdd6364045cc20d7e0c1f67f0955cd9b326b0

From 0a2983109439e24a42d024fa55d40045c6c96fa7 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 10:44:15 -0700
Subject: [PATCH 1157/2024] gsimplecal-gtk3: fix license, other lint

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

diff --git a/srcpkgs/gsimplecal-gtk3/template b/srcpkgs/gsimplecal-gtk3/template
index 57b595e0f4f5..52acc624d51c 100644
--- a/srcpkgs/gsimplecal-gtk3/template
+++ b/srcpkgs/gsimplecal-gtk3/template
@@ -1,19 +1,20 @@
 # Template file for 'gsimplecal-gtk3'
 pkgname=gsimplecal-gtk3
 version=2.1
-revision=3
+revision=4
 wrksrc="${pkgname%-*}-${version}"
 build_style=gnu-configure
-makedepends="gtk+3-devel"
 hostmakedepends="automake pkg-config"
-replaces="gsimplecal-gtk2>=0"
+makedepends="gtk+3-devel"
 short_desc="Simple and lightweight GTK calendar"
 maintainer="Jarbowski <jarbowski@gmail.com>"
-license="BSD"
+license="BSD-3-Clause"
 homepage="http://dmedvinsky.github.io/gsimplecal/"
 distfiles="https://github.com/dmedvinsky/${pkgname%-*}/archive/v${version}.tar.gz"
 checksum="660cac7333d3507203a008e142e2b8f5dfcf0735b6ccabdd8d3d902b5d2c40e9"
 
+replaces="gsimplecal-gtk2>=0"
+
 pre_configure() {
 	./autogen.sh
 }

From c2b5ce00564804129ab999b177152ad4948c74da Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 11:04:55 -0700
Subject: [PATCH 1158/2024] gsmartcontrol: fix license

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

diff --git a/srcpkgs/gsmartcontrol/template b/srcpkgs/gsmartcontrol/template
index ac519e56c3cd..3574f4a63770 100644
--- a/srcpkgs/gsmartcontrol/template
+++ b/srcpkgs/gsmartcontrol/template
@@ -1,14 +1,14 @@
 # Template file for 'gsmartcontrol'
 pkgname=gsmartcontrol
 version=1.1.3
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="gtkmm-devel pcre-devel desktop-file-utils"
 depends="smartmontools hicolor-icon-theme"
 short_desc="GUI to smartmontools"
 maintainer="yopito <pierre.bourgin@free.fr>"
-license="GPL-3"
+license="GPL-2.0-or-later"
 homepage="http://gsmartcontrol.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
 checksum=b64f62cffa4430a90b6d06cd52ebadd5bcf39d548df581e67dfb275a673b12a9

From 2174c2c8033a5e5f38d48ec97254627f792c0df0 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 11:20:58 -0700
Subject: [PATCH 1159/2024] gst123: fix license, other lint

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

diff --git a/srcpkgs/gst123/template b/srcpkgs/gst123/template
index 95cf767befd2..f3a2d41316b2 100644
--- a/srcpkgs/gst123/template
+++ b/srcpkgs/gst123/template
@@ -1,15 +1,15 @@
 # Template file for 'gst123'
 pkgname=gst123
 version=0.3.5
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake pkg-config"
 makedepends="ncurses-devel gtk+-devel libxml2-devel gst-plugins-base1-devel gst-plugins-good1"
 depends="gst-plugins-good1"
 short_desc="GStreamer based CLI player"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="LGPL-2.1-or-later"
 homepage="http://space.twc.de/~stefan/gst123.php/"
-license="LGPL-2.1"
 distfiles="http://space.twc.de/~stefan/gst123/gst123-$version.tar.bz2"
 checksum=c7b4729773f66cc679e94df76bcc6a95a2222192730f906e527e72624f084a7d
 

From 349966af813df22f70cfa4ab2a7085029badd873 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 12:04:05 -0700
Subject: [PATCH 1160/2024] gtk-theme-config: fix license, vsed

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

diff --git a/srcpkgs/gtk-theme-config/template b/srcpkgs/gtk-theme-config/template
index bb927821042f..6dd97132c14c 100644
--- a/srcpkgs/gtk-theme-config/template
+++ b/srcpkgs/gtk-theme-config/template
@@ -2,14 +2,14 @@
 pkgname=gtk-theme-config
 reverts=20140605_1
 version=1.0
-revision=2
+revision=3
 build_style=gnu-makefile
 hostmakedepends="pkg-config vala-devel"
 makedepends="glib-devel vala-devel gtk+3-devel hicolor-icon-theme desktop-file-utils"
 depends="hicolor-icon-theme desktop-file-utils"
 short_desc="Utility to set GTK Theme Preferences"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3"
+license="GPL-3.0-only"
 homepage="https://github.com/satya164/gtk-theme-config"
 distfiles="$homepage/archive/v$version.tar.gz"
 checksum=174aac3ea43966168d120dbd9e0f23d7900d095ee1b0cf32472d59b0fdea8448
@@ -26,5 +26,5 @@ pre_build() {
 		_ldflags="${_ldflags} -X $_p"
 	done
 	# Add to VALACFLAGS
-	sed -i Makefile -e "s;^VALACFLAGS.*;& $_cflags $_ldflags;"
+	vsed -i Makefile -e "s;^VALACFLAGS.*;& $_cflags $_ldflags;"
 }

From 90a85a8636f260f3a679378cb03a173034837019 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 12:06:21 -0700
Subject: [PATCH 1161/2024] gtypist: fix license, other lint

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

diff --git a/srcpkgs/gtypist/template b/srcpkgs/gtypist/template
index 723bc1664465..d4bf9dc41846 100644
--- a/srcpkgs/gtypist/template
+++ b/srcpkgs/gtypist/template
@@ -1,15 +1,16 @@
+# Template file for 'gtypist'
 pkgname=gtypist
 version=2.9.5
-revision=1
-short_desc="A universal typing tutor"
+revision=2
+build_style=gnu-configure
+hostmakedepends="automake"
+makedepends="ncurses-devel"
+short_desc="Universal typing tutor"
 maintainer="Phileas Vöcking <paspartout@fogglabs.de>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/gtypist/"
 distfiles="$GNU_SITE/gtypist/gtypist-${version}.tar.xz"
 checksum="c13af40b12479f8219ffa6c66020618c0ce305ad305590fde02d2c20eb9cf977"
-build_style=gnu-configure
-makedepends="ncurses-devel"
-hostmakedepends="automake"
 
 pre_configure() {
 	autoreconf

From 88fc74a3a6b3e55812b61e286aa084fb7c4915a5 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 12:48:01 -0700
Subject: [PATCH 1162/2024] gv: fix license, other lint

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

diff --git a/srcpkgs/gv/template b/srcpkgs/gv/template
index e15cfeb71f7b..60d34b5f472b 100644
--- a/srcpkgs/gv/template
+++ b/srcpkgs/gv/template
@@ -1,12 +1,8 @@
 # Template file for 'gv'
 pkgname=gv
 version=3.7.4
-revision=4
+revision=5
 build_style=gnu-configure
-maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://www.gnu.org/software/gv/"
-license="GPL-2"
-short_desc="Postscript and PDF viewer"
 configure_args=" --with-x --enable-backing-pixmap
  --enable-international --with-default-papersize=a4"
 hostmakedepends="pkg-config xorgproto"
@@ -14,6 +10,10 @@ makedepends="libX11-devel libXmu-devel libXpm-devel libXext-devel
  libXt-devel libICE-devel libXaw3d-devel zlib-devel bzip2-devel
  libXinerama-devel ghostscript"
 depends="ghostscript"
+short_desc="Postscript and PDF viewer"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="http://www.gnu.org/software/gv/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum="2162b3b3a95481d3855b3c4e28f974617eef67824523e56e20b56f12fe201a61"
 

From 6959aad0a33c6d8a7a8204b0e27bfe957ff996b4 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Wed, 14 Apr 2021 17:39:22 -0400
Subject: [PATCH 1163/2024] steam: move documentation to README.voidlinux

---
 srcpkgs/steam/INSTALL.msg            | 25 ++-------------
 srcpkgs/steam/files/README.voidlinux | 48 ++++++++++++++++++++++++++++
 srcpkgs/steam/template               |  5 ++-
 3 files changed, 54 insertions(+), 24 deletions(-)
 create mode 100644 srcpkgs/steam/files/README.voidlinux

diff --git a/srcpkgs/steam/INSTALL.msg b/srcpkgs/steam/INSTALL.msg
index 196c392f45be..3f33b10f959e 100644
--- a/srcpkgs/steam/INSTALL.msg
+++ b/srcpkgs/steam/INSTALL.msg
@@ -1,23 +1,2 @@
-Steam on x86_64 requires support for OpenGL/Vulkan in 32bits mode,
-the 32bit packages are available in the `multilib` repository.
-
-	# xbps-install -Syv void-repo-multilib{,-nonfree}
-	# xbps-install -S
-
-Generic (for all systems):
-
-	- libgcc-32bit libstdc++-32bit libdrm-32bit libglvnd-32bit
-
-For users of the open source drivers:
-
-	- mesa-dri-32bit
-
-For users of the proprietary NVIDIA driver:
-
-	- nvidia-libs-32bit (latest nvidia package)
-	- nvidia390-libs-32bit (latest previous package)
-	- nvidia340-libs-32bit (latest package for old GPUs)
-
-For mesa users this would result in:
-
-	# xbps-install -Syv libgcc-32bit libstdc++-32bit libdrm-32bit libglvnd-32bit mesa-dri-32bit
+Consult /usr/share/doc/steam/README.voidlinux for further installation
+instructions and troubleshooting information.
diff --git a/srcpkgs/steam/files/README.voidlinux b/srcpkgs/steam/files/README.voidlinux
new file mode 100644
index 000000000000..35d1fe4798d0
--- /dev/null
+++ b/srcpkgs/steam/files/README.voidlinux
@@ -0,0 +1,48 @@
+Steam on i686 should work without needing to install any extra packages.
+Steam on x86_64 requires support for OpenGL/Vulkan in 32bits mode,
+the 32bit packages are available in the multilib repository.
+
+	# xbps-install -S void-repo-multilib{,-nonfree}
+	# xbps-install -S
+
+Generic (for all systems):
+
+	- libgcc-32bit libstdc++-32bit libdrm-32bit libglvnd-32bit
+
+For users of the open source drivers:
+
+	- mesa-dri-32bit
+
+For users of the proprietary NVIDIA driver:
+
+	- nvidia-libs-32bit (latest nvidia package)
+	- nvidia390-libs-32bit (latest previous package)
+
+For mesa users this would result in:
+
+	# xbps-install -S libgcc-32bit libstdc++-32bit libdrm-32bit libglvnd-32bit mesa-dri-32bit
+
+The dbus service must be enabled, and the mono package will need to be
+installed for some games to function.
+
+If games are running slowly or not at all, or there are issues with network
+streaming, verify that your user belongs to the video group.
+
+If your audio is not working, try installing pulseaudio and
+alsa-plugins-pulseaudio.
+
+If you are encountering runtime errors, the Steam Ubuntu bootstrap tarball might
+be using an incompatible libstdc++ library. You can verify this by running the
+following command:
+
+	$ LIBGL_DEBUG=verbose steam
+
+If that is the issue, removing the supplied libstdc++ from
+~/.local/share/steam will fix it. Note that this is a temporary solution, as
+this file will be restored every time the Steam client is updated. For a more
+reliable solution, you can try overriding problematic libraries with
+LD_PRELOAD:
+
+	$ LD_PRELOAD='/usr/$LIB/libstdc++.so.6 /usr/$LIB/libgcc_s.so.1 /usr/$LIB/libxcb.so.1' steam
+
+For convenience, you can put this in a script or an alias.
diff --git a/srcpkgs/steam/template b/srcpkgs/steam/template
index 972db525e1eb..1574edc98dd1 100644
--- a/srcpkgs/steam/template
+++ b/srcpkgs/steam/template
@@ -1,7 +1,7 @@
 # Template file for 'steam'
 pkgname=steam
 version=1.0.0.70
-revision=1
+revision=2
 archs="i686 x86_64"
 wrksrc=steam-launcher
 depends="zenity xz curl dbus freetype gdk-pixbuf hicolor-icon-theme desktop-file-utils
@@ -30,4 +30,7 @@ do_install() {
 	# Device support for Steam-related hardware (e.g. controllers over Steam Link)
 	vinstall ${FILESDIR}/60-steam-input.rules 644 usr/lib/udev/rules.d
 	vinstall ${FILESDIR}/60-steam-vr.rules 644 usr/lib/udev/rules.d
+
+	# Void-specific documentation.
+	vdoc "${FILESDIR}/README.voidlinux"
 }

From 30e8956f715e0ca93f5364a899eaffa422bfce8e 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, 8 Apr 2021 08:12:32 +0700
Subject: [PATCH 1164/2024] libxslt: fix xslt-config

---
 srcpkgs/libxslt/template | 27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/libxslt/template b/srcpkgs/libxslt/template
index e38b28fff11b..42d80f08ac98 100644
--- a/srcpkgs/libxslt/template
+++ b/srcpkgs/libxslt/template
@@ -1,10 +1,10 @@
 # Template file for 'libxslt'
 pkgname=libxslt
 version=1.1.34
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--disable-static --disable-dependency-tracking"
-hostmakedepends="libtool"
+hostmakedepends="libtool python-devel libxml2-python pkg-config"
 makedepends="python-devel libxml2-devel libxml2-python libgcrypt-devel"
 short_desc="XSLT parser library from the GNOME project"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -15,33 +15,26 @@ distfiles="http://xmlsoft.org/sources/libxslt-${version}.tar.gz
 checksum="98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f
  98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f"
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends="libtool automake gettext-devel ${makedepends}"
-	pre_build() {
-		sed -e "s|/usr/\(include/python2.7\)|$XBPS_CROSS_BASE/\1|g" \
-			-e "s|/usr/\(lib/python2.7/site-packages\)|$XBPS_CROSS_BASE/\1|g" \
-			-i python/Makefile
-	}
-fi
-
 post_configure() {
 	# Remove missing seperators and errors
 	# on don't know how to make target, needed
 	# by Usage:
 	# Makefile is created after configure so fix here
 	find ${wrksrc} -type f -name Makefile | xargs sed -i '/Usage/,/--version/d'
+	if [ "$CROSS_BUILD" ]; then
+		sed -e "s|/usr/include/python2.7|$XBPS_CROSS_BASE/&|g" \
+			-e "s|/usr/lib/python2.7/site-packages|$XBPS_CROSS_BASE/&|g" \
+			-i python/Makefile
+	fi
 }
 
 post_install() {
-	# Remove references to the install(1) wrapper.
-	vsed -e "s,${XBPS_WRAPPERDIR},/usr/bin,g" -i ${DESTDIR}/usr/bin/xslt-config
 	if [ "$CROSS_BUILD" ]; then
 		# Remove $XBPS_CROSS_BASE in pkg-config
+		vsed -i -e "s,-I${XBPS_CROSS_BASE}/usr/include,-I\${includedir}," \
+			$DESTDIR/usr/bin/xslt-config
 		vsed -i -e "s,$XBPS_CROSS_BASE,,g" \
-			$DESTDIR/usr/bin/xslt-config \
-			$DESTDIR/usr/lib/pkgconfig/libxslt.pc \
-			$DESTDIR/usr/lib/pkgconfig/libexslt.pc \
-			$DESTDIR/usr/lib/xsltConf.sh
+			$DESTDIR/usr/lib/pkgconfig/libexslt.pc
 	fi
 	vlicense COPYING
 }

From fdaaf108146cd8824071b25a086aa73aced3c1be 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, 6 Apr 2021 22:46:16 +0700
Subject: [PATCH 1165/2024] recoll: update to 1.30.0.

---
 .../patches/{musl-pxattr.patch => musl.patch} | 14 +++++++++++++
 srcpkgs/recoll/template                       | 21 +++++--------------
 2 files changed, 19 insertions(+), 16 deletions(-)
 rename srcpkgs/recoll/patches/{musl-pxattr.patch => musl.patch} (52%)

diff --git a/srcpkgs/recoll/patches/musl-pxattr.patch b/srcpkgs/recoll/patches/musl.patch
similarity index 52%
rename from srcpkgs/recoll/patches/musl-pxattr.patch
rename to srcpkgs/recoll/patches/musl.patch
index 22cee3331302..c57aca4a565d 100644
--- a/srcpkgs/recoll/patches/musl-pxattr.patch
+++ b/srcpkgs/recoll/patches/musl.patch
@@ -1,3 +1,17 @@
+Index: utils/fstreewalk.cpp
+===================================================================
+--- utils/fstreewalk.cpp.orig
++++ utils/fstreewalk.cpp
+@@ -17,6 +17,7 @@
+ 
+ #include "autoconfig.h"
+ 
++#include <sys/types.h>
+ #include <stdio.h>
+ 
+ #include <errno.h>
+Index: utils/pxattr.cpp
+===================================================================
 --- utils/pxattr.cpp	2017-07-03 14:14:46.000000000 +0200
 +++ utils/pxattr.cpp	2017-12-17 14:34:29.955674837 +0100
 @@ -44,7 +44,7 @@
diff --git a/srcpkgs/recoll/template b/srcpkgs/recoll/template
index 98fda41bbcad..8c5de6966a46 100644
--- a/srcpkgs/recoll/template
+++ b/srcpkgs/recoll/template
@@ -1,12 +1,13 @@
 # Template file for 'recoll'
 pkgname=recoll
-version=1.26.1
-revision=2
+version=1.30.0
+revision=1
 build_style=gnu-configure
 build_helper=qmake
 configure_args="--disable-python-module --disable-python-chm
  --enable-recollq --disable-x11mon"
-hostmakedepends="automake libtool gettext-devel qt5-qmake"
+hostmakedepends="automake libtool gettext-devel qt5-qmake pkg-config
+ qt5-host-tools"
 makedepends="xapian-core-devel zlib-devel libuuid-devel qt5-webkit-devel qt5-devel
  aspell-devel libxslt-devel libxml2-devel"
 short_desc="Full text search tool based on Xapian backend"
@@ -14,16 +15,4 @@ maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"
 license="GPL-2.0-or-later"
 homepage="https://www.lesbonscomptes.com/recoll/"
 distfiles="https://www.lesbonscomptes.com/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=438f251c24baf954020cf3298872c74982f4c4abffd10197d7700db83072e732
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-host-tools qt5-devel qt5-webkit-devel"
-
-	pre_configure() {
-		# xslt-config has the libxml2 hardcoded to /usr/include/libxml2
-		# use cross path instead.
-		vsed -e 's;-I/usr/include/libxml2;-I${includedir}/libxml2;' \
-			-e 's;libs="-lxslt -L/usr/lib -lxml2";libs="-lxslt -lxml2";g' \
-			-i ${XBPS_WRAPPERDIR}/xslt-config
-	}
-fi
+checksum=17a8e684a8d5560dc7b44cd4b2962cb46476a75bdc107f622051235076d11885

From 3e3b9d376c6da70c082ad654afcac569d0b2fea4 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@VoidLinux.org>
Date: Sun, 11 Apr 2021 02:32:01 -0700
Subject: [PATCH 1166/2024] xbps-src: Add remove-obsoletes command

---
 common/xbps-src/shutils/remove_obsoletes.sh | 6 ++++++
 xbps-src                                    | 6 ++++++
 2 files changed, 12 insertions(+)
 create mode 100644 common/xbps-src/shutils/remove_obsoletes.sh

diff --git a/common/xbps-src/shutils/remove_obsoletes.sh b/common/xbps-src/shutils/remove_obsoletes.sh
new file mode 100644
index 000000000000..506ab6855d3e
--- /dev/null
+++ b/common/xbps-src/shutils/remove_obsoletes.sh
@@ -0,0 +1,6 @@
+remove_obsoletes () {
+    for repo in $XBPS_HOSTDIR/binpkgs $XBPS_HOSTDIR/binpkgs/debug $XBPS_HOSTDIR/binpkgs/nonfree $XBPS_HOSTDIR/binpkgs/multilib/  $XBPS_HOSTDIR/binpkgs/multilib/nonfree ; do
+        msg_normal "Cleaning $repo\n"
+        XBPS_ARCH=${XBPS_CROSS_TARGET:-$XBPS_MACHINE} $XBPS_RINDEX_CMD -r $repo
+    done
+}
diff --git a/xbps-src b/xbps-src
index 9d88873ab2c5..379bdd36bfd6 100755
--- a/xbps-src
+++ b/xbps-src
@@ -78,6 +78,9 @@ remove <pkgname>
 remove-autodeps
     Removes all package dependencies that were installed automatically.
 
+remove-obsoletes
+    Remove all obsolete packages from default repositories as detected by xbps-rindex.
+
 purge-distfiles
     Removes all obsolete distfiles in <hostdir>/sources.
 
@@ -799,6 +802,9 @@ case "$XBPS_TARGET" in
         read_pkg
         remove_pkg $XBPS_CROSS_BUILD
         ;;
+    remove-obsoletes)
+        remove_obsoletes
+        ;;
     list)
         $XBPS_QUERY_CMD -l
         ;;

From fbf8797bd7cfcf563980735deb22586f01b11bfd Mon Sep 17 00:00:00 2001
From: juantascon <juan@horlux.org>
Date: Wed, 14 Apr 2021 17:48:37 +0200
Subject: [PATCH 1167/2024] New package: lets-0.0.29

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

diff --git a/srcpkgs/lets/template b/srcpkgs/lets/template
new file mode 100644
index 000000000000..539f644189e4
--- /dev/null
+++ b/srcpkgs/lets/template
@@ -0,0 +1,16 @@
+# Template file for 'lets'
+pkgname=lets
+version=0.0.29
+revision=1
+build_style=go
+go_import_path="github.com/lets-cli/lets"
+short_desc="CLI task runner for developers - a better alternative to make"
+maintainer="juan <juan@horlux.org>"
+license="MIT"
+homepage="https://lets-cli.org/"
+distfiles="https://github.com/lets-cli/lets/archive/v$version.tar.gz"
+checksum=8dbb82512becd09f12ce347f81132913016cc88007dea4c4d0b4b3eef4e2d264
+
+post_install() {
+	vlicense LICENSE
+}

From 2401ad1e90573141910a14beb4d1e722c8ceff73 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@VoidLinux.org>
Date: Thu, 15 Apr 2021 01:33:58 -0700
Subject: [PATCH 1168/2024] common/xbps-src: Fix remove-obsoletes

---
 common/xbps-src/shutils/remove_obsoletes.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/xbps-src/shutils/remove_obsoletes.sh b/common/xbps-src/shutils/remove_obsoletes.sh
index 506ab6855d3e..3c4222125aa7 100644
--- a/common/xbps-src/shutils/remove_obsoletes.sh
+++ b/common/xbps-src/shutils/remove_obsoletes.sh
@@ -1,6 +1,6 @@
 remove_obsoletes () {
     for repo in $XBPS_HOSTDIR/binpkgs $XBPS_HOSTDIR/binpkgs/debug $XBPS_HOSTDIR/binpkgs/nonfree $XBPS_HOSTDIR/binpkgs/multilib/  $XBPS_HOSTDIR/binpkgs/multilib/nonfree ; do
         msg_normal "Cleaning $repo\n"
-        XBPS_ARCH=${XBPS_CROSS_TARGET:-$XBPS_MACHINE} $XBPS_RINDEX_CMD -r $repo
+        XBPS_ARCH=${XBPS_CROSS_BUILD:-$XBPS_MACHINE} $XBPS_RINDEX_CMD -r $repo
     done
 }

From 7021c52f9fce72226a18172680599c71b81f1523 Mon Sep 17 00:00:00 2001
From: John Zimmermann <me@johnnynator.dev>
Date: Thu, 15 Apr 2021 11:16:05 +0200
Subject: [PATCH 1169/2024] android-tools: update to 31.0.0p1.

---
 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 64382a05c392..f1ed617b7484 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'android-tools'
 pkgname=android-tools
-version=31.0.0
+version=31.0.0p1
 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=0b8f16370072d03e9f26de17ecba7dd44771cb042a23e86869108d57eb22f20d
+checksum=51a4c3ba5f16945905449c4bd2c1c781a4df7469f6b7362f8837f4f640d8c7b6
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 692b5b1418536efa1797ce7634f0bedb88e76792 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 15 Apr 2021 13:53:07 +0200
Subject: [PATCH 1170/2024] nncp: update to 6.3.0.

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

diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template
index 85639e333dcf..5f934bc6f5b3 100644
--- a/srcpkgs/nncp/template
+++ b/srcpkgs/nncp/template
@@ -1,6 +1,6 @@
 # Template file for 'nncp'
 pkgname=nncp
-version=6.2.1
+version=6.3.0
 revision=1
 build_style=go
 go_import_path=cypherpunks.ru/nncp
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-only"
 homepage="http://www.nncpgo.org/"
 distfiles="http://www.nncpgo.org/download/${pkgname}-${version}.tar.xz"
-checksum=d9682d954d68025af5b07516258d9ffcda29a4d7e7e1635be0c219a1c5ddb067
+checksum=76c26a11e3423540bb7b8470820176a35fcd0493b21a872ec223eb9443ba466b
 
 do_build() {
 	make

From 2dfc4be47396b88b98b815005378e0da2bd07d62 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 15 Apr 2021 13:54:06 +0200
Subject: [PATCH 1171/2024] perl-PDF-API2: update to 2.040.

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

diff --git a/srcpkgs/perl-PDF-API2/template b/srcpkgs/perl-PDF-API2/template
index e3be0d9f1667..469ab7ed715b 100644
--- a/srcpkgs/perl-PDF-API2/template
+++ b/srcpkgs/perl-PDF-API2/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-PDF-API2'
 pkgname=perl-PDF-API2
-version=2.039
+version=2.040
 revision=1
 wrksrc="PDF-API2-${version}"
 build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://metacpan.org/release/PDF-API2"
 distfiles="${CPAN_SITE}/PDF/PDF-API2-${version}.tar.gz"
-checksum=36a74318847fe92ecec45221bc78f209e194f9f979521710a89ef7baa955a123
+checksum=4925f109f47bb6bdd6deb8cf37db4f2e39aa6cdc51991d1d8008b4312ed1935a

From eddcdd21f0bc610571e974c998562dbf3f4e7878 Mon Sep 17 00:00:00 2001
From: ThatGeekyWeeb <thatgeekyweeb@gmail.com>
Date: Thu, 15 Apr 2021 06:01:55 -0400
Subject: [PATCH 1172/2024] ocs-url: added qt5-quickcontrols as a dependency 
 there is a runtime bug of 'module QtQuick.Controls is not installed', caused
 by this package missing

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

diff --git a/srcpkgs/ocs-url/template b/srcpkgs/ocs-url/template
index 609cf2992022..29c0d304f730 100644
--- a/srcpkgs/ocs-url/template
+++ b/srcpkgs/ocs-url/template
@@ -1,11 +1,12 @@
 # Template file for 'ocs-url'
 pkgname=ocs-url
 version=3.1.0
-revision=1
+revision=2
 wrksrc="ocs-url-release-${version}"
 build_style="qmake"
 hostmakedepends="qt5-qmake kdeclarative-devel qt5-svg-devel qt5-declarative-devel"
 makedepends="qt5-svg-devel kdeclarative-devel qt5-declarative-devel"
+depends="qt5-quickcontrols"
 short_desc="Install helper program for OpenCollaborationServices (ocs://)"
 maintainer="ThatGeekyWeeb <thatgeekyweeb@gmail.com>"
 license="GPL-3.0-or-later"

From 527f6c17799f187ce1e03d991fdc03948db26369 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, 15 Apr 2021 06:51:37 +0700
Subject: [PATCH 1173/2024] uim: ship a notice for -anthy

Close: #29981
---
 srcpkgs/uim/files/README.voidlinux | 11 +++++++++++
 srcpkgs/uim/template               |  3 ++-
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/uim/files/README.voidlinux

diff --git a/srcpkgs/uim/files/README.voidlinux b/srcpkgs/uim/files/README.voidlinux
new file mode 100644
index 000000000000..69f9beaf055b
--- /dev/null
+++ b/srcpkgs/uim/files/README.voidlinux
@@ -0,0 +1,11 @@
+With the switch of Anthy's upstream to Debian, Anthy switched to
+utf-8 backend. However, it still supports EUC-JP encoding.
+Anthy-utf8 backend needs to be used, though.
+
+Quote from: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=953616
+
+> If you have customized enabled-im-list on "stretch" system (in
+> ~/.uim.d/customs/custom-global.scm) with uim-pref-gtk or other tools,
+> uim sticks to use anthy instead of anthy-utf8 and fails kanji-conversion.
+
+If you have said customization, please remove them.
diff --git a/srcpkgs/uim/template b/srcpkgs/uim/template
index 12df0eddb067..1a782b680f78 100644
--- a/srcpkgs/uim/template
+++ b/srcpkgs/uim/template
@@ -1,7 +1,7 @@
 # Template file for 'uim'
 pkgname=uim
 version=1.8.8
-revision=4
+revision=5
 build_style=gnu-configure
 build_helper=qmake
 configure_args="--enable-pref --enable-fep --with-gtk2 --with-gtk3
@@ -65,6 +65,7 @@ uim-anthy_package() {
 		vmove "usr/lib/uim/plugin/libuim-anthy*.so"
 		vmove "usr/share/uim/anthy*.scm"
 		vmove "usr/share/uim/pixmaps/anthy*.png"
+		vdoc "${FILESDIR}/README.voidlinux"
 	}
 }
 

From a88655e35a4bb49d1f2545fa74245ff445faddf5 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 15 Apr 2021 16:48:59 +0200
Subject: [PATCH 1174/2024] linux5.4: update to 5.4.112.

---
 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 1b2543f16e2a..95072aa2f640 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.111
+version=5.4.112
 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=21626132658dc34cb41b7aa7b80ecf83751890a71ac1a63d77aea9d488271a03
+checksum=b8361d461a4254c86d4c68aa4ceab1debaa3b2ccc6785542d026837a4fc20ca4
 python_version=3
 patch_args="-Np1"
 

From 07ad0ae43214dcebe66e63a37d4f76c858fa6c0c Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Thu, 15 Apr 2021 16:50:27 +0200
Subject: [PATCH 1175/2024] linux4.19: update to 4.19.187.

---
 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 abbc9c9ed08e..357b577d6ba9 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.186
+version=4.19.187
 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=d8c5d7844214510e85ceb9f5236f27f63fc03535a143f3aaa0c1677a8f92e631
+checksum=a04c023cac04b7d2e1c4c98a67a36a56e5b793386470a4d23e45d61e0297a0c3
 python_version=2 #unverified
 patch_args="-Np1"
 

From dfe0a0e885987df8b6cf9cd2190f31f0b31492b1 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:11:50 +0200
Subject: [PATCH 1176/2024] mariadb: update to 10.5.9.

---
 common/shlibs                                 |   8 +-
 srcpkgs/mariadb/INSTALL                       |   4 +-
 srcpkgs/mariadb/INSTALL.msg                   |   3 -
 .../musl-have-stacktrace.patch}               |  10 +-
 .../files/musl-ppc-remove-glibc-dep.patch     |  47 ++++
 srcpkgs/mariadb/patches/atomic-fix.patch      | 108 ++++++++
 srcpkgs/mariadb/patches/c11_atomics.patch     | 128 ---------
 srcpkgs/mariadb/patches/fix-cross.patch       | 141 ++++++++--
 .../patches/mips-connect-unaligned.patch      | 257 ------------------
 .../patches/mips-innobase-atomic.patch        |  20 --
 srcpkgs/mariadb/patches/mips-machine.patch    |  23 --
 srcpkgs/mariadb/patches/musl-ppc.patch        |  26 --
 srcpkgs/mariadb/patches/musl_ucontext-h.patch |  11 -
 srcpkgs/mariadb/patches/ppcle.patch           |  57 ----
 srcpkgs/mariadb/template                      |  99 +++----
 srcpkgs/mariadb/update                        |   2 -
 16 files changed, 332 insertions(+), 612 deletions(-)
 delete mode 100644 srcpkgs/mariadb/INSTALL.msg
 rename srcpkgs/mariadb/{patches/fix-test-stacktrace.patch => files/musl-have-stacktrace.patch} (60%)
 create mode 100644 srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
 create mode 100644 srcpkgs/mariadb/patches/atomic-fix.patch
 delete mode 100644 srcpkgs/mariadb/patches/c11_atomics.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-connect-unaligned.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-innobase-atomic.patch
 delete mode 100644 srcpkgs/mariadb/patches/mips-machine.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl-ppc.patch
 delete mode 100644 srcpkgs/mariadb/patches/musl_ucontext-h.patch
 delete mode 100644 srcpkgs/mariadb/patches/ppcle.patch
 delete mode 100644 srcpkgs/mariadb/update

diff --git a/common/shlibs b/common/shlibs
index 3f35575eeadc..bb2b60e1f247 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -557,8 +557,6 @@ libecpg.so.6 postgresql-libs-13.2_2
 libpgtypes.so.3 postgresql-libs-13.2_2
 libpq.so.5 postgresql-libs-13.2_2
 libmypaint.so.0 libmypaint-1.6.1_1
-libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
-libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.8_1
 libgssrpc.so.4 mit-krb5-libs-1.8_1
 libk5crypto.so.3 mit-krb5-libs-1.8_1
@@ -571,8 +569,6 @@ libkrb5support.so.0 mit-krb5-libs-1.8_1
 libkdb_ldap.so.1 mit-krb5-libs-1.14.2_2
 libverto.so.0 mit-krb5-libs-1.8_1
 libverto-k5ev.so.0 mit-krb5-libs-1.8_1
-libmysqlclient_r.so.18 libmariadbclient-10.1.48_2
-libmysqlclient.so.18 libmariadbclient-10.1.48_2
 libgssapi_krb5.so.2 mit-krb5-libs-1.18.3_2
 libgssrpc.so.4 mit-krb5-libs-1.18.3_2
 libk5crypto.so.3 mit-krb5-libs-1.18.3_2
@@ -1604,14 +1600,12 @@ libdovecot-compression.so.0 dovecot-2.3.13_3
 libdovecot-sql.so.0 dovecot-2.3.13_3
 libdovecot-storage.so.0 dovecot-2.3.13_3
 libdovecot-lda.so.0 dovecot-2.3.13_3
-libmysqld.so.18 libmariadbclient-5.5.36_1
 libdovecot.so.0 dovecot-2.3.13_3
 libdovecot-login.so.0 dovecot-2.3.13_3
 libdovecot-compression.so.0 dovecot-2.3.13_3
 libdovecot-sql.so.0 dovecot-2.3.13_3
 libdovecot-storage.so.0 dovecot-2.3.13_3
 libdovecot-lda.so.0 dovecot-2.3.13_3
-libmysqld.so.18 libmariadbclient-10.1.48_2
 libwiretap.so.11 libwireshark-3.4.0_1
 libwireshark.so.14 libwireshark-3.4.0_1
 libwsutil.so.12 libwireshark-3.4.0_1
@@ -3963,3 +3957,5 @@ 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
+libmariadb.so.3 libmariadbclient-10.5.9_1
+libmariadbd.so.19 libmariadbclient-10.5.9_1
diff --git a/srcpkgs/mariadb/INSTALL b/srcpkgs/mariadb/INSTALL
index 171f3bc4d7e2..256a89f2dfb8 100644
--- a/srcpkgs/mariadb/INSTALL
+++ b/srcpkgs/mariadb/INSTALL
@@ -2,8 +2,6 @@
 #
 case ${ACTION} in
 post)
-	install -dm0700 var/lib/mysql
-	usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
-	chown -R mysql:mysql var/lib/mysql
+	chpst -u mysql:mysql usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
 	;;
 esac
diff --git a/srcpkgs/mariadb/INSTALL.msg b/srcpkgs/mariadb/INSTALL.msg
deleted file mode 100644
index 32f7ba8b8b54..000000000000
--- a/srcpkgs/mariadb/INSTALL.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-If you come from a System that used the MySQL package,
-than restart your mysql service and upgrade your database
-wtih mysql_upgrade(1)
diff --git a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
similarity index 60%
rename from srcpkgs/mariadb/patches/fix-test-stacktrace.patch
rename to srcpkgs/mariadb/files/musl-have-stacktrace.patch
index 54a068bf06ee..4d87f57ddc9e 100644
--- a/srcpkgs/mariadb/patches/fix-test-stacktrace.patch
+++ b/srcpkgs/mariadb/files/musl-have-stacktrace.patch
@@ -1,13 +1,11 @@
 https://jira.mariadb.org/browse/MDEV-24131
 
-diff --git a/unittest/mysys/stacktrace-t.c b/unittest/mysys/stacktrace-t.c
-index 8fa0db15b36..67eb099028e 100644
---- unittest/mysys/stacktrace-t.c
-+++ unittest/mysys/stacktrace-t.c
+--- ./unittest/mysys/stacktrace-t.c
++++ ./unittest/mysys/stacktrace-t.c
 @@ -22,6 +22,14 @@
- 
+
  char b_bss[10];
- 
+
 +#ifndef HAVE_STACKTRACE
 +int  my_safe_print_str(const char* val, size_t max_len)
 +{
diff --git a/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
new file mode 100644
index 000000000000..1346edebfb96
--- /dev/null
+++ b/srcpkgs/mariadb/files/musl-ppc-remove-glibc-dep.patch
@@ -0,0 +1,47 @@
+--- ./include/my_cpu.h
++++ ./include/my_cpu.h
+@@ -24,17 +24,16 @@
+ */
+ 
+ #ifdef _ARCH_PWR8
+-#include <sys/platform/ppc.h>
+ /* Very low priority */
+-#define HMT_very_low() __ppc_set_ppr_very_low()
++#define HMT_very_low() asm volatile("or 31,31,31")
+ /* Low priority */
+-#define HMT_low() __ppc_set_ppr_low()
++#define HMT_low() asm volatile ("or 1,1,1")
+ /* Medium low priority */
+-#define HMT_medium_low() __ppc_set_ppr_med_low()
++#define HMT_medium_low() asm volatile ("or 6,6,6")
+ /* Medium priority */
+-#define HMT_medium() __ppc_set_ppr_med()
++#define HMT_medium() asm volatile ("or 2,2,2")
+ /* Medium high priority */
+-#define HMT_medium_high() __ppc_set_ppr_med_high()
++#define HMT_medium_high() asm volatile("or 5,5,5")
+ /* High priority */
+ #define HMT_high() asm volatile("or 3,3,3")
+ #else
+@@ -72,7 +71,7 @@ static inline void MY_RELAX_CPU(void)
+   __asm__ __volatile__ ("pause");
+ #endif
+ #elif defined(_ARCH_PWR8)
+-  __ppc_get_timebase();
++  __builtin_ppc_get_timebase();
+ #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
+   /* Mainly, prevent the compiler from optimizing away delay loops */
+   __asm__ __volatile__ ("":::"memory");
+diff --git a/storage/tokudb/PerconaFT/portability/toku_time.h b/storage/tokudb/PerconaFT/portability/toku_time.h
+index c4c45b8e..2f7a07f5 100644
+--- ./storage/tokudb/PerconaFT/portability/toku_time.h
++++ ./storage/tokudb/PerconaFT/portability/toku_time.h
+@@ -110,7 +110,7 @@ static inline tokutime_t toku_time_now(void) {
+     __asm __volatile__ ("mrs %[rt], cntvct_el0" : [rt] "=r" (result));
+     return result;
+ #elif defined(__powerpc__)
+-    return __ppc_get_timebase();
++    return __builtin_ppc_get_timebase();
+ #else
+ #error No timer implementation for this platform
+ #endif
diff --git a/srcpkgs/mariadb/patches/atomic-fix.patch b/srcpkgs/mariadb/patches/atomic-fix.patch
new file mode 100644
index 000000000000..4ad06786f150
--- /dev/null
+++ b/srcpkgs/mariadb/patches/atomic-fix.patch
@@ -0,0 +1,108 @@
+Forwarded: https://github.com/MariaDB/server/pull/1716
+Author: Vicențiu Ciorbaru <vicentiu@mariadb.org>
+Date:   Fri Dec 21 19:14:04 2018 +0200
+
+   Link with libatomic to enable C11 atomics support
+
+   Some architectures (mips) require libatomic to support proper
+   atomic operations. Check first if support is available without
+   linking, otherwise use the library.
+
+   Original commit:
+   Detect whether libatomic is needed rather than hard-coding for mips
+
+   Fixes FTBFS on powerpc, since it needs libatomic too for C11 atomics,
+   and possibly m68k.
+
+   Contributors:
+   James Cowgill <jcowgill@debian.org>
+   Jessica Clarke <jrtc27@debian.org>
+
+--- configure.cmake
++++ configure.cmake
+@@ -862,7 +862,25 @@ int main()
+   long long int *ptr= &var;
+   return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
+ }"
+-HAVE_GCC_C11_ATOMICS)
++HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
++IF (HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
++  SET(HAVE_GCC_C11_ATOMICS True)
++ELSE()
++  SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
++  LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
++  CHECK_CXX_SOURCE_COMPILES("
++  int main()
++  {
++    long long int var= 1;
++    long long int *ptr= &var;
++    return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
++  }"
++  HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++  IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++    SET(HAVE_GCC_C11_ATOMICS True)
++  ENDIF()
++  SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
++ENDIF()
+
+ IF(WITH_VALGRIND)
+   SET(HAVE_valgrind 1)
+--- mysys/CMakeLists.txt
++++ mysys/CMakeLists.txt
+@@ -154,6 +154,10 @@ TARGET_LINK_LIBRARIES(mysys dbug strings
+  ${LIBNSL} ${LIBM} ${LIBRT} ${CMAKE_DL_LIBS} ${LIBSOCKET} ${LIBEXECINFO})
+ DTRACE_INSTRUMENT(mysys)
+
++IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++  TARGET_LINK_LIBRARIES(mysys atomic)
++ENDIF()
++
+ IF(HAVE_BFD_H)
+   TARGET_LINK_LIBRARIES(mysys bfd)
+ ENDIF(HAVE_BFD_H)
+--- sql/CMakeLists.txt
++++ sql/CMakeLists.txt
+@@ -318,6 +318,10 @@ IF(WITH_MYSQLD_LDFLAGS)
+      "${MYSQLD_LINK_FLAGS} ${WITH_MYSQLD_LDFLAGS}")
+ ENDIF()
+
++IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++  TARGET_LINK_LIBRARIES(sql atomic)
++ENDIF()
++
+
+ FIND_PACKAGE(BISON 2.0)
+
+From f447aca534d1a12809eeb146e8220d305cc3884d Mon Sep 17 00:00:00 2001
+From: Mingli Yu <mingli.yu@windriver.com>
+Date: Thu, 9 Apr 2020 14:07:19 +0800
+Subject: [PATCH] build_rocksdb.cmake: fix atomic support on arm
+
+Check to link with libatomic to enable C11 atomics support
+to fix below build error on arm:
+| /build/tmp/work/armv5e-wrs-linux-gnueabi/mariadb/10.3.13-r0/recipe-sysroot-native/usr/bin/arm-wrs-linux-gnueabi/../../libexec/arm-wrs-linux-gnueabi/gcc/arm-wrs-linux-gnueabi/8.3.0/ld.bfd: librocksdblib.a(env_posix.cc.o): in function `std::__atomic_base<unsigned long long>::store(unsigned long long, std::memory_order)':
+| /usr/include/c++/8.3.0/bits/atomic_base.h:374: undefined reference to `__atomic_store_8'
+
+Upstream-Status: Pending
+
+Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
+---
+ storage/rocksdb/build_rocksdb.cmake | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/storage/rocksdb/build_rocksdb.cmake b/storage/rocksdb/build_rocksdb.cmake
+index d7895b0..3bcd52a 100644
+--- storage/rocksdb/build_rocksdb.cmake
++++ storage/rocksdb/build_rocksdb.cmake
+@@ -470,6 +470,9 @@ list(APPEND SOURCES ${CMAKE_CURRENT_BINARY_DIR}/build_version.cc)
+
+ ADD_CONVENIENCE_LIBRARY(rocksdblib ${SOURCES})
+ target_link_libraries(rocksdblib ${THIRDPARTY_LIBS} ${SYSTEM_LIBS})
++IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
++  TARGET_LINK_LIBRARIES(rocksdblib atomic)
++ENDIF()
+ IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+   set_target_properties(rocksdblib PROPERTIES COMPILE_FLAGS "-fPIC -fno-builtin-memcmp -Wno-error")
+ endif()
+--
+2.7.4
diff --git a/srcpkgs/mariadb/patches/c11_atomics.patch b/srcpkgs/mariadb/patches/c11_atomics.patch
deleted file mode 100644
index da84c12a0e14..000000000000
--- a/srcpkgs/mariadb/patches/c11_atomics.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: c11_atomics
-
----
- configure.cmake               | 23 +++++++++++++++++++++--
- include/atomic/gcc_builtins.h | 15 +++++++++++++++
- include/atomic/nolock.h       |  4 ++--
- mysys/CMakeLists.txt          |  4 ++++
- sql/CMakeLists.txt            |  4 ++++
- 5 files changed, 46 insertions(+), 4 deletions(-)
-
---- configure.cmake
-+++ configure.cmake
-@@ -128,7 +128,7 @@ IF(UNIX)
-   ENDIF()
-   FIND_PACKAGE(Threads)
- 
--  SET(CMAKE_REQUIRED_LIBRARIES 
-+  LIST(APPEND CMAKE_REQUIRED_LIBRARIES
-     ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT} ${LIBEXECINFO})
-   # Need explicit pthread for gcc -fsanitize=address
-   IF(CMAKE_USE_PTHREADS_INIT AND CMAKE_C_FLAGS MATCHES "-fsanitize=")
-@@ -1038,7 +1038,26 @@ ELSEIF(NOT WITH_ATOMIC_OPS)
-     long long int *ptr= &var;
-     return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-   }"
--  HAVE_GCC_C11_ATOMICS)
-+  HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+  IF(HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+    SET(HAVE_GCC_C11_ATOMICS True)
-+  ELSE()
-+    SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
-+    LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
-+    CHECK_CXX_SOURCE_COMPILES("
-+    int main()
-+    {
-+      long long int var= 1;
-+      long long int *ptr= &var;
-+      return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-+    }"
-+    HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+    IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+      SET(HAVE_GCC_C11_ATOMICS True)
-+    ELSE()
-+      SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
-+    ENDIF()
-+  ENDIF()
- ELSE()
-   MESSAGE(FATAL_ERROR "${WITH_ATOMIC_OPS} is not a valid value for WITH_ATOMIC_OPS!")
- ENDIF()
---- include/atomic/gcc_builtins.h
-+++ include/atomic/gcc_builtins.h
-@@ -16,6 +16,7 @@
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
-+#if defined (HAVE_GCC_ATOMIC_BUILTINS)
- #define make_atomic_add_body(S)                     \
-   v= __sync_fetch_and_add(a, v);
- #define make_atomic_fas_body(S)                     \
-@@ -26,6 +27,20 @@
-   sav= __sync_val_compare_and_swap(a, cmp_val, set);\
-   if (!(ret= (sav == cmp_val))) *cmp= sav
- 
-+#elif defined(HAVE_GCC_C11_ATOMICS)
-+
-+#define make_atomic_add_body(S)                     \
-+  v= __atomic_fetch_add(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_fas_body(S)                     \
-+  v= __atomic_exchange_n(a, v, __ATOMIC_SEQ_CST)
-+#define make_atomic_cas_body(S)                     \
-+  int ## S sav;                                     \
-+  ret= __atomic_compare_exchange_n(a, cmp, set,     \
-+                                   0,               \
-+                                   __ATOMIC_SEQ_CST,\
-+                                   __ATOMIC_SEQ_CST);
-+#endif
-+
- #ifdef MY_ATOMIC_MODE_DUMMY
- #define make_atomic_load_body(S)   ret= *a
- #define make_atomic_store_body(S)  *a= v
---- include/atomic/nolock.h
-+++ include/atomic/nolock.h
-@@ -17,7 +17,7 @@
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
- 
- #if defined(__i386__) || defined(_MSC_VER) || defined(__x86_64__)   \
--    || defined(HAVE_GCC_ATOMIC_BUILTINS) \
-+    || defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS) \
-     || defined(HAVE_SOLARIS_ATOMIC)
- 
- #  ifdef MY_ATOMIC_MODE_DUMMY
-@@ -41,7 +41,7 @@
- #  elif __GNUC__
- #    if defined(HAVE_SOLARIS_ATOMIC)
- #      include "solaris.h"
--#    elif defined(HAVE_GCC_ATOMIC_BUILTINS)
-+#    elif defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS)
- #      include "gcc_builtins.h"
- #    elif defined(__i386__) || defined(__x86_64__)
- #      include "x86-gcc.h"
---- mysys/CMakeLists.txt
-+++ mysys/CMakeLists.txt
-@@ -79,6 +79,10 @@ IF(HAVE_BFD_H)
-   TARGET_LINK_LIBRARIES(mysys bfd)  
- ENDIF(HAVE_BFD_H)
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(mysys atomic)
-+ENDIF()
-+
- IF (WIN32)
-   TARGET_LINK_LIBRARIES(mysys IPHLPAPI)  
- ENDIF(WIN32)
---- sql/CMakeLists.txt
-+++ sql/CMakeLists.txt
-@@ -165,6 +165,10 @@ TARGET_LINK_LIBRARIES(sql ${MYSQLD_STATI
-   ${SSL_LIBRARIES}
-   ${LIBSYSTEMD})
- 
-+IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+  TARGET_LINK_LIBRARIES(sql atomic)
-+ENDIF()
-+
- IF(WIN32)
-   SET(MYSQLD_SOURCE main.cc nt_servc.cc message.rc)
-   TARGET_LINK_LIBRARIES(sql psapi)
diff --git a/srcpkgs/mariadb/patches/fix-cross.patch b/srcpkgs/mariadb/patches/fix-cross.patch
index 24605dae8851..df46a2f2670a 100644
--- a/srcpkgs/mariadb/patches/fix-cross.patch
+++ b/srcpkgs/mariadb/patches/fix-cross.patch
@@ -1,17 +1,126 @@
---- ./CMakeLists.txt.orig	2015-09-17 15:47:59.794784111 -0400
-+++ ./CMakeLists.txt	2015-09-19 19:42:16.751348473 -0400
-@@ -362,10 +376,10 @@
- 
- CHECK_PCRE()
- 
+Author: Justin Jagieniak <justin@jagieniak.net>, John Zimmermann <me@johnnynator.dev>
+Date: Fri Apr 11 14:19:00 2021 +0200
+
+   Fix cross-compile patch to  consider CMAKE_CROSSCOMPILING_EMULATOR aswell.
+
+--- CMakeLists.txt.orig	2021-04-11 12:37:42.766483860 +0200
++++ CMakeLists.txt	2021-04-11 13:05:49.491976374 +0200
+@@ -397,7 +397,7 @@
+
+ CHECK_SYSTEMD()
+
 -IF(CMAKE_CROSSCOMPILING)
--  SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
--  INCLUDE(${IMPORT_EXECUTABLES})
--ENDIF()
-+# IF(CMAKE_CROSSCOMPILING)
-+#   SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
-+#   INCLUDE(${IMPORT_EXECUTABLES})
-+# ENDIF()
- 
- #
- # Setup maintainer mode options. Platform checks are
++IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
+   INCLUDE(${IMPORT_EXECUTABLES})
+ ENDIF()
+@@ -479,7 +479,7 @@
+ ADD_SUBDIRECTORY(support-files)
+ ADD_SUBDIRECTORY(extra/aws_sdk)
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   SET(EXPORTED comp_err comp_sql factorial)
+   IF(NOT WITHOUT_SERVER)
+     SET(EXPORTED ${EXPORTED} gen_lex_hash gen_lex_token)
+
+--- configure.cmake.orig	2021-04-11 13:45:39.143733089 +0200
++++ configure.cmake	2021-04-11 13:46:06.378730316 +0200
+@@ -668,7 +668,7 @@
+ " HAVE_PTHREAD_YIELD_ZERO_ARG)
+
+ IF(NOT STACK_DIRECTION)
+-  IF(CMAKE_CROSSCOMPILING)
++  IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+    MESSAGE(FATAL_ERROR
+    "STACK_DIRECTION is not defined.  Please specify -DSTACK_DIRECTION=1 "
+    "or -DSTACK_DIRECTION=-1 when calling cmake.")
+
+--- storage/mroonga/vendor/groonga/CMakeLists.txt.orig	2021-04-11 13:48:22.249716484 +0200
++++ storage/mroonga/vendor/groonga/CMakeLists.txt	2021-04-11 13:49:44.050708156 +0200
+@@ -405,7 +405,7 @@
+     set(MECAB_LIBRARIES libmecab)
+   else()
+     set(GRN_MECAB_CONFIG "mecab-config" CACHE FILEPATH "mecab-config path")
+-    if(NOT CMAKE_CROSSCOMPILING)
++    if(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+       find_program(GRN_MECAB_CONFIG_ABSOLUTE_PATH "${GRN_MECAB_CONFIG}")
+     endif()
+     if(EXISTS "${GRN_MECAB_CONFIG_ABSOLUTE_PATH}")
+
+--- storage/innobase/innodb.cmake.orig	2021-04-11 13:52:39.129690331 +0200
++++ storage/innobase/innodb.cmake	2021-04-11 13:53:03.656687834 +0200
+@@ -36,7 +36,7 @@
+
+ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
+
+-IF(CMAKE_CROSSCOMPILING)
++IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   # Use CHECK_C_SOURCE_COMPILES instead of CHECK_C_SOURCE_RUNS when
+   # cross-compiling. Not as precise, but usually good enough.
+   # This only make sense for atomic tests in this file, this trick doesn't
+
+--- sql/CMakeLists.txt.orig	2021-04-11 13:54:43.469677673 +0200
++++ sql/CMakeLists.txt	2021-04-11 13:55:46.337671272 +0200
+@@ -356,7 +356,7 @@
+              COMPILE_FLAGS "-p ORA")
+ ENDIF()
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   ADD_EXECUTABLE(gen_lex_token gen_lex_token.cc
+    ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc.hh)
+   ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc)
+@@ -406,7 +406,7 @@
+   )
+
+ # Install initial database (default on windows, optional target elsewhere)
+-IF(TARGET mariadbd AND NOT CMAKE_CROSSCOMPILING)
++IF(TARGET mariadbd AND (NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR))
+   IF(GENERATOR_IS_MULTI_CONFIG)
+     SET (CONFIG_PARAM -DCONFIG=${CMAKE_CFG_INTDIR})
+   ENDIF()
+
+--- scripts/CMakeLists.txt.orig	2021-04-11 13:57:30.088660710 +0200
++++ scripts/CMakeLists.txt	2021-04-11 13:58:12.486656393 +0200
+@@ -28,14 +28,14 @@
+   )
+ ENDMACRO()
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+  INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
+  ADD_EXECUTABLE(comp_sql comp_sql.c)
+  TARGET_LINK_LIBRARIES(comp_sql)
+ ENDIF()
+
+ # Build mysql_fix_privilege_tables.sql (concatenate 3 sql scripts)
+-IF(NOT WIN32 OR CMAKE_CROSSCOMPILING)
++IF(NOT WIN32 OR (CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR))
+   FIND_PROGRAM(CAT_EXECUTABLE cat DOC "path to the executable")
+   MARK_AS_ADVANCED(CAT_EXECUTABLE)
+ ENDIF()
+
+--- extra/CMakeLists.txt.orig	2021-04-11 14:02:55.048627626 +0200
++++ extra/CMakeLists.txt	2021-04-11 14:03:24.136624665 +0200
+@@ -18,7 +18,7 @@
+ # Default install component for the files is Server here
+ SET(MYSQL_INSTALL_COMPONENT Server)
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+  ADD_EXECUTABLE(comp_err comp_err.c)
+  TARGET_LINK_LIBRARIES(comp_err mysys)
+ ENDIF()
+
+--- dbug/CMakeLists.txt.orig	2021-04-11 14:12:39.744568100 +0200
++++ dbug/CMakeLists.txt	2021-04-11 14:13:02.588565774 +0200
+@@ -25,7 +25,7 @@
+ ADD_EXECUTABLE(tests tests.c)
+ TARGET_LINK_LIBRARIES(tests dbug)
+
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
+   ADD_EXECUTABLE(factorial my_main.c factorial.c)
+   TARGET_LINK_LIBRARIES(factorial dbug)
+ ENDIF()
diff --git a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch b/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
deleted file mode 100644
index ae2f6e03d2ec..000000000000
--- a/srcpkgs/mariadb/patches/mips-connect-unaligned.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:28 +0200
-Subject: mips-connect-unaligned
-
----
- storage/connect/valblk.cpp | 41 ++++++++++++++++++-------------------
- storage/connect/valblk.h   | 51 +++++++++++++++++++++++++++++-----------------
- 2 files changed, 52 insertions(+), 40 deletions(-)
-
---- storage/connect/valblk.cpp
-+++ storage/connect/valblk.cpp
-@@ -268,14 +268,14 @@ bool TYPBLK<TYPE>::Init(PGLOBAL g, bool
- template <class TYPE>
- char *TYPBLK<TYPE>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Typp[n]);
-+  sprintf(p, Fmt, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
- template <>
- char *TYPBLK<double>::GetCharString(char *p, int n)
-   {
--  sprintf(p, Fmt, Prec, Typp[n]);
-+  sprintf(p, Fmt, Prec, UnalignedRead(n));
-   return p;
-   } // end of GetCharString
- 
-@@ -291,7 +291,7 @@ void TYPBLK<TYPE>::SetValue(PVAL valp, i
-   ChkTyp(valp);
- 
-   if (!(b = valp->IsNull()))
--    Typp[n] = GetTypedValue(valp);
-+    UnalignedWrite(n, GetTypedValue(valp));
-   else
-     Reset(n);
- 
-@@ -353,9 +353,9 @@ void TYPBLK<TYPE>::SetValue(PCSZ p, int
-   ulonglong val = CharToNumber(p, strlen(p), maxval, Unsigned, &minus); 
-     
-   if (minus && val < maxval)
--    Typp[n] = (TYPE)(-(signed)val);
-+    UnalignedWrite(n, (TYPE)(-(signed)val));
-   else
--    Typp[n] = (TYPE)val;
-+    UnalignedWrite(n, (TYPE)val);
- 
-   SetNull(n, false);
-   } // end of SetValue
-@@ -398,7 +398,7 @@ void TYPBLK<double>::SetValue(PCSZ p, in
- 		throw Type;
- 	} // endif Check
- 
--  Typp[n] = atof(p);
-+  UnalignedWrite(n, atof(p));
-   SetNull(n, false);
-   } // end of SetValue
- 
-@@ -430,7 +430,7 @@ void TYPBLK<TYPE>::SetValue(PVBLK pv, in
-   ChkTyp(pv);
- 
-   if (!(b = pv->IsNull(n2) && Nullable))
--    Typp[n1] = GetTypedValue(pv, n2);
-+    UnalignedWrite(n1, GetTypedValue(pv, n2));
-   else
-     Reset(n1);
- 
-@@ -481,10 +481,10 @@ void TYPBLK<TYPE>::SetMin(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval < tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMin
- 
-@@ -496,10 +496,10 @@ void TYPBLK<TYPE>::SetMax(PVAL valp, int
-   {
-   CheckParms(valp, n)
-   TYPE  tval = GetTypedValue(valp);
--  TYPE& tmin = Typp[n];
-+  TYPE  tmin = UnalignedRead(n);
- 
-   if (tval > tmin)
--    tmin = tval;
-+    UnalignedWrite(n, tval);
- 
-   } // end of SetMax
- 
-@@ -513,8 +513,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
-   CheckType(pv)
-   TYPE *lp = ((TYPBLK*)pv)->Typp;
- 
--  for (int i = k; i < n; i++)          // TODO
--    Typp[i] = lp[i];
-+  memcpy(Typp + k, lp + k, sizeof(TYPE) * n);
- 
-   } // end of SetValues
- #endif // 0
-@@ -525,7 +524,7 @@ void TYPBLK<TYPE>::SetValues(PVBLK pv, i
- template <class TYPE>
- void TYPBLK<TYPE>::Move(int i, int j)
-   {
--  Typp[j] = Typp[i];
-+  UnalignedWrite(j, UnalignedRead(i));
-   MoveNull(i, j);
-   } // end of Move
- 
-@@ -539,7 +538,7 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
-   ChkIndx(n);
-   ChkTyp(vp);
- #endif   // _DEBUG
--  TYPE mlv = Typp[n];
-+  TYPE mlv = UnalignedRead(n);
-   TYPE vlv = GetTypedValue(vp);
- 
-   return (vlv > mlv) ? 1 : (vlv < mlv) ? (-1) : 0;
-@@ -551,8 +550,8 @@ int TYPBLK<TYPE>::CompVal(PVAL vp, int n
- template <class TYPE>
- int TYPBLK<TYPE>::CompVal(int i1, int i2)
-   {
--  TYPE lv1 = Typp[i1];
--  TYPE lv2 = Typp[i2];
-+  TYPE lv1 = UnalignedRead(i1);
-+  TYPE lv2 = UnalignedRead(i2);
- 
-   return (lv1 > lv2) ? 1 : (lv1 < lv2) ? (-1) : 0;
-   } // end of CompVal
-@@ -589,7 +588,7 @@ int TYPBLK<TYPE>::Find(PVAL vp)
-   TYPE n = GetTypedValue(vp);
- 
-   for (i = 0; i < Nval; i++)
--    if (n == Typp[i])
-+    if (n == UnalignedRead(i))
-       break;
- 
-   return (i < Nval) ? i : (-1);
-@@ -605,7 +604,7 @@ int TYPBLK<TYPE>::GetMaxLength(void)
-   int i, n, m;
- 
-   for (i = n = 0; i < Nval; i++) {
--    m = sprintf(buf, Fmt, Typp[i]);
-+    m = sprintf(buf, Fmt, UnalignedRead(i));
-     n = MY_MAX(n, m);
-     } // endfor i
- 
-@@ -1335,7 +1334,7 @@ char *DATBLK::GetCharString(char *p, int
-   char *vp;
- 
-   if (Dvalp) {
--    Dvalp->SetValue(Typp[n]);
-+    Dvalp->SetValue(UnalignedRead(n));
-     vp = Dvalp->GetCharString(p);
-   } else
-     vp = TYPBLK<int>::GetCharString(p, n);
-@@ -1351,7 +1350,7 @@ void DATBLK::SetValue(PCSZ p, int n)
-   if (Dvalp) {
-     // Decode the string according to format
-     Dvalp->SetValue_psz(p);
--    Typp[n] = Dvalp->GetIntValue();
-+    UnalignedWrite(n, Dvalp->GetIntValue());
-   } else
-     TYPBLK<int>::SetValue(p, n);
- 
---- storage/connect/valblk.h
-+++ storage/connect/valblk.h
-@@ -139,6 +139,7 @@ class VALBLK : public BLOCK {
-   int     Prec;             // Precision of float values
-   }; // end of class VALBLK
- 
-+
- /***********************************************************************/
- /*  Class TYPBLK: represents a block of typed values.                  */
- /***********************************************************************/
-@@ -151,40 +152,41 @@ class TYPBLK : public VALBLK {
-   // Implementation
-   virtual bool   Init(PGLOBAL g, bool check);
-   virtual int    GetVlen(void) {return sizeof(TYPE);}
--  virtual char   GetTinyValue(int n) {return (char)Typp[n];}
--  virtual uchar  GetUTinyValue(int n) {return (uchar)Typp[n];}
--  virtual short  GetShortValue(int n) {return (short)Typp[n];}
--  virtual ushort GetUShortValue(int n) {return (ushort)Typp[n];}
--  virtual int    GetIntValue(int n) {return (int)Typp[n];}
--  virtual uint   GetUIntValue(int n) {return (uint)Typp[n];}
--  virtual longlong GetBigintValue(int n) {return (longlong)Typp[n];}
--  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)Typp[n];}
--  virtual double GetFloatValue(int n) {return (double)Typp[n];}
-+
-+  virtual char   GetTinyValue(int n) {return (char)UnalignedRead(n);}
-+  virtual uchar  GetUTinyValue(int n) {return (uchar)UnalignedRead(n);}
-+  virtual short  GetShortValue(int n) {return (short)UnalignedRead(n);}
-+  virtual ushort GetUShortValue(int n) {return (ushort)UnalignedRead(n);}
-+  virtual int    GetIntValue(int n) {return (int)UnalignedRead(n);}
-+  virtual uint   GetUIntValue(int n) {return (uint)UnalignedRead(n);}
-+  virtual longlong GetBigintValue(int n) {return (longlong)UnalignedRead(n);}
-+  virtual ulonglong GetUBigintValue(int n) {return (ulonglong)UnalignedRead(n);}
-+  virtual double GetFloatValue(int n) {return (double)UnalignedRead(n);}
-   virtual char  *GetCharString(char *p, int n);
--  virtual void   Reset(int n) {Typp[n] = 0;}
-+  virtual void   Reset(int n) {UnalignedWrite(n, 0);}
- 
-   // Methods
-   using VALBLK::SetValue;
-   virtual void   SetValue(PCSZ sp, int n);
-   virtual void   SetValue(const char *sp, uint len, int n);
-   virtual void   SetValue(short sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(ushort sval, int n)
--                  {Typp[n] = (TYPE)sval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)sval); SetNull(n, false);}
-   virtual void   SetValue(int lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(uint lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(longlong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(ulonglong lval, int n)
--                  {Typp[n] = (TYPE)lval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)lval); SetNull(n, false);}
-   virtual void   SetValue(double fval, int n)
--                  {Typp[n] = (TYPE)fval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)fval); SetNull(n, false);}
-   virtual void   SetValue(char cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(uchar cval, int n)
--                  {Typp[n] = (TYPE)cval; SetNull(n, false);}
-+                  {UnalignedWrite(n, (TYPE)cval); SetNull(n, false);}
-   virtual void   SetValue(PVAL valp, int n);
-   virtual void   SetValue(PVBLK pv, int n1, int n2);
-   virtual void   SetMin(PVAL valp, int n);
-@@ -206,6 +208,17 @@ class TYPBLK : public VALBLK {
-   // Members
-   TYPE* const &Typp;
-   const char  *Fmt;
-+
-+  // Unaligned access
-+  TYPE UnalignedRead(int n) const {
-+    TYPE result;
-+    memcpy(&result, Typp + n, sizeof(TYPE));
-+    return result;
-+  }
-+
-+  void UnalignedWrite(int n, TYPE value) {
-+    memcpy(Typp + n, &value, sizeof(TYPE));
-+  }
-   }; // end of class TYPBLK
- 
- /***********************************************************************/
diff --git a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch b/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
deleted file mode 100644
index 195fe41a4226..000000000000
--- a/srcpkgs/mariadb/patches/mips-innobase-atomic.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-innobase-atomic
-
----
- storage/innobase/include/os0sync.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git storage/innobase/include/os0sync.h storage/innobase/include/os0sync.h
-index bb225c5..6520237 100644
---- storage/innobase/include/os0sync.h
-+++ storage/innobase/include/os0sync.h
-@@ -37,6 +37,7 @@ Created 9/6/1995 Heikki Tuuri
- 
- #include "univ.i"
- #include "ut0lst.h"
-+#include "sync0types.h"
- 
- /** CPU cache line size */
- #ifdef __powerpc__
diff --git a/srcpkgs/mariadb/patches/mips-machine.patch b/srcpkgs/mariadb/patches/mips-machine.patch
deleted file mode 100644
index 3dbbbaaa5384..000000000000
--- a/srcpkgs/mariadb/patches/mips-machine.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 20:40:29 +0200
-Subject: mips-machine
-
----
- cmake/package_name.cmake | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git cmake/package_name.cmake cmake/package_name.cmake
-index 4930a6b..7681f78 100644
---- cmake/package_name.cmake
-+++ cmake/package_name.cmake
-@@ -34,6 +34,10 @@ IF(NOT VERSION)
-       SET(DEFAULT_MACHINE "mips")
-     ENDIF()
- 
-+    IF(NOT 64BIT AND CMAKE_SYSTEM_PROCESSOR MATCHES "^mips64")
-+      SET(DEFAULT_MACHINE "mips")
-+    ENDIF()
-+
-     IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
-       SET(NEED_DASH_BETWEEN_PLATFORM_AND_MACHINE 0)
-       SET(DEFAULT_PLATFORM "win")
diff --git a/srcpkgs/mariadb/patches/musl-ppc.patch b/srcpkgs/mariadb/patches/musl-ppc.patch
deleted file mode 100644
index 57c7f4bf15b2..000000000000
--- a/srcpkgs/mariadb/patches/musl-ppc.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-This header does not exist on musl, but there has been a
-builtin for this in gcc for ages, so just use that instead.
-
---- storage/innobase/include/ut0ut.h
-+++ storage/innobase/include/ut0ut.h
-@@ -89,8 +89,7 @@ struct ut_when_dtor {
-    independent way by using YieldProcessor. */
- #  define UT_RELAX_CPU() YieldProcessor()
- # elif defined(__powerpc__)
--#include <sys/platform/ppc.h>
--#  define UT_RELAX_CPU() __ppc_get_timebase()
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
---- storage/xtradb/include/ut0ut.h
-+++ storage/xtradb/include/ut0ut.h
-@@ -86,6 +86,8 @@
- # elif defined(__powerpc__) && defined __GLIBC__
- #include <sys/platform/ppc.h>
- #  define UT_RELAX_CPU() __ppc_get_timebase()
-+# elif defined(__powerpc__)
-+#  define UT_RELAX_CPU() __builtin_ppc_get_timebase()
- # else
- #  define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */
- # endif
diff --git a/srcpkgs/mariadb/patches/musl_ucontext-h.patch b/srcpkgs/mariadb/patches/musl_ucontext-h.patch
deleted file mode 100644
index 99ac0a6cd751..000000000000
--- a/srcpkgs/mariadb/patches/musl_ucontext-h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./include/my_context.h.orig	2016-02-24 09:25:21.000000000 -0500
-+++ ./include/my_context.h	2016-02-28 15:14:29.098180308 -0500
-@@ -31,7 +31,7 @@
- #define MY_CONTEXT_USE_X86_64_GCC_ASM
- #elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__)
- #define MY_CONTEXT_USE_I386_GCC_ASM
--#elif defined(HAVE_UCONTEXT_H)
-+#elif defined (__GLIBC__) && defined(HAVE_UCONTEXT_H)
- #define MY_CONTEXT_USE_UCONTEXT
- #else
- #define MY_CONTEXT_DISABLE
diff --git a/srcpkgs/mariadb/patches/ppcle.patch b/srcpkgs/mariadb/patches/ppcle.patch
deleted file mode 100644
index f6f69044fed4..000000000000
--- a/srcpkgs/mariadb/patches/ppcle.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 9ee82c476fcd5005d3ec1b6282464d9cc98d3726 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Thu, 11 Feb 2021 14:24:44 +0100
-Subject: [PATCH] fix build on ppcle
-
----
- storage/innobase/ut/ut0crc32.cc | 4 ++--
- storage/xtradb/ut/ut0crc32.cc   | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git storage/innobase/ut/ut0crc32.cc storage/innobase/ut/ut0crc32.cc
-index 4d2d311..897c23e 100644
---- storage/innobase/ut/ut0crc32.cc
-+++ storage/innobase/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
-diff --git storage/xtradb/ut/ut0crc32.cc storage/xtradb/ut/ut0crc32.cc
-index 4ace913..e3526e4 100644
---- storage/xtradb/ut/ut0crc32.cc
-+++ storage/xtradb/ut/ut0crc32.cc
-@@ -194,7 +194,7 @@ ut_crc32_power8(
- 		 const byte*		 buf,		 /*!< in: data over which to calculate CRC32 */
- 		 ulint		 		 len)		 /*!< in: data length */
- {
--#if defined(__powerpc__) && !defined(WORDS_BIGENDIAN)
-+#if defined(__powerpc64__) && !defined(WORDS_BIGENDIAN)
-   return crc32_vpmsum(0, buf, len);
- #else
- 		 ut_error;
-@@ -319,7 +319,7 @@ ut_crc32_init()
- 	ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
- #endif /* defined(__GNUC__) && defined(__x86_64__) */
- 
--#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
-+#if defined(__linux__) && defined(__powerpc64__) && defined(AT_HWCAP2) \
-         && !defined(WORDS_BIGENDIAN)
- 	if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07)
- 		 ut_crc32_power8_enabled = true;
--- 
-2.30.0
-
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 78d5e2dbdbe8..894e1bd7b896 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,69 +1,59 @@
 # Template file for 'mariadb'
 pkgname=mariadb
-version=10.1.48
-revision=2
+version=10.5.9
+revision=1
 build_style=cmake
-configure_args="-DMYSQL_DATADIR=/var/lib/mysql
- -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
- -DDEFAULT_COLLATION=utf8_general_ci -DENABLED_LOCAL_INFILE=ON
- -DINSTALL_INFODIR=share/mysql/docs -DINSTALL_MANDIR=share/man
- -DINSTALL_PLUGINDIR=lib/mysql/plugin -DINSTALL_SCRIPTDIR=bin
- -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
- -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
- -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
- -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
- -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
- -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
- -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
- -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
- pkg-config"
-makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
- libatomic-devel"
+build_helper=qemu
+configure_args="-DBUILD_CONFIG=mysql_release
+ -DMYSQL_DATADIR=/var/lib/mysql -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock
+ -DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ci
+ -DENABLED_LOCAL_INFILE=ON -DINSTALL_INFODIR=share/mysql/docs
+ -DINSTALL_MANDIR=share/man -DINSTALL_PLUGINDIR=lib/mysql/plugin
+ -DINSTALL_SCRIPTDIR=bin -DINSTALL_INCLUDEDIR=include/mysql
+ -DINSTALL_DOCREADMEDIR=share/mysql -DINSTALL_SUPPORTFILESDIR=share/mysql
+ -DINSTALL_MYSQLSHAREDIR=share/mysql -DINSTALL_DOCDIR=share/mysql/docs
+ -DINSTALL_SHAREDIR=share/mysql -DSTACK_DIRECTION=1
+ -DWITH_ZLIB=system -DWITH_SSL=system  -DWITH_LIBARCHIVE=system
+ -DWITH_EMBEDDED_SERVER=ON -DPLUGIN_TOKUDB=NO -DPLUGIN_BLACKHOLE=YES
+ -DPLUGIN_PARTITION=YES -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF
+ -DWITH_READLINE=ON -DWITH_SYSTEMD=no -DWITH_PCRE=system"
+hostmakedepends="bison perl flex pkg-config git"
+makedepends="ncurses-devel gnutls-devel libaio-devel boost-devel pam-devel zlib-devel
+ pcre2-devel libatomic-devel"
 depends="mariadb-client"
+checkdepends="perl"
 short_desc="Fast SQL database server, drop-in replacement for MySQL"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-only"
-homepage="https://mariadb.org/"
-distfiles="http://archive.mariadb.org/$pkgname-$version/source/$pkgname-$version.tar.gz"
-checksum=069d58b1e2c06bb1e6c31249eda34138f41fb8ae3dec7ecaeba8035812c87cf9
+homepage="https://mariadb.com"
+distfiles="http://archive.mariadb.org/$pkgname-$version/source/${pkgname}-${version}.tar.gz"
+checksum=40ab19aeb8de141fdc188cf2251213c9e7351bee4d0cd29db704fae68d1068cf
 lib32disabled=yes
 provides="mysql-${version}_${revision}"
 replaces="mysql>=0"
-conf_files="/etc/mysql/my.cnf"
 system_accounts="mysql"
 mysql_homedir="/var/lib/mysql"
-CFLAGS="-w -fcommon -DDBUG_OFF=1"
-CXXFLAGS="-DDBUG_OFF=1"
+make_dirs="/var/lib/mysql 0700 mysql mysql"
 
 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 -S . -B build.native
-		make -C build.native comp_err comp_sql gen_lex_hash gen_lex_token
-	fi
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl)
+			patch -p0 -i ${FILESDIR}/musl-have-stacktrace.patch
+			patch -p0 -i ${FILESDIR}/musl-ppc-remove-glibc-dep.patch
+			;;
+	esac
 }
 
-pre_build() {
-	if [ "$CROSS_BUILD" ]; then
-		# CMake complains if those binaries ain't in build
-		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
+do_check() {
+	cd build
+	if [ "$XBPS_CHECK_PKGS" = full ]; then
+		if [ ! "$CROSS_BUILD" ]; then
+			mem="--mem"
+		fi
+		vtargetrun ${XBPS_CROSS_BASE}/usr/bin/perl mysql-test/mtr --parallel=${XBPS_MAKEJOBS} ${mem} --force --max-test-fail=40
+	else
+		CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E "(conc336|bulk1|performance|basic-t|fetch|charset|logs|cursor|errors|view|ps|ps_bugs|sp|result|connection|misc|ps_new|thread|features-10_2|async|test-connect)"
 	fi
-	export LD_LIBRARY_PATH=${wrksrc}/build/storage/tokudb/ft-index/portability
-	# It seems that there is no dependency listed in cmake on them, but they are still needed
-	ninja -C build sql/sql_yacc.cc sql/lex_hash.h
 }
 
 post_install() {
@@ -72,8 +62,10 @@ post_install() {
 	rm -f ${DESTDIR}/usr/share/man/man1/mysql-test-run.pl.1
 	rm -f ${DESTDIR}/usr/bin/mytop
 
-	# Configuration file.
-	install -Dm644 ${DESTDIR}/usr/share/mysql/my-medium.cnf ${DESTDIR}/etc/mysql/my.cnf
+	vmkdir usr/lib/security
+	vmkdir etc/security
+	mv ${DESTDIR}/usr/share/pam_user_map.so ${DESTDIR}/usr/lib/security/
+	mv ${DESTDIR}/usr/share/user_map.conf etc/security/
 
 	vsv mysqld
 }
@@ -83,8 +75,7 @@ libmariadbclient_package() {
 	provides="libmysqlclient-${version}_${revision}"
 	replaces="libmysqlclient>=0"
 	pkg_install() {
-		vmove "usr/lib/libmysqld.so.*"
-		vmove "usr/lib/libmysqlclient*.so.*"
+		vmove "usr/lib/libmariadb*.so.*"
 	}
 }
 libmariadbclient-devel_package() {
diff --git a/srcpkgs/mariadb/update b/srcpkgs/mariadb/update
deleted file mode 100644
index 579eb27c5e8a..000000000000
--- a/srcpkgs/mariadb/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://downloads.mariadb.org/mariadb/"
-pattern="/mariadb/\K[\d.]+(?=/)"

From 8f4e9a5388437c48af053d7d48e3f20582c8d039 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:18:10 +0200
Subject: [PATCH 1177/2024] FreeRADIUS: rebuild against mariadb-10.5.9.

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

diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 9aacb4ecc354..16dd4660d1b6 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,7 +1,7 @@
 # Template file for 'FreeRADIUS'
 pkgname=FreeRADIUS
 version=3.0.20
-revision=4
+revision=5
 wrksrc=freeradius-server-release_${version//./_}
 build_style=gnu-configure
 makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \

From dcb6e5c4479efe3f28e88d49f5304183e1c15f98 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:24:15 +0200
Subject: [PATCH 1178/2024] apr-util: rebuild against mariadb-10.5.9.

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

diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 21336257c6c9..4cab4df2299f 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
 # Template file for 'apr-util'
 pkgname=apr-util
 version=1.6.1
-revision=11
+revision=12
 build_style=gnu-configure
 configure_args="
  --with-pgsql --with-ldap

From f2d0a6ec0bba1d73abce0c12357199ee20483dee Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:24:37 +0200
Subject: [PATCH 1179/2024] bacula-common: rebuild against mariadb-10.5.9.

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

diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template
index 9a787a247770..04b89e171ad8 100644
--- a/srcpkgs/bacula-common/template
+++ b/srcpkgs/bacula-common/template
@@ -1,7 +1,7 @@
 # Template file for 'bacula-common'
 pkgname=bacula-common
 version=9.4.2
-revision=4
+revision=5
 wrksrc="${pkgname%-*}-${version}"
 build_style=gnu-configure
 configure_args="--with-openssl --with-sqlite3 --with-mysql --with-postgresql

From a9c7d87d8612857f0dae10fec9f869ecfc3c2bfe Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:25:03 +0200
Subject: [PATCH 1180/2024] collectd: rebuild against mariadb-10.5.9.

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

diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index fe20b20de328..28fa815e85a9 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -1,7 +1,7 @@
 # Template file for 'collectd'
 pkgname=collectd
 version=5.12.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
  $(vopt_enable notify notify_desktop) --with-libiptc --enable-virt

From 9ccc49b289c214bb538aa932254c1d801e7306d8 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:25:28 +0200
Subject: [PATCH 1181/2024] coturn: rebuild against mariadb-10.5.9.

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

diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template
index 077ef7a3600a..edfb526f4967 100644
--- a/srcpkgs/coturn/template
+++ b/srcpkgs/coturn/template
@@ -1,7 +1,7 @@
 # Template file for 'coturn'
 pkgname=coturn
 version=4.5.1.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib"
 conf_files="/etc/turnserver.conf"

From 9b6e992935205b3e34fb9e274981bd6ca8c7bc35 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:26:16 +0200
Subject: [PATCH 1182/2024] dovecot: rebuild against mariadb-10.5.9.

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

diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index db1bde7f1880..0222fd25026c 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -2,7 +2,7 @@
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
 version=2.3.14
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql --with-lucene

From 251112c22106c3fa7e4023521e09957f7f18ebef Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:26:50 +0200
Subject: [PATCH 1183/2024] gnunet: rebuild against mariadb-10.5.9.

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

diff --git a/srcpkgs/gnunet/template b/srcpkgs/gnunet/template
index 0ca97a9168d3..a8a6dabe66ba 100644
--- a/srcpkgs/gnunet/template
+++ b/srcpkgs/gnunet/template
@@ -1,7 +1,7 @@
 # Template file for 'gnunet'
 pkgname=gnunet
 version=0.12.2
-revision=3
+revision=4
 build_style=gnu-configure
 conf_files="/etc/gnunet/gnunet.conf"
 hostmakedepends="automake gettext gettext-devel libtool pkg-config tar texinfo"

From c530460d9b3063fcfe24c97c44f83857efae200a Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:27:10 +0200
Subject: [PATCH 1184/2024] icinga2: rebuild against mariadb-10.5.9.

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

diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index 3ad8943fb26d..a884892fc49e 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -1,7 +1,7 @@
 # Template file for 'icinga2'
 pkgname=icinga2
 version=2.9.3
-revision=5
+revision=6
 build_style=cmake
 build_helper="qemu"
 configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc

From d9b33a958eb39069b1f6388a07e652028e3b9c7f Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:27:34 +0200
Subject: [PATCH 1185/2024] kdb: rebuild against mariadb-10.5.9.

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

diff --git a/srcpkgs/kdb/template b/srcpkgs/kdb/template
index 74c7fedfdd89..0bc353bd7085 100644
--- a/srcpkgs/kdb/template
+++ b/srcpkgs/kdb/template
@@ -1,7 +1,7 @@
 # Template file for 'kdb'
 pkgname=kdb
 version=3.2.0
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="extra-cmake-modules doxygen pkg-config kcoreaddons"
 makedepends="kcoreaddons-devel postgresql-libs-devel libmariadbclient-devel

From da7086221e05c1a98022b46172e1ca61940d9177 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:27:52 +0200
Subject: [PATCH 1186/2024] kodi: rebuild against mariadb-10.5.9.

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

diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5eee2d18f2e9..e6437d6d6910 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=19.0
-revision=1
+revision=2
 _codename="Matrix"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake

From a36f5d68ff8aa895836effcc634188b855597e38 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:28:10 +0200
Subject: [PATCH 1187/2024] libgda: rebuild against mariadb-10.5.9.

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

diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index d9a79ff60b20..8c1ead45a5e8 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -1,7 +1,7 @@
 # Template file for 'libgda'
 pkgname=libgda
 version=5.2.9
-revision=4
+revision=5
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json

From bac294f1817533c24954456bbfdcb53a132c70e1 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:28:38 +0200
Subject: [PATCH 1188/2024] libreoffice: rebuild against mariadb-10.5.9.

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

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

From 3947f93d0f8c2fd34a6220810901736feb4d4b01 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:29:20 +0200
Subject: [PATCH 1189/2024] lua54-luadbi: rebuild against mariadb-10.5.9.

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

diff --git a/srcpkgs/lua54-luadbi/template b/srcpkgs/lua54-luadbi/template
index b1c4bb6070bc..9b9a6c3b48ae 100644
--- a/srcpkgs/lua54-luadbi/template
+++ b/srcpkgs/lua54-luadbi/template
@@ -1,7 +1,7 @@
 # Template file for 'lua54-luadbi'
 pkgname=lua54-luadbi
 version=0.5
-revision=4
+revision=5
 wrksrc="luadbi-${version}"
 create_wrksrc="yes"
 makedepends="lua51-devel lua52-devel lua53-devel lua54-devel sqlite-devel

From 7f92f8c8370094665f77d79f7ea50a0cb7dc25c8 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:29:40 +0200
Subject: [PATCH 1190/2024] monitoring-plugins: rebuild against mariadb-10.5.9.

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

diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 48fbd4045ea4..473f40cccbfb 100644
--- a/srcpkgs/monitoring-plugins/template
+++ b/srcpkgs/monitoring-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'monitoring-plugins'
 pkgname=monitoring-plugins
 version=2.2
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib/monitoring-plugins"
 hostmakedepends="fping openssh postfix procps-ng smbclient"

From 0a639bbfb5beecba8758033ba0094c4dc68f02eb Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:30:04 +0200
Subject: [PATCH 1191/2024] mysql++: rebuild against mariadb-10.5.9.

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

diff --git a/srcpkgs/mysql++/template b/srcpkgs/mysql++/template
index 4f0a3619ad02..6dc18a421034 100644
--- a/srcpkgs/mysql++/template
+++ b/srcpkgs/mysql++/template
@@ -1,7 +1,7 @@
 # Template file for 'mysql++'
 pkgname=mysql++
 version=3.2.5
-revision=2
+revision=3
 build_style=gnu-configure
 make_install_target="install_mysqlpp"
 makedepends="libmariadbclient-devel"

From d588727f0c3e7b2c4aa05855d2fb74d62e84e123 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:30:26 +0200
Subject: [PATCH 1192/2024] opensmtpd-extras: rebuild against mariadb-10.5.9.

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

diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template
index 10890fec2a47..f54dc8951456 100644
--- a/srcpkgs/opensmtpd/template
+++ b/srcpkgs/opensmtpd/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd'
 pkgname=opensmtpd
 version=6.8.0p2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
  --with-path-socket=/run --with-path-pidfile=/run

From cba621a36a51ff4f49ec119f08d4227bb8c804ad Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:31:32 +0200
Subject: [PATCH 1193/2024] perl-DBD-mysql: rebuild against mariadb-10.5.9.

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

diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template
index dab8099adcdc..0ac1bcdf6152 100644
--- a/srcpkgs/perl-DBD-mysql/template
+++ b/srcpkgs/perl-DBD-mysql/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-DBD-mysql'
 pkgname=perl-DBD-mysql
 version=4.050
-revision=7
+revision=8
 wrksrc="DBD-mysql-${version}"
 build_style=perl-module
 hostmakedepends="perl perl-DBI perl-Devel-CheckLib"

From 726b9f3ae1ecda4f63e8b7a0adb54b63a4499cf6 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:31:49 +0200
Subject: [PATCH 1194/2024] postfix: rebuild against mariadb-10.5.9.

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

diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index dc76f50f8166..8cef3964841f 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
 version=3.5.10
-revision=1
+revision=2
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"

From d4d9cdcf5048118ed8aed1946cc01c99c629fe39 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:32:13 +0200
Subject: [PATCH 1195/2024] python3-mysqlclient: rebuild against
 mariadb-10.5.9.

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

diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template
index 5a6fc075fe8d..14d7c703a49e 100644
--- a/srcpkgs/python3-mysqlclient/template
+++ b/srcpkgs/python3-mysqlclient/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-mysqlclient'
 pkgname=python3-mysqlclient
 version=1.3.14
-revision=5
+revision=6
 wrksrc="mysqlclient-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 172ae8422445b6c67cdff390f0d08d7a9e10311d Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:32:32 +0200
Subject: [PATCH 1196/2024] qt5: rebuild against mariadb-10.5.9.

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

diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 1a2a3441cbf1..c8e93578e94d 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5'
 pkgname=qt5
 version=5.15.2
-revision=4
+revision=5
 wrksrc="qt-everywhere-src-${version}"
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config

From 269add9262dced7315c7b4e3b58bf337d1a25d39 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:32:50 +0200
Subject: [PATCH 1197/2024] redland: rebuild against mariadb-10.5.9.

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

diff --git a/srcpkgs/redland/template b/srcpkgs/redland/template
index 44c897bd53e5..c58096e673dd 100644
--- a/srcpkgs/redland/template
+++ b/srcpkgs/redland/template
@@ -3,7 +3,7 @@ _desc="Redland Resource Description Framework (RDF)"
 
 pkgname=redland
 version=1.0.17
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-static --enable-release --with-raptor=system
  --with-rasqal=system --with-sqlite=3"

From 1bb67dcb978b42fa6d347e9626bcf134390bd9fa Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:33:06 +0200
Subject: [PATCH 1198/2024] rsyslog: rebuild against mariadb-10.5.9.

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

diff --git a/srcpkgs/rsyslog/template b/srcpkgs/rsyslog/template
index 3b1b62e164b8..b18fd1da3527 100644
--- a/srcpkgs/rsyslog/template
+++ b/srcpkgs/rsyslog/template
@@ -1,7 +1,7 @@
 # Template file for 'rsyslog'
 pkgname=rsyslog
 version=8.2010.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --enable-gnutls --enable-mysql
  --enable-pgsql --enable-imdiag --enable-imfile --enable-mail --enable-imptcp

From c66dcc79f0f2462d552038fb0555dcbeff969c01 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:33:34 +0200
Subject: [PATCH 1199/2024] slurm-wlm: rebuild against mariadb-10.5.9.

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

diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template
index 46fc8773520b..e01f3912697f 100644
--- a/srcpkgs/slurm-wlm/template
+++ b/srcpkgs/slurm-wlm/template
@@ -1,7 +1,7 @@
 # Template file for 'slurm-wlm'
 pkgname=slurm-wlm
 version=19.05.5.1
-revision=3
+revision=4
 _distver="${version//./-}"
 wrksrc="slurm-slurm-${_distver}"
 build_style=gnu-configure

From 19625cbb680755435a02cd02ff83324e2d917c5b Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:33:57 +0200
Subject: [PATCH 1200/2024] sysbench: rebuild against mariadb-10.5.9.

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

diff --git a/srcpkgs/sysbench/template b/srcpkgs/sysbench/template
index 032f10234ea5..e4f75118e5e8 100644
--- a/srcpkgs/sysbench/template
+++ b/srcpkgs/sysbench/template
@@ -1,7 +1,7 @@
 # Template file for 'sysbench'
 pkgname=sysbench
 version=1.0.20
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --with-mysql

From 813cae07652066d1914f09ceaa44966540fa56df Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:34:13 +0200
Subject: [PATCH 1201/2024] thc-hydra: rebuild against mariadb-10.5.9.

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

diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 1d4575336174..4186ce948105 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,7 +1,7 @@
 # Template file for 'thc-hydra'
 pkgname=thc-hydra
 version=9.1
-revision=2
+revision=3
 build_style=gnu-configure
 make_install_args="MANDIR=/share/man/man1"
 makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel

From b86205ed77bb93e6579e908ee766448329aa0efc Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Mon, 12 Apr 2021 09:34:28 +0200
Subject: [PATCH 1202/2024] zabbix: rebuild against mariadb-10.5.9.

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

diff --git a/srcpkgs/zabbix/template b/srcpkgs/zabbix/template
index a284bc590d8c..5db05d0d5d45 100644
--- a/srcpkgs/zabbix/template
+++ b/srcpkgs/zabbix/template
@@ -1,7 +1,7 @@
 # Template file for 'zabbix'
 pkgname=zabbix
 version=4.4.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--with-gnutls --with-libcurl --with-libxml2=yes --with-net-snmp
  --with-mysql --enable-server --enable-ipv6 --with-ssh2 --enable-agent

From f5ffd3e2e05d5dc7f972a7729692ddaef939736e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 14 Apr 2021 23:20:57 +0200
Subject: [PATCH 1203/2024] cyrus-sasl: rebuild against mariadb-10.5.9

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

diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index 608049a1d883..5bfe46557991 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -1,7 +1,7 @@
 # Template file for 'cyrus-sasl'
 pkgname=cyrus-sasl
 version=2.1.27
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--disable-static --enable-shared --enable-checkapop
  --enable-cram --enable-digest --disable-otp --disable-srp

From c340a3f449a48d683852de878977811802f2adfe Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Thu, 15 Apr 2021 13:14:02 +0300
Subject: [PATCH 1204/2024] github-cli: update to 1.9.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 4d9fc015800c..38b4af7a95dd 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.1
+version=1.9.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=5bdbc589a6d5cca241b2dc467d846a8f23c465d78efd898271f18b636608d6e6
+checksum=662654baa32550527b97faf38c34254bafe9b7889dc65451cbec3d6dacee2a06
 
 pre_build() {
 	local _date

From db413ddbdc8f09beefe38db40fc1b27c72d38174 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 15 Apr 2021 22:02:07 +0200
Subject: [PATCH 1205/2024] mariadb: fix template, update INSTALL

usr/bin/mysql_install_db is only supposed to initilize the state,
for upgrades mysql_upgrade should be used
---
 srcpkgs/mariadb/INSTALL  | 8 +++++++-
 srcpkgs/mariadb/template | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mariadb/INSTALL b/srcpkgs/mariadb/INSTALL
index 256a89f2dfb8..88334bbe1406 100644
--- a/srcpkgs/mariadb/INSTALL
+++ b/srcpkgs/mariadb/INSTALL
@@ -2,6 +2,12 @@
 #
 case ${ACTION} in
 post)
-	chpst -u mysql:mysql usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
+	if [ "$UPDATE" = "yes" ]; then
+		:
+	elif [ -f var/lib/mysql/mysql-bin.index ]; then
+		:
+	else
+		chpst -u mysql:mysql usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
+	fi
 	;;
 esac
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 894e1bd7b896..8cbc1357da6f 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -65,7 +65,7 @@ post_install() {
 	vmkdir usr/lib/security
 	vmkdir etc/security
 	mv ${DESTDIR}/usr/share/pam_user_map.so ${DESTDIR}/usr/lib/security/
-	mv ${DESTDIR}/usr/share/user_map.conf etc/security/
+	mv ${DESTDIR}/usr/share/user_map.conf ${DESTDIR}/etc/security/
 
 	vsv mysqld
 }

From b4ad8ffc1001974107533983d23be4be0678d670 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 15 Apr 2021 23:16:23 +0200
Subject: [PATCH 1206/2024] devhelp: update to 40.0.

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

diff --git a/srcpkgs/devhelp-gedit-plugin b/srcpkgs/devhelp-gedit-plugin
deleted file mode 120000
index 8fc1e34f4033..000000000000
--- a/srcpkgs/devhelp-gedit-plugin
+++ /dev/null
@@ -1 +0,0 @@
-devhelp
\ No newline at end of file
diff --git a/srcpkgs/devhelp/template b/srcpkgs/devhelp/template
index 806e8094347f..2804c079cbbf 100644
--- a/srcpkgs/devhelp/template
+++ b/srcpkgs/devhelp/template
@@ -1,7 +1,7 @@
 # Template file for 'devhelp'
 pkgname=devhelp
-version=3.38.0
-revision=2
+version=40.0
+revision=1
 build_helper="gir"
 build_style=meson
 hostmakedepends="gettext glib-devel itstool pkg-config"
@@ -11,7 +11,8 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Devhelp"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=918efb173122b26d45fa51c194a0b659e63fee7705f6722db2534fabc3452369
+checksum=4db6d853de5f4ef2eb749ede6e32c726c5fba13cd75558fa604c1a562e26267f
+replaces="devhelp-gedit-plugin<=40.0_1"
 
 devhelp-devel_package() {
 	short_desc+=" - development files"
@@ -31,10 +32,3 @@ devhelp-libs_package() {
 		vmove "usr/lib/libdevhelp*.so.*"
 	}
 }
-devhelp-gedit-plugin_package() {
-	short_desc+=" - gedit plugin"
-	depends="devhelp gedit python3"
-	pkg_install() {
-		vmove usr/lib/gedit
-	}
-}

From f42ceeb792d658569266d0a4118d3cfe646097d3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 15 Apr 2021 23:19:58 +0200
Subject: [PATCH 1207/2024] gnome-session: update to 40.0.

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

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

From 3e323974aa7b9864ff79755397b10d4ade7f65fa Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 15 Apr 2021 23:20:38 +0200
Subject: [PATCH 1208/2024] gnome-settings-daemon: update to 40.0.1.

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

diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template
index 824529fa11db..081c88ebfd73 100644
--- a/srcpkgs/gnome-settings-daemon/template
+++ b/srcpkgs/gnome-settings-daemon/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-settings-daemon'
 pkgname=gnome-settings-daemon
-version=40.0
+version=40.0.1
 revision=1
 build_style=meson
 configure_args="-Dsystemd=false"
@@ -18,8 +18,8 @@ short_desc="GNOME settings daemon"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gnome-settings-daemon"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e3168081d6a7ea757d77deeaaa33a916081f03fa334c1e70db415fd8f37324db
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*.*}/${pkgname}-${version}.tar.xz"
+checksum=37dfac1b69a53e2e499228420259d6e134c1c06b74530af88fa855bda1187b21
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" polkit"

From 0ba0e7f11529ad60f63c166c16674b366731bd4a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 15 Apr 2021 23:24:27 +0200
Subject: [PATCH 1209/2024] seahorse: update to 40.0.

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

diff --git a/srcpkgs/seahorse/template b/srcpkgs/seahorse/template
index 0635012496cf..0890666bd74d 100644
--- a/srcpkgs/seahorse/template
+++ b/srcpkgs/seahorse/template
@@ -1,6 +1,6 @@
 # Template file for 'seahorse'
 pkgname=seahorse
-version=3.38.1
+version=40.0
 revision=1
 build_style=meson
 build_helper=gir
@@ -13,7 +13,6 @@ depends="hicolor-icon-theme desktop-file-utils gcr>=3.14 gnupg2 openssh"
 short_desc="GNOME application for managing encryption keys"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="https://wiki.gnome.org/Apps/Seahorse"
-_series=${version%.${version#*.*.}}
-distfiles="${GNOME_SITE}/${pkgname}/${_series}/${pkgname}-${version}.tar.xz"
-checksum=242b1e7e5971dd5727ccd25d51537102f5bad143f2366a82437bf0bbda9ebcef
+homepage="https://gitlab.gnome.org/GNOME/seahorse"
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=7ec7057b3868bac6ea041fda82140a39f5ec9e5b188b450914d453bc2d55d02c

From 00197ed498de190766cfd1170e09f7030dc825d6 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 15 Apr 2021 23:26:10 +0200
Subject: [PATCH 1210/2024] gnome-backgrounds: update to 40.0.

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

diff --git a/srcpkgs/gnome-backgrounds/template b/srcpkgs/gnome-backgrounds/template
index e8906d11e54e..55eeff41d222 100644
--- a/srcpkgs/gnome-backgrounds/template
+++ b/srcpkgs/gnome-backgrounds/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-backgrounds'
 pkgname=gnome-backgrounds
-version=40.rc
+version=40.0
 revision=1
 build_style=meson
 hostmakedepends=gettext
@@ -9,4 +9,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, CC-BY-2.0, CC-BY-SA-2.0, CC-BY-SA-3.0"
 homepage="https://gitlab.gnome.org/GNOME/gnome-backgrounds"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8d28dacbf17e8fc5cad030ce027398befbfb2c0034ae14a8e6a7af3336fda679
+checksum=46c3133a5ed7180347ae396962bf8827085f0f3b7cd9385452d623c4a167a2f6

From b69d2e3171daa322765644600cc42ad5f9a1389b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 15 Apr 2021 23:36:56 +0200
Subject: [PATCH 1211/2024] gtk-vnc: update to 1.2.0.

---
 srcpkgs/gtk-vnc/patches/gir-disable.patch | 53 -----------------------
 srcpkgs/gtk-vnc/template                  |  6 +--
 2 files changed, 3 insertions(+), 56 deletions(-)
 delete mode 100644 srcpkgs/gtk-vnc/patches/gir-disable.patch

diff --git a/srcpkgs/gtk-vnc/patches/gir-disable.patch b/srcpkgs/gtk-vnc/patches/gir-disable.patch
deleted file mode 100644
index ceb8191f402e..000000000000
--- a/srcpkgs/gtk-vnc/patches/gir-disable.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 4ec3034ed57d9baf03bf0d8cf46a0510b6c5fbbb Mon Sep 17 00:00:00 2001
-From: Daniel Kolesa <daniel@octaforge.org>
-Date: Sun, 16 Aug 2020 20:53:21 +0200
-Subject: [PATCH] allow gir to be disabled
-
----
- meson_options.txt | 1 +
- src/meson.build   | 6 +++---
- 2 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git meson_options.txt meson_options.txt
-index 995d8c1..4da4406 100644
---- meson_options.txt
-+++ meson_options.txt
-@@ -2,3 +2,4 @@ option('enable-werror', type: 'boolean',  value: false, description: 'Enable -We
- option('with-coroutine', type: 'string', value: 'auto', description: 'Build with coroutine backend: [auto, ucontext, gthread]')
- option('with-tls-priority', type: 'string', value: 'NORMAL', description: 'Set default TLS priority string')
- option('with-vala', type: 'boolean', value: true, description: 'Enable Vala bindings')
-+option('with-gir', type: 'boolean', value: true, description: 'Enable gir')
-diff --git src/meson.build src/meson.build
-index 956f189..e9f4261 100644
---- src/meson.build
-+++ src/meson.build
-@@ -134,7 +134,7 @@ gvnc_dep = declare_dependency(
-   include_directories: gvnc_inc,
- )
- 
--if host_machine.system() != 'windows'
-+if get_option('with-gir')
-   gvnc_gir = gnome.generate_gir(
-     gvnc,
-     sources: gvnc_gir_sources,
-@@ -216,7 +216,7 @@ if libpulse_dep.found()
-     include_directories: gvncpulse_inc,
-   )
- 
--  if host_machine.system() != 'windows'
-+  if get_option('with-gir')
-     gvncpulse_gir = gnome.generate_gir(
-       gvncpulse,
-       sources: gvncpulse_sources,
-@@ -379,7 +379,7 @@ gtk_vnc_dep = declare_dependency(
-   include_directories: gtk_vnc_inc,
- )
- 
--if host_machine.system() != 'windows'
-+if get_option('with-gir')
-   gtk_vnc_gir = gnome.generate_gir(
-     gtk_vnc,
-     sources: gtk_vnc_gir_sources,
--- 
-2.28.0
-
diff --git a/srcpkgs/gtk-vnc/template b/srcpkgs/gtk-vnc/template
index f07e530d23f4..46a535d1e0f3 100644
--- a/srcpkgs/gtk-vnc/template
+++ b/srcpkgs/gtk-vnc/template
@@ -1,10 +1,10 @@
 # Template file for 'gtk-vnc'
 pkgname=gtk-vnc
-version=1.0.0
+version=1.2.0
 revision=1
 build_helper="gir"
 build_style=meson
-configure_args="$(vopt_bool gir with-gir) $(vopt_bool gir with-vala)"
+configure_args="-Dwith-vala=$(vopt_if gir enabled disabled)"
 hostmakedepends="gettext gettext-devel glib-devel intltool libgcrypt-devel
  pkg-config $(vopt_if gir vala)"
 makedepends="gnutls-devel gtk+3-devel libsasl-devel $(vopt_if gir vala)"
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/gtk-vnc"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a81a1f1a79ad4618027628ffac27d3391524c063d9411c7a36a5ec3380e6c080
+checksum=7aaf80040d47134a963742fb6c94e970fcb6bf52dc975d7ae542b2ef5f34b94a
 
 build_options="gir"
 build_options_default="gir"

From a38c15ff06090bf3c9c468dfdcfbfb27912e5f59 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 15 Apr 2021 23:38:40 +0200
Subject: [PATCH 1212/2024] dconf-editor: update to 3.38.3.

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

diff --git a/srcpkgs/dconf-editor/template b/srcpkgs/dconf-editor/template
index ab352b216d52..6170f8e300b7 100644
--- a/srcpkgs/dconf-editor/template
+++ b/srcpkgs/dconf-editor/template
@@ -1,6 +1,6 @@
 # Template file for 'dconf-editor'
 pkgname=dconf-editor
-version=3.38.2
+version=3.38.3
 revision=1
 build_style=meson
 hostmakedepends="docbook-xsl glib-devel libxslt pkg-config vala gettext"
@@ -10,4 +10,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Projects/dconf"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1253dad87e6213fbf313ff9ec9dc4358aa1b10261f28072c1dc0e0997b92f835
+checksum=571af4c7dad4f049b53e6cd728b79addf08c27ddab6bc57b396d211866ee79e3

From e45139b70dd8e3004cc5410f4ad2b83b6bb2c14b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Fri, 16 Apr 2021 00:04:18 +0200
Subject: [PATCH 1213/2024] cdogs-sdl: update to 0.11.1.

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

diff --git a/srcpkgs/cdogs-sdl/template b/srcpkgs/cdogs-sdl/template
index a0cf7dafd7b8..8fa77ee87ceb 100644
--- a/srcpkgs/cdogs-sdl/template
+++ b/srcpkgs/cdogs-sdl/template
@@ -1,7 +1,7 @@
 # Template file for 'cdogs-sdl'
 pkgname=cdogs-sdl
-version=0.9.1
-revision=2
+version=0.11.1
+revision=1
 build_style=cmake
 configure_args="-DCDOGS_DATA_DIR=/usr/share/cdogs/"
 hostmakedepends="pkg-config python3-protobuf protobuf26"
@@ -12,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://cxong.github.io/cdogs-sdl/"
 distfiles="https://github.com/cxong/cdogs-sdl/archive/${version}.tar.gz"
-checksum=fee87e90371e6c8f679e75a3628d82b863a67250bd822c672a4017f6a078eb56
+checksum=9c077b363859f22e5701f9fe1a0b3cf5f9e3464cf7110942f8ad7e70e833d6b1
 replaces="cdogs-sdl-data<=0.7.3"
 
 CFLAGS="-fcommon"

From 3b83125495588bead3728c825e4d9b1aa4d943f4 Mon Sep 17 00:00:00 2001
From: noarchwastaken <noarch@n0ar.ch>
Date: Sun, 11 Apr 2021 13:30:39 -0400
Subject: [PATCH 1214/2024] apparmor: fix dnsmasq profile

---
 srcpkgs/apparmor/patches/fix-dnsmasq-libvirt.patch | 13 +++++++++++++
 srcpkgs/apparmor/template                          |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/apparmor/patches/fix-dnsmasq-libvirt.patch

diff --git a/srcpkgs/apparmor/patches/fix-dnsmasq-libvirt.patch b/srcpkgs/apparmor/patches/fix-dnsmasq-libvirt.patch
new file mode 100644
index 000000000000..99ba9d3b5ab9
--- /dev/null
+++ b/srcpkgs/apparmor/patches/fix-dnsmasq-libvirt.patch
@@ -0,0 +1,13 @@
+diff --git a/profiles/apparmor.d/usr.sbin.dnsmasq b/profiles/apparmor.d/usr.sbin.dnsmasq
+index 7ae9a148..a32d24ca 100644
+--- a/profiles/apparmor.d/usr.sbin.dnsmasq
++++ b/profiles/apparmor.d/usr.sbin.dnsmasq
+@@ -113,7 +113,7 @@ profile dnsmasq /usr/{bin,sbin}/dnsmasq flags=(attach_disconnected) {
+     /etc/libnl-3/classid r,
+ 
+     /usr/lib{,64}/libvirt/libvirt_leaseshelper m,
+-    /usr/libexec/libvirt_leaseshelper m,
++    /usr/libexec/libvirt_leaseshelper mr,
+ 
+     owner @{PROC}/@{pid}/net/psched r,
+     owner @{PROC}/@{pid}/status r,
diff --git a/srcpkgs/apparmor/template b/srcpkgs/apparmor/template
index dfbd3ef472fa..0d8c1ec7087e 100644
--- a/srcpkgs/apparmor/template
+++ b/srcpkgs/apparmor/template
@@ -1,7 +1,7 @@
 # Template file for 'apparmor'
 pkgname=apparmor
 version=3.0.1
-revision=3
+revision=4
 wrksrc="${pkgname}-v${version}"
 build_wrksrc=libraries/libapparmor
 build_style=gnu-configure

From d044d97403737aeb5af408097bb98b5534051bae Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Tue, 13 Apr 2021 18:39:05 +0300
Subject: [PATCH 1215/2024] libgusb: update to 0.3.6.

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

diff --git a/srcpkgs/libgusb/template b/srcpkgs/libgusb/template
index a0b23823b21e..e26b6ccf96d3 100644
--- a/srcpkgs/libgusb/template
+++ b/srcpkgs/libgusb/template
@@ -1,6 +1,6 @@
 # Template file for 'libgusb'
 pkgname=libgusb
-version=0.3.5
+version=0.3.6
 revision=1
 build_style=meson
 build_helper="gir"
@@ -15,7 +15,9 @@ license="LGPL-2.1-or-later"
 homepage="https://github.com/hughsie/libgusb"
 changelog="https://raw.githubusercontent.com/hughsie/libgusb/master/NEWS"
 distfiles="http://people.freedesktop.org/~hughsient/releases/${pkgname}-${version}.tar.xz"
-checksum=5b2a00c6997cc4b0133c5a5748a2e616e9e7504626922105b62aadced78e65df
+checksum=13277948a2ee06861234938089aea21bce6ad862f14c81a2efa85340ed701efd
+# requires access to USB devices, not available on CI
+make_check=extended
 
 build_options="gir vala"
 build_options_default="gir vala"

From c05a487a016ccaaf9e846b75f88354931f110f3c Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Thu, 15 Apr 2021 09:46:04 +0200
Subject: [PATCH 1216/2024] google-chrome: update to 90.0.4430.72

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

diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template
index ce901a7eb546..fce43ada5c6d 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,5 +1,5 @@
 # Template file for 'google-chrome'
-_chromeVersion=89.0.4389.128
+_chromeVersion=90.0.4430.72
 _chromeRevision=1
 _channel=stable
 
@@ -22,7 +22,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=1903d5f17ccdbc47bf8e07e15529a22118b192b847846a1b74f54883b11fa41e
+checksum=43f141970ab61d9c5a993dcf094625d9a7a1d24212a3c2443e7092b40c3a354c
 
 do_extract() {
 	mkdir -p ${DESTDIR}

From 8f65066fbb5a78e4584478a6f5e12a6a9059ef49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Wed, 14 Apr 2021 21:39:52 +0200
Subject: [PATCH 1217/2024] qutebrowser: update to 2.2.0.

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

diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template
index 0972f56d7ae5..5ec394ace6fb 100644
--- a/srcpkgs/qutebrowser/template
+++ b/srcpkgs/qutebrowser/template
@@ -1,6 +1,6 @@
 # Template file for 'qutebrowser'
 pkgname=qutebrowser
-version=2.1.1
+version=2.2.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools asciidoc"
@@ -12,7 +12,7 @@ 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=b71b00ad7d498911978e5bbd153a6dd0450ac6ade3e5bf398fc96e15328342ce
+checksum=fa5d2015d64289ab70d4ce719134096503ee580702657972af652cdc6786dd2a
 nostrip=yes
 
 build_options="webengine"

From 2365ad0d923d3505bb545fe7fec379b1ee7b2ad0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Fri, 16 Apr 2021 08:27:57 +0200
Subject: [PATCH 1218/2024] opensmtpd-extras: rebuild with mariadb-10.5.9

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

diff --git a/srcpkgs/opensmtpd-extras/template b/srcpkgs/opensmtpd-extras/template
index 068e94bfee78..f022e13ed9cb 100644
--- a/srcpkgs/opensmtpd-extras/template
+++ b/srcpkgs/opensmtpd-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'opensmtpd-extras'
 pkgname=opensmtpd-extras
 version=6.6.0
-revision=3
+revision=4
 wrksrc="OpenSMTPD-extras-${version}"
 build_style=gnu-configure
 configure_args="--with-table-passwd --with-table-ldap --with-table-mysql

From 27343f74f22a19377b57626bbe1475e8897fbb06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Thu, 15 Apr 2021 23:11:14 -0300
Subject: [PATCH 1219/2024] rust: fix update check.

---
 srcpkgs/rust/update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rust/update b/srcpkgs/rust/update
index 6f0cdc4cfa43..51448b21d082 100644
--- a/srcpkgs/rust/update
+++ b/srcpkgs/rust/update
@@ -1,2 +1,2 @@
 site="https://github.com/rust-lang/rust/tags"
-pattern='/archive/\K[\d\.]+(?=\.tar\.gz")'
+pattern='/archive/refs/tags/\K[\d\.]+(?=\.tar\.gz")'

From 3cd0699e5ed4bfb9b25395495048ad86dfec877f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Thu, 15 Apr 2021 23:13:49 -0300
Subject: [PATCH 1220/2024] kodi: fix build on 32-bit builders.

ld was running out of memory at link time.

Since we are here, set LDFLAGS initially instead of adding to it.
---
 srcpkgs/kodi/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index e6437d6d6910..8bb2a2965731 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -34,7 +34,11 @@ skip_extraction="crossguid-8f399e8bd4.tar.gz libdvdcss-1.4.2-Leia-Beta-5.tar.gz
  libdvdread-6.0.0-Leia-Alpha-3.tar.gz libdvdnav-6.0.0-Leia-Alpha-3.tar.gz"
 python_version=3
 patch_args="-Np1"
-LDFLAGS+=" -Wl,-z,stack-size=1048576"
+LDFLAGS="-Wl,-z,stack-size=1048576"
+
+if [ "$XBPS_WORDSIZE" = 32 ]; then
+	LDFLAGS+=" -Wl,--no-keep-memory"
+fi
 
 lib32disabled=yes
 archs="i686* x86_64* aarch64*

From ead96292ca3bf5686093f1290af14cc592a61b04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Thu, 15 Apr 2021 23:27:44 -0300
Subject: [PATCH 1221/2024] sysbench: fix no_atomic8 build.

---
 srcpkgs/sysbench/template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/srcpkgs/sysbench/template b/srcpkgs/sysbench/template
index e4f75118e5e8..e2fe7be0cc8b 100644
--- a/srcpkgs/sysbench/template
+++ b/srcpkgs/sysbench/template
@@ -24,4 +24,7 @@ fi
 
 pre_configure() {
 	autoreconf -fi
+	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+		export LIBS="-latomic"
+	fi
 }

From e4ec58592d160ebcd59456b1568d2b649604eb74 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <aldridge.mac@gmail.com>
Date: Fri, 16 Apr 2021 00:02:06 -0700
Subject: [PATCH 1222/2024] xbps-src: remove remove-obsoletes

---
 common/xbps-src/shutils/remove_obsoletes.sh | 6 ------
 xbps-src                                    | 6 ------
 2 files changed, 12 deletions(-)
 delete mode 100644 common/xbps-src/shutils/remove_obsoletes.sh

diff --git a/common/xbps-src/shutils/remove_obsoletes.sh b/common/xbps-src/shutils/remove_obsoletes.sh
deleted file mode 100644
index 3c4222125aa7..000000000000
--- a/common/xbps-src/shutils/remove_obsoletes.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-remove_obsoletes () {
-    for repo in $XBPS_HOSTDIR/binpkgs $XBPS_HOSTDIR/binpkgs/debug $XBPS_HOSTDIR/binpkgs/nonfree $XBPS_HOSTDIR/binpkgs/multilib/  $XBPS_HOSTDIR/binpkgs/multilib/nonfree ; do
-        msg_normal "Cleaning $repo\n"
-        XBPS_ARCH=${XBPS_CROSS_BUILD:-$XBPS_MACHINE} $XBPS_RINDEX_CMD -r $repo
-    done
-}
diff --git a/xbps-src b/xbps-src
index 379bdd36bfd6..9d88873ab2c5 100755
--- a/xbps-src
+++ b/xbps-src
@@ -78,9 +78,6 @@ remove <pkgname>
 remove-autodeps
     Removes all package dependencies that were installed automatically.
 
-remove-obsoletes
-    Remove all obsolete packages from default repositories as detected by xbps-rindex.
-
 purge-distfiles
     Removes all obsolete distfiles in <hostdir>/sources.
 
@@ -802,9 +799,6 @@ case "$XBPS_TARGET" in
         read_pkg
         remove_pkg $XBPS_CROSS_BUILD
         ;;
-    remove-obsoletes)
-        remove_obsoletes
-        ;;
     list)
         $XBPS_QUERY_CMD -l
         ;;

From 267153bcb6139da24094327339fbbb98325c6982 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 16 Apr 2021 12:19:11 +0200
Subject: [PATCH 1223/2024] linux5.10: update to 5.10.31.

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

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 3c1bd00d1975..c9f1f97634c7 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.30
+version=5.10.31
 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=d40269b5ac5c8424ec808f4484c7f80947f8f2d549b1ef1a5149aec5b6a20640
+checksum=54eef1a4d29a2582281375e028ac73c2c5d90dfa21500fa8c3b00e529a2b510d
 python_version=3
 patch_args="-Np1"
 

From 6ca37d946d2c8cdd47a7482d65c44c4ce599fe3a Mon Sep 17 00:00:00 2001
From: Evan Deaubl <evan@deaubl.name>
Date: Thu, 15 Apr 2021 11:08:21 -0700
Subject: [PATCH 1224/2024] git-annex: update to 8.20210330.

---
 srcpkgs/git-annex/files/stack.yaml | 3 ++-
 srcpkgs/git-annex/template         | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/git-annex/files/stack.yaml b/srcpkgs/git-annex/files/stack.yaml
index 9a2294440b5d..a6d4f6aeee64 100644
--- a/srcpkgs/git-annex/files/stack.yaml
+++ b/srcpkgs/git-annex/files/stack.yaml
@@ -11,6 +11,7 @@ flags:
     benchmark: false
     networkbsd: false
     gitlfs: true
+    httpclientrestricted: true
 packages:
 - '.'
 extra-deps:
@@ -27,4 +28,4 @@ extra-deps:
  - network-3.1.0.1
 explicit-setup-deps:
   git-annex: true
-resolver: lts-16.13
+resolver: lts-16.27
diff --git a/srcpkgs/git-annex/template b/srcpkgs/git-annex/template
index 3d4df760667b..cdcd6bb0f83c 100644
--- a/srcpkgs/git-annex/template
+++ b/srcpkgs/git-annex/template
@@ -1,6 +1,6 @@
 # Template file for 'git-annex'
 pkgname=git-annex
-version=8.20210223
+version=8.20210330
 revision=1
 build_style=haskell-stack
 makedepends="curl file-devel gnupg2 gnutls-devel gsasl-devel libxml2-devel
@@ -12,7 +12,7 @@ maintainer="Evan Deaubl <evan@deaubl.name>"
 license="AGPL-3.0-or-later, MIT, BSD-2-Clause, GPL-3.0-or-later, custom:Expat, custom:MIT-twitter, GPL-2.0-only, custom:icon-license"
 homepage="http://git-annex.branchable.com"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
-checksum=62a09f98c96dd2a66605aaf6b7f00573a33997f3ef568ffb0d2dc17609719d1f
+checksum=17109144b2aadfab79fa0e193df3e0c02fd80f738a5ed6eccb0d11692bedb01d
 nopie_files="/usr/bin/git-annex"
 nocross=yes
 

From b1bcaeff823a5efed3e18a3170fc62087f638890 Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Fri, 16 Apr 2021 08:59:48 +0200
Subject: [PATCH 1225/2024] python3-pikepdf: update to 2.11.1.

---
 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 5563037b0be2..1f59777c503c 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.11.0
+version=2.11.1
 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=53bf432be00fcb2f2a56c44b64c1b75e4c8f9fe0dcc97721319c53939fed8047
+checksum=810488f80a1d93652498222f9d1391d9287b3b842971d7a8878e69a287c2476f
 
 pre_build() {
 	vsed -i "s/__version__.*/__version__ = '${version}'/g" setup.py

From d2e436b9ea2b8131a7ad7ea272425b50b0f259cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Fri, 16 Apr 2021 17:29:07 +0200
Subject: [PATCH 1226/2024] doomretro: update to 4.0.8.

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

diff --git a/srcpkgs/doomretro/template b/srcpkgs/doomretro/template
index d1a30b8a050b..f944ddb3a0e1 100644
--- a/srcpkgs/doomretro/template
+++ b/srcpkgs/doomretro/template
@@ -1,6 +1,6 @@
 # Template file for 'doomretro'
 pkgname=doomretro
-version=4.0.7
+version=4.0.8
 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=3914b63be559cf1fa2ddd852cadbfe619cd733ee9ef5e671806179c57fe84f8f
+checksum=074654bc626346e47968dbc261e876c6191cbc6374428a7d4bc0852d6b6beb03

From 84e884aedaececd4a7e811f273d3071d45e70bca Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 16 Apr 2021 17:47:38 +0200
Subject: [PATCH 1227/2024] python3-pyinfra: update to 1.3.10.

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

diff --git a/srcpkgs/python3-pyinfra/template b/srcpkgs/python3-pyinfra/template
index bcf20c665678..4365f04a3880 100644
--- a/srcpkgs/python3-pyinfra/template
+++ b/srcpkgs/python3-pyinfra/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyinfra'
 pkgname=python3-pyinfra
-version=1.3.9
+version=1.3.10
 revision=1
 wrksrc="pyinfra-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://pyinfra.com/"
 distfiles="https://github.com/Fizzadar/pyinfra/archive/v${version}.tar.gz"
-checksum=55c5ee9e39e76a36760ee2a210c259c57579a80715a79ea1778f491102f3737b
+checksum=2369ba8298c31882b36475376732e4e978f866eff7b018cbe5357084e32450a7
 
 post_extract() {
 	vsed -i -e '/configparser/d' setup.py  # is in Python 3.8

From f89be15abb567aaf7ba82d524f88eb5529d5c190 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 15 Apr 2021 07:47:28 -0500
Subject: [PATCH 1228/2024] nvidia: update to 460.73.01.

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

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

From 30a46b99ff002b4ccea8a3a257136be762c8bf09 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 16 Apr 2021 18:30:42 +0200
Subject: [PATCH 1229/2024] New package: quickjs-2021.03.27

---
 srcpkgs/quickjs-devel    |  1 +
 srcpkgs/quickjs/template | 43 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+)
 create mode 120000 srcpkgs/quickjs-devel
 create mode 100644 srcpkgs/quickjs/template

diff --git a/srcpkgs/quickjs-devel b/srcpkgs/quickjs-devel
new file mode 120000
index 000000000000..b434e01a4103
--- /dev/null
+++ b/srcpkgs/quickjs-devel
@@ -0,0 +1 @@
+quickjs
\ No newline at end of file
diff --git a/srcpkgs/quickjs/template b/srcpkgs/quickjs/template
new file mode 100644
index 000000000000..658145aa4da0
--- /dev/null
+++ b/srcpkgs/quickjs/template
@@ -0,0 +1,43 @@
+# Template file for 'quickjs'
+pkgname=quickjs
+version=2021.03.27
+revision=1
+wrksrc="${pkgname}-${version//./-}"
+build_style=gnu-makefile
+make_use_env=true
+make_build_args="CONFIG_LTO= prefix=/usr"
+make_install_args="${make_build_args}"
+short_desc="Small and embeddable Javascript engine"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="MIT"
+homepage="https://bellard.org/quickjs/"
+distfiles="https://bellard.org/quickjs/quickjs-${version//./-}.tar.xz"
+checksum=a45bface4c3379538dea8533878d694e289330488ea7028b105f72572fe7fe1a
+
+if [ "$CROSS_BUILD" ]; then
+	make_build_args+=" CROSS_PREFIX=${XBPS_CROSS_TRIPLET}-"
+	make_install_args="${make_build_args}"
+fi
+
+pre_configure() {
+	vsed -i -e '/HOST_CC/s/CFLAGS_OPT/BUILD_CFLAGS/' Makefile
+	cat >>Makefile <<EOF
+CFLAGS += ${CFLAGS}
+LDFLAGS += ${LDFLAGS}
+BUILD_CFLAGS += \$(DEFINES) ${BUILD_CFLAGS}
+EOF
+}
+
+post_install() {
+	mv ${DESTDIR}/usr/lib/quickjs/* ${DESTDIR}/usr/lib
+	vlicense LICENSE
+}
+
+quickjs-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/*.a
+	}
+}

From a67fd2ea9fd9047fef888ac558931f1789ce1dec Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 16 Apr 2021 18:31:39 +0200
Subject: [PATCH 1230/2024] edbrowse: update to 3.8.0.

---
 srcpkgs/edbrowse/template | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/edbrowse/template b/srcpkgs/edbrowse/template
index e6718922902f..95478dfea6fa 100644
--- a/srcpkgs/edbrowse/template
+++ b/srcpkgs/edbrowse/template
@@ -1,22 +1,22 @@
 # Template file for 'edbrowse'
 pkgname=edbrowse
-version=3.7.7
-revision=2
-build_style=cmake
+version=3.8.0
+revision=1
+build_style=gnu-makefile
 hostmakedepends="perl pkg-config"
-makedepends="duktape-devel libcurl-devel libtidy5-devel pcre-devel
+makedepends="libcurl-devel libtidy5-devel pcre-devel quickjs-devel
  readline-devel"
+make_build_args="QUICKJS_LDFLAGS=-lquickjs"
+make_use_env=true
 short_desc="Line-oriented text editor, web browser and mail client similar to ed(1)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later, MIT"
 homepage="http://edbrowse.org/"
 distfiles="https://github.com/CMB/edbrowse/archive/v${version}.tar.gz"
-checksum=bc015decc022d90f482a7f1028e9a56aa84f17406879f9aa1060e1dc175ed00f
-
-CFLAGS="-fcommon"
+checksum=5d512b63ee69e418e5946557ebc703c19e6dccc515f358649a2d38063a6d6a69
 
 do_install() {
-	vbin build/edbrowse
+	vbin src/edbrowse
 	vsconf doc/sample.ebrc
 	vman doc/man-edbrowse-debian.1 edbrowse.1
 	vdoc doc/usersguide.html

From 85dbf4df585af7a952ea9f046ddd6e4cfa2ff4a3 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 16 Apr 2021 10:26:30 +0300
Subject: [PATCH 1231/2024] libbluray: update to 1.3.0.

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

diff --git a/srcpkgs/libbluray/template b/srcpkgs/libbluray/template
index 7c4cfbeebae6..b81a8ee351de 100644
--- a/srcpkgs/libbluray/template
+++ b/srcpkgs/libbluray/template
@@ -1,6 +1,6 @@
 # Template file for 'libbluray'
 pkgname=libbluray
-version=1.2.1
+version=1.3.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-optimizations"
@@ -11,12 +11,16 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.videolan.org/developers/libbluray.html"
 distfiles="https://download.videolan.org/pub/videolan/libbluray/${version}/libbluray-${version}.tar.bz2"
-checksum=5223e83f7988ea2cc860b5cadcaf9cf971087b0c80ca7b60cc17c8300cae36ec
+checksum=e2dbaf99e84e0a9725f4985bcb85d41e52c2261cc651d8884b1b790b5ef016f9
 
 pre_build() {
 	export JAVA_HOME="/usr/lib/jvm/java-1.8-openjdk"
 }
 
+pre_check() {
+	export JAVA_HOME="/usr/lib/jvm/java-1.8-openjdk"
+}
+
 pre_install() {
 	export JAVA_HOME="/usr/lib/jvm/java-1.8-openjdk"
 }

From 631bfdc60afd816f8c0b9fd7e0650c3f39cdd0b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Fri, 16 Apr 2021 19:31:18 +0200
Subject: [PATCH 1232/2024] passphrase2pgp: update to 1.2.0.

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

diff --git a/srcpkgs/passphrase2pgp/template b/srcpkgs/passphrase2pgp/template
index bbaeb2439f56..6355baa30eb8 100644
--- a/srcpkgs/passphrase2pgp/template
+++ b/srcpkgs/passphrase2pgp/template
@@ -1,13 +1,12 @@
 # Template file for 'passphrase2pgp'
 pkgname=passphrase2pgp
-version=1.1.0
+version=1.2.0
 revision=1
 build_style=go
 go_import_path="nullprogram.com/x/passphrase2pgp"
-hostmakedepends="git"
 short_desc="Generate a PGP key from a passphrase"
 maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="Unlicense"
 homepage="https://github.com/skeeto/passphrase2pgp"
 distfiles="https://github.com/skeeto/passphrase2pgp/archive/v${version}.tar.gz"
-checksum=80f445cf3e3a0328f7eb3e1bfdf72ebbd027915fe5391941ed61f9ba3bfd730f
+checksum=75594af96138c949b591deeb8486f3abf60764ee2b6cd68ddaf5beac292b61e1

From 8f1482e6bfddd3ebebd54c7becdedb38289d87d8 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Fri, 16 Apr 2021 14:13:02 -0400
Subject: [PATCH 1233/2024] python3-trimesh: update to 3.9.13.

---
 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 5bcb7ad98725..32ab0dbbf14d 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.10
+version=3.9.13
 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=ca1aeb6fb5eb1e6bf4793fe7b9dbfaee30e7e1506f57ead6f0f1db156c64d735
+checksum=3f2419b0b03ac683e518bf4e8442f0804aeb4d708ae5e4aec25f2590e5725b71
 
 post_install() {
 	vlicense LICENSE.md

From ab6545d449b403f0dd5d813eda4437e537baa1b2 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Fri, 16 Apr 2021 19:30:37 +0200
Subject: [PATCH 1234/2024] kupfer: update to 321.

---
 srcpkgs/kupfer/patches/py38.patch | 18 ------------------
 srcpkgs/kupfer/template           |  8 ++++----
 2 files changed, 4 insertions(+), 22 deletions(-)
 delete mode 100644 srcpkgs/kupfer/patches/py38.patch

diff --git a/srcpkgs/kupfer/patches/py38.patch b/srcpkgs/kupfer/patches/py38.patch
deleted file mode 100644
index b4fd5b51f252..000000000000
--- a/srcpkgs/kupfer/patches/py38.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-commit 167c895b28df8f9be619dd5a7ed1e2e3f31dd4d8
-Author: q66 <daniel@octaforge.org>
-Date:   Sun Jan 5 22:23:53 2020 +0100
-
-    Fix waflib on python 3.8
-
-diff --git waflib/Node.py waflib/Node.py
-index c86c4c1..a81779a 100644
---- waflib/Node.py
-+++ waflib/Node.py
-@@ -487,7 +487,6 @@ class Node(object):
- 					if maxdepth:
- 						for k in node.ant_iter(accept=accept, maxdepth=maxdepth - 1, pats=npats, dir=dir, src=src, remove=remove):
- 							yield k
--		raise StopIteration
- 
- 	def ant_glob(self, *k, **kw):
- 		"""
diff --git a/srcpkgs/kupfer/template b/srcpkgs/kupfer/template
index f66ed5c37ee1..02eaefea8b3b 100644
--- a/srcpkgs/kupfer/template
+++ b/srcpkgs/kupfer/template
@@ -1,7 +1,7 @@
 # Template file for 'kupfer'
 pkgname=kupfer
-version=319
-revision=3
+version=321
+revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=waf3
 pycompile_dirs="usr/share/kupfer/kupfer"
@@ -14,6 +14,6 @@ short_desc="Interface for quick and convenient access to applications"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://kupferlauncher.github.io/"
-distfiles="https://github.com/kupferlauncher/kupfer/releases/download/v${version}/kupfer-v${version}.tar.xz"
-checksum=22357233984a6588a9f9743002363af38ea63b5c2684af487693a13c42973d31
+distfiles="https://github.com/kupferlauncher/kupfer/releases/download/v${version}/kupfer-v${version}.tar.bz2"
+checksum=8781a43acd703ab1fe5641ee28edca47a58e174367ca9bffd37bf637cc954f59
 python_version=3

From 8c29746667865f97734dbed1b22b287cef3df07c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Fri, 16 Apr 2021 19:25:52 +0200
Subject: [PATCH 1235/2024] libcdr: update to 0.1.7.

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

diff --git a/srcpkgs/libcdr/template b/srcpkgs/libcdr/template
index 7def7ac6c992..5753e74baa15 100644
--- a/srcpkgs/libcdr/template
+++ b/srcpkgs/libcdr/template
@@ -1,7 +1,7 @@
 # Template file for 'libcdr'
 pkgname=libcdr
-version=0.1.6
-revision=2
+version=0.1.7
+revision=1
 build_style=gnu-configure
 configure_args="--disable-debug"
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://wiki.documentfoundation.org/DLP/Libraries/libcdr"
 distfiles="http://dev-www.libreoffice.org/src/libcdr/${pkgname}-${version}.tar.bz2"
-checksum=b9ef039310f17ce3a015055e54d7cb3525094bc3b2e3b378619abd51d9ce970c
+checksum=ae613caeb7e0e539cbc1b08ea5169bddaed8d2021d25ef66b39ddc0aa72c2902
 
 libcdr-devel_package() {
 	depends="libcdr>=${version}_${revision} $makedepends"

From 227972478c94f19f5a1150595cbad9b33d1499a3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 16 Apr 2021 21:38:39 +0200
Subject: [PATCH 1236/2024] quickjs: fix for XBPS_TARGET_NO_ATOMIC8.

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

diff --git a/srcpkgs/quickjs/template b/srcpkgs/quickjs/template
index 658145aa4da0..611c47bec888 100644
--- a/srcpkgs/quickjs/template
+++ b/srcpkgs/quickjs/template
@@ -19,6 +19,11 @@ if [ "$CROSS_BUILD" ]; then
 	make_install_args="${make_build_args}"
 fi
 
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	export EXTRA_LIBS="-latomic"
+fi
+
 pre_configure() {
 	vsed -i -e '/HOST_CC/s/CFLAGS_OPT/BUILD_CFLAGS/' Makefile
 	cat >>Makefile <<EOF

From 34a6a1a4b175e9c6e40529a47e5f8a2b4db6de22 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 16 Apr 2021 21:38:45 +0200
Subject: [PATCH 1237/2024] edbrowse: fix for XBPS_TARGET_NO_ATOMIC8.

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

diff --git a/srcpkgs/edbrowse/template b/srcpkgs/edbrowse/template
index 95478dfea6fa..3e1af5bfa4c5 100644
--- a/srcpkgs/edbrowse/template
+++ b/srcpkgs/edbrowse/template
@@ -15,6 +15,11 @@ homepage="http://edbrowse.org/"
 distfiles="https://github.com/CMB/edbrowse/archive/v${version}.tar.gz"
 checksum=5d512b63ee69e418e5946557ebc703c19e6dccc515f358649a2d38063a6d6a69
 
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	make_build_args+=" QUICKJS_LDFLAGS+=-latomic"
+fi
+
 do_install() {
 	vbin src/edbrowse
 	vsconf doc/sample.ebrc

From 138743910e35aa2217b6c95db1e9e05ff41601ea Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 16 Apr 2021 14:47:34 -0500
Subject: [PATCH 1238/2024] libxlsxwriter: update to 1.0.2.

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

diff --git a/srcpkgs/libxlsxwriter/template b/srcpkgs/libxlsxwriter/template
index 62b799d41418..64f63ec17788 100644
--- a/srcpkgs/libxlsxwriter/template
+++ b/srcpkgs/libxlsxwriter/template
@@ -1,6 +1,6 @@
 # Template file for 'libxlsxwriter'
 pkgname=libxlsxwriter
-version=1.0.1
+version=1.0.2
 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=86df82e1180f07bd0be19225776db8fbe199d66e715a343d8c0c3444b05ec00b
+checksum=94a99e5d3121a9591bbbe966c581d0c30bf30e4e5be762b6e3066c25fd066092
 
 pre_configure() {
 	sed -i "/^add_library/a set_target_properties(\${PROJECT_NAME}	\

From d3da8755a4de6dfd4619cb2f1bbc52e88f848cce Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 16 Apr 2021 13:39:22 -0500
Subject: [PATCH 1239/2024] alienfx: update to 2.3.5.

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

diff --git a/srcpkgs/alienfx/template b/srcpkgs/alienfx/template
index 5a6bffd38653..cb3dc5f6e75f 100644
--- a/srcpkgs/alienfx/template
+++ b/srcpkgs/alienfx/template
@@ -1,18 +1,19 @@
 # Template file for 'alienfx'
 pkgname=alienfx
-version=2.3.4
-revision=3
+version=2.3.5
+revision=1
 build_style=python3-module
-pycompile_module="alienfx"
 hostmakedepends="python3-setuptools"
 depends="python3-usb python3-cairo python3-gobject python3-setuptools
  python3-future"
+checkdepends="python3-pytest python3-pluggy"
 short_desc="Control the lighting effects of Alienware computers"
-maintainer="Andrew Benson <abenson@gmail.com>"
+maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/trackmastersteve/alienfx"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=d3868709796f3ec582fc1a7b634258a49f04c6db81d2852b4cfa965ac7c7a608
+checksum=46b89e090c5ee8661f1f1570234e4b9c505e64e9a391ddafbaca0090692471b5
+make_check=no # There are no tests.
 
 post_install() {
 	vmkdir usr/lib/udev/rules.d

From 49f7d44d7ab14db71db19c5c2764e414dd3a8d8b Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Fri, 16 Apr 2021 23:37:15 +0200
Subject: [PATCH 1240/2024] ImageMagick: update to 7.0.11.6.

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

diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 6a721b174560..e2fb9c8df8b0 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -1,7 +1,7 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
 _majorver=7.0.11
-_patchver=3
+_patchver=6
 version="${_majorver}.${_patchver}"
 revision=1
 wrksrc="${pkgname}-${_majorver}-${_patchver}"
@@ -21,7 +21,7 @@ license="ImageMagick"
 homepage="https://www.imagemagick.org/"
 changelog="https://imagemagick.org/script/changelog.php"
 distfiles="https://github.com/ImageMagick/ImageMagick/archive/${_majorver}-${_patchver}.tar.gz"
-checksum=ceef1e81f4ab8ebfe9e61c494b8355c1b32bbb262aa6ec12b737c607e3078a40
+checksum=8adc1605784653b078572b825e8cd1d3d54f8a1b4ba86b32ca253c038f7e4c37
 
 subpackages="libmagick libmagick-devel"
 

From 5f945cb09c413afe12ead55cba3de3991ac90217 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Fri, 16 Apr 2021 23:37:18 +0200
Subject: [PATCH 1241/2024] ImageMagick6: update to 6.9.12.7.

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

diff --git a/srcpkgs/ImageMagick6/template b/srcpkgs/ImageMagick6/template
index fe0eeba05f5c..84a9821d103a 100644
--- a/srcpkgs/ImageMagick6/template
+++ b/srcpkgs/ImageMagick6/template
@@ -1,7 +1,7 @@
 # Template file for 'ImageMagick6'
 pkgname=ImageMagick6
 _majorver=6.9.12
-_patchver=3
+_patchver=7
 version="${_majorver}.${_patchver}"
 revision=1
 wrksrc="${pkgname}-${_majorver}-${_patchver}"
@@ -20,7 +20,7 @@ maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="ImageMagick"
 homepage="https://www.imagemagick.org/"
 distfiles="https://github.com/ImageMagick/ImageMagick6/archive/${_majorver}-${_patchver}.tar.gz"
-checksum=46f8e7224cd34aaab2de8e5221ed23d357d154ad63f1a6c28e4fa0a650537190
+checksum=6abbd6afe7130edba7652a49c03a699657d6a71cf631a3c82014a31c8f93996d
 
 keep_libtool_archives=yes
 conf_files="/etc/ImageMagick-${_majorver%%.*}/*.xml"

From f3e96809d752ec127e0f2d32dc6bc744a2325d16 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 17 Apr 2021 06:07:59 +0200
Subject: [PATCH 1242/2024] quickjs: actually properly fix libatomic stuff

this was not visible for cross because qjsc is called from host
---
 srcpkgs/quickjs/patches/atomic.patch | 12 ++++++++++++
 srcpkgs/quickjs/template             |  3 ++-
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/quickjs/patches/atomic.patch

diff --git a/srcpkgs/quickjs/patches/atomic.patch b/srcpkgs/quickjs/patches/atomic.patch
new file mode 100644
index 000000000000..2e67bc6719a7
--- /dev/null
+++ b/srcpkgs/quickjs/patches/atomic.patch
@@ -0,0 +1,12 @@
+--- qjsc.c
++++ qjsc.c
+@@ -452,6 +452,9 @@ static int output_executable(const char *out_filename, const char *cfilename,
+     *arg++ = "-lm";
+     *arg++ = "-ldl";
+     *arg++ = "-lpthread";
++#ifdef LINK_ATOMIC
++    *arg++ = "-latomic";
++#endif
+     *arg = NULL;
+     
+     if (verbose) {
diff --git a/srcpkgs/quickjs/template b/srcpkgs/quickjs/template
index 611c47bec888..a1c9f8d1c36a 100644
--- a/srcpkgs/quickjs/template
+++ b/srcpkgs/quickjs/template
@@ -1,7 +1,7 @@
 # Template file for 'quickjs'
 pkgname=quickjs
 version=2021.03.27
-revision=1
+revision=2
 wrksrc="${pkgname}-${version//./-}"
 build_style=gnu-makefile
 make_use_env=true
@@ -21,6 +21,7 @@ fi
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
+	CFLAGS+=" -DLINK_ATOMIC"
 	export EXTRA_LIBS="-latomic"
 fi
 

From 671d6fbbf360ceef116a20c52a2a33cf24c0e500 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sat, 17 Apr 2021 02:03:11 -0300
Subject: [PATCH 1243/2024] quickjs: template top level should assign to
 CFLAGS, not add.

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

diff --git a/srcpkgs/quickjs/template b/srcpkgs/quickjs/template
index a1c9f8d1c36a..c9d7087d243d 100644
--- a/srcpkgs/quickjs/template
+++ b/srcpkgs/quickjs/template
@@ -21,7 +21,7 @@ fi
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
-	CFLAGS+=" -DLINK_ATOMIC"
+	CFLAGS="-DLINK_ATOMIC"
 	export EXTRA_LIBS="-latomic"
 fi
 

From 94f22408487120e66255abd0dff68bc53850f5a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sat, 17 Apr 2021 02:20:34 -0300
Subject: [PATCH 1244/2024] Revert "quickjs: template top level should assign
 to CFLAGS, not add."

This reverts commit c202cd841b133c1f558767a505988be66195d8b4.

- xbps-src should clean CFLAGS before parsing templates, so adding would
  always be safe
- avoids human error if someone adds CFLAGS above or below this block
  and forgets to change CFLAGS= to CFLAGS+=
---
 srcpkgs/quickjs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/quickjs/template b/srcpkgs/quickjs/template
index c9d7087d243d..a1c9f8d1c36a 100644
--- a/srcpkgs/quickjs/template
+++ b/srcpkgs/quickjs/template
@@ -21,7 +21,7 @@ fi
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
-	CFLAGS="-DLINK_ATOMIC"
+	CFLAGS+=" -DLINK_ATOMIC"
 	export EXTRA_LIBS="-latomic"
 fi
 

From 0dbc8209b1e244d19179071373450dae9b4dd736 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sat, 17 Apr 2021 01:59:03 +0200
Subject: [PATCH 1245/2024] youtube-dl: update to 2021.04.17.

---
 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 3c140d865306..e98055f1c8af 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.04.07
+version=2021.04.17
 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=f5080aa885672628d63f4a3e0ff0976437b4ff2caef91321fc23cbf60c0da509
+checksum=75eff59a6a81708e1bf075f1a46cea4058694c286f154a35ee7d6dd760da0e42
 
 do_check() {
 	PYTHON=/usr/bin/python3 make offlinetest

From 0218db99212595d2f670b03eabbd290fb1098bc5 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 16 Apr 2021 10:19:59 +0300
Subject: [PATCH 1246/2024] xf86-input-libinput: update to 1.0.1.

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

diff --git a/srcpkgs/xf86-input-libinput/template b/srcpkgs/xf86-input-libinput/template
index e1eac94db45b..bc94e1c9808c 100644
--- a/srcpkgs/xf86-input-libinput/template
+++ b/srcpkgs/xf86-input-libinput/template
@@ -1,6 +1,6 @@
 # Template file for 'xf86-input-libinput'
 pkgname=xf86-input-libinput
-version=1.0.0
+version=1.0.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="MIT"
 homepage="https://xorg.freedesktop.org/"
 distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
-checksum=ef55c2f66ae65da476c400205692ff77c9192bdc16fb3a285ea252267cf28a74
+checksum=fddec49c115591918475155bf16aaf23017d7f814cee7823a0c11f867aca245b
 lib32disabled=yes
 
 post_install() {

From 45620d439a089615960da1662fc0c3b1983db4f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sat, 17 Apr 2021 02:59:22 -0300
Subject: [PATCH 1247/2024] lf: fix update file.

---
 srcpkgs/lf/update | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lf/update b/srcpkgs/lf/update
index 48ff1d9d851d..42dfad0fb8eb 100644
--- a/srcpkgs/lf/update
+++ b/srcpkgs/lf/update
@@ -1,2 +1,2 @@
-site='https://github.com/gokcehan/lf/releases'
-pattern='archive/\Kr\d+(?=\.tar\.gz)'
+pattern='\Kr\d+'
+ignore=r95

From 4bcdbd139b98dbfc8fb3b9ea8174b01788202210 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sat, 17 Apr 2021 03:04:16 -0300
Subject: [PATCH 1248/2024] kodi-rpi: revbump for mariadb-10.5.9.

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

diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
index 0b50f0f9f04a..fc0fbd05ffba 100644
--- a/srcpkgs/kodi-rpi/template
+++ b/srcpkgs/kodi-rpi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi-rpi'
 pkgname=kodi-rpi
 version=18.8
-revision=5
+revision=6
 _codename="Leia"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake

From f2ce7800c0008bf22f4143df3706270ecd836d92 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Sat, 17 Apr 2021 00:53:26 +0300
Subject: [PATCH 1249/2024] monero-gui: update to 0.17.2.1

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

diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 16d2926d770a..7d5f410753a3 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,6 +1,6 @@
 # Template file for 'monero-gui'
 pkgname=monero-gui
-version=0.17.2.0
+version=0.17.2.1
 revision=1
 _monero_version=0.17.2.0
 _randomx_version="1.1.8"
@@ -26,7 +26,7 @@ distfiles="https://github.com/monero-project/monero-gui/archive/v${version}.tar.
  https://github.com/Tencent/rapidjson/archive/${_rapidjson_gitrev}.tar.gz
  https://github.com/monero-project/supercop/archive/${_supercop_gitrev}.tar.gz
  https://github.com/dlbeer/quirc/archive/${_quirc_gitrev}.tar.gz"
-checksum="00fbadca8090b85781b66b9cf54c36926ba9502ea5ce8e375a4342993b4ce907
+checksum="223482dd8284a872b3afb8ca6f73e05c7b7ade475f73ea3146ae6fc190065204
  5e9bd2e565a57b4ae9f0d851704725b2e0b18c4a94051e56d5deae4e74727496
  f982a12d18b1d260bef2a1d3c46ae4902975fbf63abb38ca6413c96d1778db3a
  44b007d419ac21b6affec58991e865ee572346ead19b73cf1c3e4e11c7a81273

From b717ff8c1dd4535c2931eff9a2d3d9dd947c2cbf Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Sat, 17 Apr 2021 03:56:49 +0300
Subject: [PATCH 1250/2024] Waybar: update to 0.9.7

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

diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index 13b84b38d847..5d6538e66982 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
 # Template file for 'Waybar'
 pkgname=Waybar
-version=0.9.5
-revision=2
+version=0.9.7
+revision=1
 _date_version=3.0.0
 create_wrksrc=yes
 build_wrksrc=${pkgname}-${version}
@@ -31,7 +31,7 @@ changelog="https://github.com/Alexays/Waybar/releases"
 distfiles="https://github.com/Alexays/Waybar/archive/${version}.tar.gz
  https://github.com/HowardHinnant/date/archive/v${_date_version}.tar.gz
  https://github.com/mesonbuild/hinnant-date/releases/download/${_date_version}-1/hinnant-date.zip"
-checksum="74d783d4da01c1c3a90a00968d74f47c2193a6952c3b2e0584cf3ddfa1ae4254
+checksum="0d23573e0f6ce6e3f3eb4d1d7313848b924429268f3becd81649a391ae7703e7
  87bba2eaf0ebc7ec539e5e62fc317cb80671a337c1fb1b84cb9e4d42c6dbebe3
  6ccaf70732d8bdbd1b6d5fdf3e1b935c23bf269bda12fdfd0e561276f63432fe"
 

From 8cb63185ea8e912ffeb8fcefd2a98fcbeec91dca Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 14 Apr 2021 16:00:49 +0300
Subject: [PATCH 1251/2024] nettle: update to 3.7.2.

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

diff --git a/srcpkgs/nettle/template b/srcpkgs/nettle/template
index a9409e1b7821..acbcec1ec063 100644
--- a/srcpkgs/nettle/template
+++ b/srcpkgs/nettle/template
@@ -1,6 +1,6 @@
 # Template file for 'nettle'
 pkgname=nettle
-version=3.6
+version=3.7.2
 revision=1
 build_style=gnu-configure
 configure_args="--enable-shared"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
 homepage="https://www.lysator.liu.se/~nisse/nettle/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=d24c0d0f2abffbc8f4f34dcf114b0f131ec3774895f3555922fe2f40f3d5e3f1
+checksum=8d2a604ef1cde4cd5fb77e422531ea25ad064679ff0adf956e78b3352e0ef162
 
 nettle-devel_package() {
 	depends="gmp-devel ${sourcepkg}>=${version}_${revision}"

From 3ecb4c37ae5cd0869967c25d1cbad48d897fc070 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sun, 11 Apr 2021 13:17:59 +0200
Subject: [PATCH 1252/2024] clamav: update to 0.103.2.

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

diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index 2dcc86015d9f..11266034025a 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -1,7 +1,7 @@
 # Template file for 'clamav'
 pkgname=clamav
-version=0.103.1
-revision=2
+version=0.103.2
+revision=1
 build_style=gnu-configure
 # XXX: system llvm is too new (< 3.7 required)
 # Shipped llvm does not build with gcc>=6
@@ -19,7 +19,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="http://www.clamav.net/"
 distfiles="http://www.clamav.net/downloads/production/${pkgname}-${version}.tar.gz"
-checksum=7308c47b89b268af3b9f36140528927a49ff3e633a9c9c0aac2712d81056e257
+checksum=d4b5d0ac666262e423a326fb54778caa7c69624d6c3f9542895feb8478271bd2
 _clamav_homedir="/var/lib/_${pkgname}"
 _clamav_descr="ClamAV user"
 system_accounts="_clamav"

From 06d54e9524b4b7352932bd8b9211d8167d6c63e0 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 17 Apr 2021 12:59:33 +0200
Subject: [PATCH 1253/2024] lxqt-build-tools: update to 0.9.0.

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

diff --git a/srcpkgs/lxqt-build-tools/template b/srcpkgs/lxqt-build-tools/template
index 93ce3d4ae042..f97ecbaa8f73 100644
--- a/srcpkgs/lxqt-build-tools/template
+++ b/srcpkgs/lxqt-build-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'lxqt-build-tools'
 pkgname=lxqt-build-tools
-version=0.8.0
+version=0.9.0
 revision=1
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake pkg-config"
@@ -10,7 +10,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="BSD-3-Clause"
 homepage="https://lxqt.org/"
 distfiles="https://github.com/lxqt/lxqt-build-tools/releases/download/${version}/lxqt-build-tools-${version}.tar.xz"
-checksum=8cad73636e3a1f09baab0d82a2e76f3e171ce2adacade03ccc0a6cf0a51d69a9
+checksum=9782878d6c0cc896d4a54fce5cc322561cdf1df270b8f941b2088a434b535e4d
 
 post_install() {
 	vlicense BSD-3-Clause LICENSE

From 6da114f4eef56f27383cfc59cb02d7f5038c0637 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 17 Apr 2021 13:01:23 +0200
Subject: [PATCH 1254/2024] libqtxdg: update to 3.7.1.

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

diff --git a/srcpkgs/libqtxdg/template b/srcpkgs/libqtxdg/template
index 4ac9bb69f75c..0db0a08fd9ea 100644
--- a/srcpkgs/libqtxdg/template
+++ b/srcpkgs/libqtxdg/template
@@ -1,6 +1,6 @@
 # Template file for 'libqtxdg'
 pkgname=libqtxdg
-version=3.6.0
+version=3.7.1
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools lxqt-build-tools"
@@ -10,7 +10,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://lxqt.org/"
 distfiles="https://github.com/lxqt/libqtxdg/releases/download/${version}/libqtxdg-${version}.tar.xz"
-checksum=0fefb362eac9120fccd401202f15d092a59fd1aaacfc4b885a33578cdd41cf42
+checksum=477cbe76b3305071ff5f5bfa31dbcddcc51f3434b9ed75d91988219296d88a9b
 
 libqtxdg-devel_package() {
 	short_desc+=" - development files"

From 54ae555fb9924977079f26c3600979b357e51cb3 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 17 Apr 2021 13:06:13 +0200
Subject: [PATCH 1255/2024] liblxqt: update to 0.17.0.

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

diff --git a/srcpkgs/liblxqt/template b/srcpkgs/liblxqt/template
index bd195b98fb58..5e1048909cb7 100644
--- a/srcpkgs/liblxqt/template
+++ b/srcpkgs/liblxqt/template
@@ -1,6 +1,6 @@
 # Template file for 'liblxqt'
 pkgname=liblxqt
-version=0.16.0
+version=0.17.0
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://lxqt.org/"
 distfiles="https://github.com/lxqt/liblxqt/releases/download/${version}/liblxqt-${version}.tar.xz"
-checksum=8dcf423978a22fc9bc43ca5fee31586632b0fd48e650ecdc863ac19114c7b318
+checksum=d44e3b4c0963537d5032328ac29bb0d61d454dc28d0fac7e1ddcb9d7be91c32b
 
 liblxqt-devel_package() {
 	short_desc+=" - development files"

From 6fca36eb47e66ef2a1354453e734175a9994db69 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 17 Apr 2021 13:11:18 +0200
Subject: [PATCH 1256/2024] libfm-qt: update to 0.17.1.

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

diff --git a/common/shlibs b/common/shlibs
index bb2b60e1f247..001fcd56590d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2012,7 +2012,7 @@ libsysstat-qt5.so.0 libsysstat-0.3.2_1
 libpolkit-qt5-agent-1.so.1 polkit-qt5-0.112.0_1
 libpolkit-qt5-gui-1.so.1 polkit-qt5-0.112.0_1
 libpolkit-qt5-core-1.so.1 polkit-qt5-0.112.0_1
-libfm-qt.so.8 libfm-qt-0.16.0_1
+libfm-qt.so.9 libfm-qt-0.17.0_1
 libqtermwidget5.so.0 qtermwidget-0.6.0_1
 libnpth.so.0 npth-1.1_1
 libnpupnp.so.4 libnpupnp-4.0.2_1
diff --git a/srcpkgs/libfm-qt/template b/srcpkgs/libfm-qt/template
index afc3dbb4eb6d..acb198f17cd8 100644
--- a/srcpkgs/libfm-qt/template
+++ b/srcpkgs/libfm-qt/template
@@ -1,9 +1,9 @@
 # Template file for 'libfm-qt'
 pkgname=libfm-qt
-version=0.16.0
+version=0.17.1
 revision=1
 build_style=cmake
-hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools"
+hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools perl"
 makedepends="qt5-tools-devel qt5-x11extras-devel libexif-devel
  menu-cache-devel"
 short_desc="Core library of PCManFM-Qt"
@@ -11,7 +11,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://lxqt.org/"
 distfiles="https://github.com/lxqt/libfm-qt/releases/download/${version}/libfm-qt-${version}.tar.xz"
-checksum=7796e74cf372d7ae3289f5d584f2e0d7bd29020b4e0d79308a157c970860f7b4
+checksum=aa3f8f4d8035d106ed80e0b0ae5fced5ad61d4dac3f960392f3a71fb42a521a5
 replaces="libfm-qt5>=0"
 
 libfm-qt-devel_package() {

From 4f5c06b5218069ac77ffac9f956f84d9b6efa30d Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 17 Apr 2021 13:14:10 +0200
Subject: [PATCH 1257/2024] pcmanfm-qt: update to 0.17.0.

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

diff --git a/srcpkgs/pcmanfm-qt/template b/srcpkgs/pcmanfm-qt/template
index 8a07d2496746..ef38beab392f 100644
--- a/srcpkgs/pcmanfm-qt/template
+++ b/srcpkgs/pcmanfm-qt/template
@@ -1,9 +1,9 @@
 # Template file for 'pcmanfm-qt'
 pkgname=pcmanfm-qt
-version=0.16.0
+version=0.17.0
 revision=1
 build_style=cmake
-hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools libfm-devel"
+hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools libfm-devel perl"
 makedepends="qt5-tools-devel qt5-x11extras-devel libfm-qt-devel"
 depends="qt5-translations"
 short_desc="LXQt pcmanfm Qt frontend"
@@ -11,5 +11,5 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.lxqt.org"
 distfiles="https://github.com/lxqt/pcmanfm-qt/releases/download/${version}/pcmanfm-qt-${version}.tar.xz"
-checksum=fc08bb6050543d862bf3594d6bd414c427b7998e36177e5e62611ce3e7effab6
+checksum=74acbf55cdb22bd4d0068ef22ba298254ce6de72374624fcf3087c016d3bbaab
 replaces="lxqt-common>=0"

From a2aa38d1422ad1b7dbf5352b65fa454abc454f28 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 17 Apr 2021 13:20:06 +0200
Subject: [PATCH 1258/2024] lxqt-qtplugin: update to 0.17.0.

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

diff --git a/srcpkgs/lxqt-qtplugin/template b/srcpkgs/lxqt-qtplugin/template
index f8c546ca4dec..947ad4a5ce10 100644
--- a/srcpkgs/lxqt-qtplugin/template
+++ b/srcpkgs/lxqt-qtplugin/template
@@ -1,6 +1,6 @@
 # Template file for 'lxqt-qtplugin'
 pkgname=lxqt-qtplugin
-version=0.16.0
+version=0.17.0
 revision=1
 build_style=cmake
 hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools libfm-devel"
@@ -10,4 +10,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://lxqt.org/"
 distfiles="https://github.com/lxqt/lxqt-qtplugin/releases/download/${version}/lxqt-qtplugin-${version}.tar.xz"
-checksum=4920add017ec6805d50ae653c09ffd9623314aaa2a606054e01a4b9e6498ea90
+checksum=65ef1156eb3257bd875e944963968585b042262d6b673ec6506d8fe7fa528691

From 18e404d9e5d4556f77c86894e03d37a0617d451a Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 17 Apr 2021 13:22:53 +0200
Subject: [PATCH 1259/2024] lximage-qt: update to 0.17.0.

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

diff --git a/srcpkgs/lximage-qt/template b/srcpkgs/lximage-qt/template
index 84a37e36ef61..f9033e6950a4 100644
--- a/srcpkgs/lximage-qt/template
+++ b/srcpkgs/lximage-qt/template
@@ -1,9 +1,9 @@
 # Template file for 'lximage-qt'
 pkgname=lximage-qt
-version=0.16.0
+version=0.17.0
 revision=1
 build_style=cmake
-hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools"
+hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools perl"
 makedepends="qt5-x11extras-devel qt5-tools-devel qt5-svg-devel libfm-qt-devel
  libexif-devel libX11-devel"
 short_desc="LXQt image viewer"
@@ -11,4 +11,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://lxqt.org/"
 distfiles="https://github.com/lxqt/lximage-qt/releases/download/${version}/lximage-qt-${version}.tar.xz"
-checksum=d83a8c1bbbaaa8f211731b790773c3f73c638740cf42d7b215b1594de03dbc90
+checksum=2e284f3f42506d5b6df6091982d24e1dc41c99c838037939844f70d703d1d03c

From 6432d519271439b28f83bf5aaec2a012f564e0aa Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 17 Apr 2021 13:25:16 +0200
Subject: [PATCH 1260/2024] lxqt-archiver: update to 0.4.0.

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

diff --git a/srcpkgs/lxqt-archiver/template b/srcpkgs/lxqt-archiver/template
index b5fc86b27d2d..632f90508432 100644
--- a/srcpkgs/lxqt-archiver/template
+++ b/srcpkgs/lxqt-archiver/template
@@ -1,13 +1,13 @@
 # Template file for 'lxqt-archiver'
 pkgname=lxqt-archiver
-version=0.3.0
+version=0.4.0
 revision=1
 build_style=cmake
-hostmakedepends="lxqt-build-tools pkg-config qt5-host-tools qt5-qmake"
+hostmakedepends="lxqt-build-tools pkg-config qt5-host-tools qt5-qmake perl"
 makedepends="qt5-tools-devel qt5-x11extras-devel libfm-qt-devel json-glib-devel"
 short_desc="Simple & lightweight desktop-agnostic Qt file archiver"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://lxqt.org"
 distfiles="https://github.com/lxqt/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=a765e76edd3ed509d1a8adce3ab8700fbf033619f0e2edb0e486c202abe80c3e
+checksum=9f8c00b517771d99ceaf05ff7d72609580def47aae13842b461d9eecd9c1ef3b

From eeafc9ad255f788e70d8a3d2264474eccf6ac3e1 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 17 Apr 2021 13:27:18 +0200
Subject: [PATCH 1261/2024] libsysstat: update to 0.4.5.

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

diff --git a/srcpkgs/libsysstat/template b/srcpkgs/libsysstat/template
index e37f8207468c..f0a847453ca7 100644
--- a/srcpkgs/libsysstat/template
+++ b/srcpkgs/libsysstat/template
@@ -1,6 +1,6 @@
 # Template file for 'libsysstat'
 pkgname=libsysstat
-version=0.4.4
+version=0.4.5
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools"
@@ -10,7 +10,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://lxqt.org/"
 distfiles="https://github.com/lxqt/libsysstat/releases/download/${version}/libsysstat-${version}.tar.xz"
-checksum=3997d17692d2ea467d384517aedb8fcc4050f2f66114a1405d42cef0adaafa6b
+checksum=f19b6550d78939cc1ad11c5788e2a7293f7f886d037837cd1cf56ebcdf2b5ed2
 replaces="lxde-libsysstat>=0"
 
 libsysstat-devel_package() {

From 37ef64fabc601072b4b93b2c5142189442bc14b8 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 17 Apr 2021 13:29:36 +0200
Subject: [PATCH 1262/2024] lxqt-about: update to 0.17.0.

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

diff --git a/srcpkgs/lxqt-about/template b/srcpkgs/lxqt-about/template
index 8716c9be03f6..94a7a2c8b5a8 100644
--- a/srcpkgs/lxqt-about/template
+++ b/srcpkgs/lxqt-about/template
@@ -1,13 +1,13 @@
 # Template file for 'lxqt-about'
 pkgname=lxqt-about
-version=0.16.0
+version=0.17.0
 revision=1
 build_style=cmake
-hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools"
+hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools perl"
 makedepends="qt5-tools-devel liblxqt-devel"
 short_desc="LXQt about application"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://lxqt.org/"
 distfiles="https://github.com/lxqt/lxqt-about/releases/download/${version}/lxqt-about-${version}.tar.xz"
-checksum=b7aaeb2a677b049f7df59fc27eab61721afc066d6064ca333ce55dd698247b6c
+checksum=f5033a4eb339f64de5b0eea32ee9178ab06aad6b60fd428fc196add785c33113

From e6ec6bd185b0c56b8a863fec3aaac72270abeac0 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 17 Apr 2021 13:33:01 +0200
Subject: [PATCH 1263/2024] lxqt-config: update to 0.17.1.

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

diff --git a/srcpkgs/lxqt-config/template b/srcpkgs/lxqt-config/template
index cdf646cd1c88..8f0743a84c2a 100644
--- a/srcpkgs/lxqt-config/template
+++ b/srcpkgs/lxqt-config/template
@@ -1,9 +1,9 @@
 # Template file for 'lxqt-config'
 pkgname=lxqt-config
-version=0.16.1
+version=0.17.1
 revision=1
 build_style=cmake
-hostmakedepends="pkgconf lxqt-build-tools qt5-qmake qt5-host-tools"
+hostmakedepends="pkgconf lxqt-build-tools qt5-qmake qt5-host-tools perl"
 makedepends="liblxqt-devel libXcursor-devel libkscreen-devel
  xf86-input-libinput-devel libqtxdg-devel"
 short_desc="LXQt System Settings"
@@ -11,4 +11,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://lxqt.org/"
 distfiles="https://github.com/lxqt/lxqt-config/releases/download/${version}/lxqt-config-${version}.tar.xz"
-checksum=4b24ab2428e7def98e4a6485b8d2b035877f769c2e5de7f7d09624e8c79641fe
+checksum=23c1c9a3aa3bf3537b3433439501463ea3e29950ecf2381679bf30ef4c1b245b

From c0b7d3283c03bb7b84e91e9bd5191850c00537d8 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 17 Apr 2021 13:35:34 +0200
Subject: [PATCH 1264/2024] lxqt-globalkeys: update to 0.17.0.

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

diff --git a/srcpkgs/lxqt-globalkeys/template b/srcpkgs/lxqt-globalkeys/template
index 0c189dd12ba5..36af9f79bac3 100644
--- a/srcpkgs/lxqt-globalkeys/template
+++ b/srcpkgs/lxqt-globalkeys/template
@@ -1,16 +1,16 @@
 # Template file for 'lxqt-globalkeys'
 pkgname=lxqt-globalkeys
-version=0.16.0
+version=0.17.0
 revision=1
 build_style=cmake
-hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools"
+hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools perl"
 makedepends="liblxqt-devel"
 short_desc="LXQt daemon and library for global keyboard shortcuts registration"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://lxqt.org/"
 distfiles="https://github.com/lxqt/lxqt-globalkeys/releases/download/${version}/lxqt-globalkeys-${version}.tar.xz"
-checksum=9245d93a98960eee655f87ee9c3bb839580a7e6589c8540d0af73489eff1d1ed
+checksum=90c409e95efefb2ee87e99504b955a2a84d4404157d2c1b7b7992b0571c4de5e
 replaces="lxqt-common>=0"
 
 lxqt-globalkeys-devel_package() {

From 5685f8245d6487990733f020d7262f39a51a7a50 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 17 Apr 2021 13:37:54 +0200
Subject: [PATCH 1265/2024] lxqt-notificationd: update to 0.17.0.

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

diff --git a/srcpkgs/lxqt-notificationd/template b/srcpkgs/lxqt-notificationd/template
index 9971e2bb7fa2..fecec344570f 100644
--- a/srcpkgs/lxqt-notificationd/template
+++ b/srcpkgs/lxqt-notificationd/template
@@ -1,14 +1,14 @@
 # Template file for 'lxqt-notificationd'
 pkgname=lxqt-notificationd
-version=0.16.0
+version=0.17.0
 revision=1
 build_style=cmake
-hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools"
+hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools perl"
 makedepends="liblxqt-devel"
 short_desc="LXQt notification daemon"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://lxqt.org/"
 distfiles="https://github.com/lxqt/lxqt-notificationd/releases/download/${version}/lxqt-notificationd-${version}.tar.xz"
-checksum=78d6a75e3cbe7aa436134de6fda87024c4d54b2c4368230a35d031918d2c1920
+checksum=d392cac3d7300a6b8be3431fdde37f453ac439b6fd52b39e6bdeba9ad7a1cab7
 replaces="lxqt-common>=0"

From 3af651d079d6865a432770161540bc4d952aa710 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 17 Apr 2021 13:40:15 +0200
Subject: [PATCH 1266/2024] lxqt-policykit: update to 0.17.0.

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

diff --git a/srcpkgs/lxqt-policykit/template b/srcpkgs/lxqt-policykit/template
index 22bba47e3366..37469c1157b6 100644
--- a/srcpkgs/lxqt-policykit/template
+++ b/srcpkgs/lxqt-policykit/template
@@ -1,14 +1,14 @@
 # Template file for 'lxqt-policykit'
 pkgname=lxqt-policykit
-version=0.16.0
+version=0.17.0
 revision=1
 build_style=cmake
-hostmakedepends="pkg-config lxqt-build-tools polkit-qt5-devel"
+hostmakedepends="pkg-config lxqt-build-tools polkit-qt5-devel perl"
 makedepends="liblxqt-devel polkit-qt5-devel"
 short_desc="LXQt PolicyKit agent"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://lxqt.org/"
 distfiles="https://github.com/lxqt/lxqt-policykit/releases/download/${version}/lxqt-policykit-${version}.tar.xz"
-checksum=973a03b187d8844f738ea510e42ea8061c349ef12b162856161ee9c9bad4c6cf
+checksum=915e6b87966f11d70ef8dfe8a9027e6a1bcac7920a64946be7e721203a942b85
 replaces="lxqt-common>=0"

From 19eaae12295632ad0fcd820bec8743848c132c53 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 17 Apr 2021 13:42:33 +0200
Subject: [PATCH 1267/2024] lxqt-powermanagement: update to 0.17.0.

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

diff --git a/srcpkgs/lxqt-powermanagement/template b/srcpkgs/lxqt-powermanagement/template
index d57d9a3bfb58..827218fc19f1 100644
--- a/srcpkgs/lxqt-powermanagement/template
+++ b/srcpkgs/lxqt-powermanagement/template
@@ -1,13 +1,13 @@
 # Template file for 'lxqt-powermanagement'
 pkgname=lxqt-powermanagement
-version=0.16.0
+version=0.17.0
 revision=1
 build_style=cmake
-hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools"
+hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools perl"
 makedepends="liblxqt-devel ksolid-devel kidletime-devel lxqt-globalkeys-devel"
 short_desc="LXQt power management module"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://lxqt.org/"
 distfiles="https://github.com/lxqt/lxqt-powermanagement/releases/download/${version}/lxqt-powermanagement-${version}.tar.xz"
-checksum=2d919c093b7982298b67804810ff610fbc552cac40a3aaa7ab6415adc9e7e510
+checksum=b74abdc3294c109e3cd2316ae2fbea305a799141e225c5e1a229920f295690b1

From e9d6cc239eb771a7424d93419935f9ca94d29a12 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 17 Apr 2021 13:46:32 +0200
Subject: [PATCH 1268/2024] lxqt-session: update to 0.17.0.

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

diff --git a/srcpkgs/lxqt-session/template b/srcpkgs/lxqt-session/template
index 1daa4a4eb93a..2d67a8afed51 100644
--- a/srcpkgs/lxqt-session/template
+++ b/srcpkgs/lxqt-session/template
@@ -1,15 +1,16 @@
 # Template file for 'lxqt-session'
 pkgname=lxqt-session
-version=0.16.0
+version=0.17.0
 revision=1
 build_style=cmake
-hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools xdg-user-dirs"
-makedepends="liblxqt-devel xdg-user-dirs"
+hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools xdg-user-dirs
+ perl"
+makedepends="liblxqt-devel xdg-user-dirs procps-ng-devel"
 depends="xdg-user-dirs"
 short_desc="LXQt session handler"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://lxqt.org/"
 distfiles="https://github.com/lxqt/lxqt-session/releases/download/${version}/lxqt-session-${version}.tar.xz"
-checksum=547e01e173921357245fb938718bd2401b38e73245cdcbecf195130e856d4959
+checksum=9d6cac08f2681917cdd4d9aec3bb77a60ea353a9fbeaae080f52320f4ecf08c0
 replaces="lxqt-common>=0"

From 8ed47fa5f7bcb0fbeced36125b214bb36b603994 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 17 Apr 2021 13:47:58 +0200
Subject: [PATCH 1269/2024] lxqt-sudo: update to 0.17.0.

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

diff --git a/srcpkgs/lxqt-sudo/template b/srcpkgs/lxqt-sudo/template
index d1e9520174f2..439eb1030403 100644
--- a/srcpkgs/lxqt-sudo/template
+++ b/srcpkgs/lxqt-sudo/template
@@ -1,9 +1,9 @@
 # Template file for 'lxqt-sudo'
 pkgname=lxqt-sudo
-version=0.16.0
+version=0.17.0
 revision=1
 build_style=cmake
-hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools"
+hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools perl"
 makedepends="liblxqt-devel"
 depends="sudo"
 short_desc="LXQt GUI frontend for sudo"
@@ -11,4 +11,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://lxqt.org/"
 distfiles="https://github.com/lxqt/lxqt-sudo/releases/download/${version}/lxqt-sudo-${version}.tar.xz"
-checksum=f4950ff7c53c64b03859801e0b317dae29cdc2ae8b093c85d91a3891d2611092
+checksum=2c42a8f6a92c8f164ceb040149a55a50db1743262cefcfe4940f5cee4145430b

From 0532d3ff2fd58df4060c3d07f8dd390d30d8a9a8 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 17 Apr 2021 13:51:33 +0200
Subject: [PATCH 1270/2024] lxqt-panel: update to 0.17.1.

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

diff --git a/srcpkgs/lxqt-panel/template b/srcpkgs/lxqt-panel/template
index 26c2b5427d3f..27bed23be287 100644
--- a/srcpkgs/lxqt-panel/template
+++ b/srcpkgs/lxqt-panel/template
@@ -1,9 +1,9 @@
 # Template file for 'lxqt-panel'
 pkgname=lxqt-panel
-version=0.16.1
+version=0.17.1
 revision=1
 build_style=cmake
-hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools"
+hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools perl"
 makedepends="libxkbcommon-devel liblxqt-devel ksolid-devel kguiaddons-devel
  lxqt-globalkeys-devel alsa-lib-devel pulseaudio-devel libstatgrab-devel
  libsensors-devel libXcomposite-devel libsysstat-devel libdbusmenu-qt5-devel
@@ -13,4 +13,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://lxqt.org/"
 distfiles="https://github.com/lxqt/lxqt-panel/releases/download/${version}/lxqt-panel-${version}.tar.xz"
-checksum=841a205ee80cb9a68aac1bb635789b883a14074448efec09c773b96cfe71ed4c
+checksum=1830fb5a595495176eed61cb0fc9d5535e3954ed6b8f04a741a4295883764ccc

From efbec376525dad0c2fc7cba22522301e45b8b2e1 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 17 Apr 2021 13:51:52 +0200
Subject: [PATCH 1271/2024] lxqt-runner: update to 0.17.0.

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

diff --git a/srcpkgs/lxqt-runner/template b/srcpkgs/lxqt-runner/template
index b37146e87594..73bda4373292 100644
--- a/srcpkgs/lxqt-runner/template
+++ b/srcpkgs/lxqt-runner/template
@@ -1,13 +1,13 @@
 # Template file for 'lxqt-runner'
 pkgname=lxqt-runner
-version=0.16.0
+version=0.17.0
 revision=1
 build_style=cmake
-hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools"
+hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools perl"
 makedepends="liblxqt-devel lxqt-globalkeys-devel muparser-devel"
 short_desc="LXQt quick launcher"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://lxqt.org/"
 distfiles="https://github.com/lxqt/lxqt-runner/releases/download/${version}/lxqt-runner-${version}.tar.xz"
-checksum=0f36a6c54fcd850fb6589503cf41bc9da32617efef448940c0386036950f020a
+checksum=24a68c50961e1157aabdb9a3899727f50012b77e401c15447c9bdc3af792a358

From 3753d8b4e1ac758bab5908661f8de954f3a22cfd Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 17 Apr 2021 13:55:16 +0200
Subject: [PATCH 1272/2024] lxqt-themes: update to 0.17.0.

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

diff --git a/srcpkgs/lxqt-themes/template b/srcpkgs/lxqt-themes/template
index 51480664785b..80e21761371d 100644
--- a/srcpkgs/lxqt-themes/template
+++ b/srcpkgs/lxqt-themes/template
@@ -1,14 +1,14 @@
 # Template file for 'lxqt-themes'
 pkgname=lxqt-themes
-version=0.16.0
+version=0.17.0
 revision=1
 build_style=cmake
-hostmakedepends="lxqt-build-tools"
+hostmakedepends="lxqt-build-tools perl"
 depends="hicolor-icon-theme"
 short_desc="Themes, graphics and icons for LXQt"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://lxqt.org/"
 distfiles="https://github.com/lxqt/lxqt-themes/releases/download/${version}/lxqt-themes-${version}.tar.xz"
-checksum=ae7bdcc86fcd0d492a24e6deb13a629edb05c4c44ffebe73eb21903bd8fa25eb
+checksum=3ff1960f593ffb591ebf8ce48a54953f30e6f7fac4880ad6eb1dbe9ecd67bb4e
 replaces="lxqt-common>=0"

From b5c1cd642a2d575c20e1fe49b8ecd86f5ecb3948 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 17 Apr 2021 13:56:49 +0200
Subject: [PATCH 1273/2024] qtermwidget: update to 0.17.0.

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

diff --git a/srcpkgs/qtermwidget/template b/srcpkgs/qtermwidget/template
index 62d1587caa57..0d792066f4a0 100644
--- a/srcpkgs/qtermwidget/template
+++ b/srcpkgs/qtermwidget/template
@@ -1,6 +1,6 @@
 # Template file for 'qtermwidget'
 pkgname=qtermwidget
-version=0.16.1
+version=0.17.0
 revision=1
 build_style=cmake
 hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools"
@@ -10,7 +10,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://lxqt.org/"
 distfiles="https://github.com/lxqt/qtermwidget/releases/download/${version}/qtermwidget-${version}.tar.xz"
-checksum=9266fe2b9d8b8c7297960660c13f816093706f18453c883671445ed49123b938
+checksum=4e04b2fb71d7382266a1ea168bf02d1283e04df6127a42f760a30389cb219b82
 
 qtermwidget-devel_package() {
 	short_desc+=" - development files"

From 771db19633f867f26e11b807ec6af3b829dfe47b Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 17 Apr 2021 13:58:45 +0200
Subject: [PATCH 1274/2024] qterminal: update to 0.17.0.

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

diff --git a/srcpkgs/qterminal/template b/srcpkgs/qterminal/template
index 32d105367119..93e8b8263f8a 100644
--- a/srcpkgs/qterminal/template
+++ b/srcpkgs/qterminal/template
@@ -1,9 +1,9 @@
 # Template file for 'qterminal'
 pkgname=qterminal
-version=0.16.1
+version=0.17.0
 revision=1
 build_style=cmake
-hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools"
+hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools perl"
 makedepends="qtermwidget-devel qt5-tools-devel qt5-x11extras-devel"
 depends="desktop-file-utils"
 short_desc="Lightweight terminal emulator written in Qt"
@@ -11,4 +11,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://lxqt.org/"
 distfiles="https://github.com/lxqt/qterminal/releases/download/${version}/qterminal-${version}.tar.xz"
-checksum=550f39aeb705cd58f8296a07e3bb5553fdba5ebccb837a83798fcc4f7af30b9e
+checksum=a9859876205940566519e763f6fb33c3109e044dd0461615d20e55668d3adb65

From 82d24049b51b6dcc5bbbb9ec21146391d74019f5 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 17 Apr 2021 13:59:49 +0200
Subject: [PATCH 1275/2024] lxqt-openssh-askpass: update to 0.17.0.

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

diff --git a/srcpkgs/lxqt-openssh-askpass/template b/srcpkgs/lxqt-openssh-askpass/template
index 1c2dfd87da50..89163894c72a 100644
--- a/srcpkgs/lxqt-openssh-askpass/template
+++ b/srcpkgs/lxqt-openssh-askpass/template
@@ -1,9 +1,9 @@
 # Template file for 'lxqt-openssh-askpass'
 pkgname=lxqt-openssh-askpass
-version=0.16.0
+version=0.17.0
 revision=1
 build_style=cmake
-hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools"
+hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools perl"
 makedepends="liblxqt-devel"
 depends="openssh"
 short_desc="LXQt ssh-agent helper"
@@ -11,5 +11,5 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://lxqt.org/"
 distfiles="https://github.com/lxqt/lxqt-openssh-askpass/releases/download/${version}/lxqt-openssh-askpass-${version}.tar.xz"
-checksum=99f686302e2be457b82ba3444ef36613361a32335f0c44e894835a11a5d22046
+checksum=19322332443151ceadc24f4eea12188eb7dd08c77fb0f41dcd6ee92018f2ac3d
 alternatives="ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/lxqt-openssh-askpass"

From 184c0d51727495f81afc4ecb66af963f68c876d7 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 17 Apr 2021 14:01:07 +0200
Subject: [PATCH 1276/2024] lxqt-admin: update to 0.17.0.

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

diff --git a/srcpkgs/lxqt-admin/template b/srcpkgs/lxqt-admin/template
index 952446299f8d..0374d69117ff 100644
--- a/srcpkgs/lxqt-admin/template
+++ b/srcpkgs/lxqt-admin/template
@@ -1,16 +1,17 @@
 # Template file for 'lxqt-admin'
 pkgname=lxqt-admin
-version=0.16.0
+version=0.17.0
 revision=1
 build_style=cmake
-hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools polkit-qt5-devel"
+hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools polkit-qt5-devel
+ perl"
 makedepends="liblxqt-devel"
 short_desc="LXQt system administration tool"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://lxqt.org/"
 distfiles="https://github.com/lxqt/lxqt-admin/releases/download/${version}/lxqt-admin-${version}.tar.xz"
-checksum=1ea928c83a04d59db27274e300215d9bc8159b0cfc5bdae11ce78f05caa450dc
+checksum=83485e4cf8d61861711934ca4e41b0a90cd03528dbc3b0f5ffb2bb5bffb0d31d
 
 post_install() {
 	# depends on systemd-{timedated,timesyncd}

From 33db043c7c8c0a950c1a0dbb0e37c3a24e5cc15a Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 17 Apr 2021 14:02:29 +0200
Subject: [PATCH 1277/2024] pavucontrol-qt: update to 0.17.0.

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

diff --git a/srcpkgs/pavucontrol-qt/template b/srcpkgs/pavucontrol-qt/template
index 6082cb041434..ff9ded52f453 100644
--- a/srcpkgs/pavucontrol-qt/template
+++ b/srcpkgs/pavucontrol-qt/template
@@ -1,13 +1,13 @@
 # Template file for 'pavucontrol-qt'
 pkgname=pavucontrol-qt
-version=0.16.0
+version=0.17.0
 revision=1
 build_style=cmake
-hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools"
+hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools perl"
 makedepends="qt5-tools-devel pulseaudio-devel"
 short_desc="Pulseaudio mixer in Qt"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://lxqt.org/"
 distfiles="https://github.com/lxqt/pavucontrol-qt/releases/download/${version}/pavucontrol-qt-${version}.tar.xz"
-checksum=12a9b9965c3cfaf2335a741a6727b2decf7fec7c9a44817a28d66c8b3caa89d4
+checksum=6c274cd3a80a699c4b3f4dbf4eccaef3fafdc677c6240e2b45672bafe46da170

From f7d163aafd3c882087fd0e7311a45d3f8a7f9e0b Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 17 Apr 2021 14:14:21 +0200
Subject: [PATCH 1278/2024] linux5.4: update to 5.4.113.

---
 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 95072aa2f640..9dca04dca109 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.112
+version=5.4.113
 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=b8361d461a4254c86d4c68aa4ceab1debaa3b2ccc6785542d026837a4fc20ca4
+checksum=30cde92463c474b75f9eb197654570dd6dbb32ec20695544c5469f292662da47
 python_version=3
 patch_args="-Np1"
 

From 2084876c548bcf586fc3b2924c16cc314783121e Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 17 Apr 2021 14:15:17 +0200
Subject: [PATCH 1279/2024] linux4.19: update to 4.19.188.

---
 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 357b577d6ba9..5272ae8a3377 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.187
+version=4.19.188
 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=a04c023cac04b7d2e1c4c98a67a36a56e5b793386470a4d23e45d61e0297a0c3
+checksum=b09cf1f026b1260bae6480d98c471958eff3ad64b65e59e64a6852f678050077
 python_version=2 #unverified
 patch_args="-Np1"
 

From 79bfcbc1020b01ec4d8ce903d7766f89f9163a04 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 17 Apr 2021 14:19:37 +0200
Subject: [PATCH 1280/2024] lxqt: update to 0.17.0.

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

diff --git a/srcpkgs/lxqt/template b/srcpkgs/lxqt/template
index b45ad6a82554..45b99159daad 100644
--- a/srcpkgs/lxqt/template
+++ b/srcpkgs/lxqt/template
@@ -1,6 +1,6 @@
 # Template file for 'lxqt'
 pkgname=lxqt
-version=0.16.0
+version=0.17.0
 revision=1
 build_style=meta
 depends="
@@ -18,7 +18,7 @@ depends="
 	lxqt-session>=${version}
 	lxqt-sudo>=${version}
 	lxqt-themes>=${version}
-	obconf-qt>=${version}
+	obconf-qt
 	pcmanfm-qt>=${version}
 	lximage-qt>=${version}
 	lxmenu-data

From 1afd633f4b5731dca1a375adbadbf97d313d2180 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 17 Apr 2021 20:11:26 +0200
Subject: [PATCH 1281/2024] skaffold: update to 1.22.0.

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

diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index 3c82b7c2d6f8..d7e9e4686dea 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,6 +1,6 @@
 # Template file for 'skaffold'
 pkgname=skaffold
-version=1.21.0
+version=1.22.0
 revision=1
 build_style=go
 go_import_path=github.com/GoogleContainerTools/skaffold
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://skaffold.dev/"
 changelog="https://github.com/GoogleContainerTools/skaffold/releases"
 distfiles="https://github.com/GoogleContainerTools/skaffold/archive/v${version}.tar.gz"
-checksum=b82018c8e1937e29972d907c71b8eb28fd3f44e73a94525ec1d4f28511a243c5
+checksum=d9cee2e079b32b289d0e8c2c64fe2b403822aa9a4127482339b88f3160805639

From 6210006a1e0bd0052b47bce69e2a48e6a1129cf9 Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Sun, 11 Apr 2021 13:38:44 -0300
Subject: [PATCH 1282/2024] inetutils: update to 2.0.

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

diff --git a/srcpkgs/inetutils/template b/srcpkgs/inetutils/template
index 04177ecbf11f..7918a4641a87 100644
--- a/srcpkgs/inetutils/template
+++ b/srcpkgs/inetutils/template
@@ -1,16 +1,17 @@
 # Template file for 'inetutils'
 pkgname=inetutils
-version=1.9.4
-revision=12
+version=2.0
+revision=1
 build_style=gnu-configure
 configure_args="--without-wrap --with-pam"
 makedepends="pam-devel readline-devel"
+checkdepends="iana-etc net-tools"
 short_desc="GNU network utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/inetutils"
 distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.xz"
-checksum=849d96f136effdef69548a940e3e0ec0624fc0c81265296987986a0dd36ded37
+checksum=e573d566e55393940099862e7f8994164a0ed12f5a86c3345380842bdc124722
 
 subpackages="inetutils-dnsdomainname inetutils-ftp inetutils-hostname
  inetutils-ifconfig inetutils-inetd inetutils-ping inetutils-rexec
@@ -19,6 +20,9 @@ subpackages="inetutils-dnsdomainname inetutils-ftp inetutils-hostname
 
 CFLAGS="-fcommon"
 
+# tests can't run in CI
+make_check=extended
+
 case "$XBPS_TARGET_MACHINE" in
 *-musl)
 	# Some packages don't build on musl, so explicitly disable them

From 47b4524b24dfc639f4cc267209d83a95e70b97be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 13 Apr 2021 22:46:19 +0200
Subject: [PATCH 1283/2024] xbps-src: update-check: print out match pattern in
 verbose mode

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

diff --git a/common/xbps-src/shutils/update_check.sh b/common/xbps-src/shutils/update_check.sh
index 3cbbfe95c2ac..2ef29e78f299 100644
--- a/common/xbps-src/shutils/update_check.sh
+++ b/common/xbps-src/shutils/update_check.sh
@@ -82,7 +82,7 @@ update_check() {
         if [ "$rx" ]; then
             # substitute url if needed
             if [ -n "$XBPS_UPDATE_CHECK_VERBOSE" ]; then
-                echo "(folder) fetching $urlpfx" 1>&2
+                echo "(folder) fetching $urlpfx and scanning with $rx" 1>&2
             fi
             skipdirs=
             curl -A "xbps-src-update-check/$XBPS_SRC_VERSION" --max-time 10 -Lsk "$urlpfx" |
@@ -169,7 +169,7 @@ update_check() {
         fi
 
         if [ -n "$XBPS_UPDATE_CHECK_VERBOSE" ]; then
-            echo "fetching $url" 1>&2
+            echo "fetching $url and scanning with $rx" 1>&2
         fi
         curl -H 'Accept: text/html,application/xhtml+xml,application/xml,text/plain,application/rss+xml' -A "xbps-src-update-check/$XBPS_SRC_VERSION" --max-time 10 -Lsk "$url" |
             grep -Po -i "$rx"

From 572143602d5ab0cd63d4b78986dffa8a43265cfd Mon Sep 17 00:00:00 2001
From: Thomas Vigouroux <tomvig38@gmail.com>
Date: Sat, 17 Apr 2021 10:28:12 +0200
Subject: [PATCH 1284/2024] github-cli: update to version 1.9.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 38b4af7a95dd..4367b10b5733 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.9.0
+version=1.9.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=662654baa32550527b97faf38c34254bafe9b7889dc65451cbec3d6dacee2a06
+checksum=5fd35b156a0528ad4e8b68c7058fccf340cca08b0cabd36d872ab855476fb02e
 
 pre_build() {
 	local _date

From 294856a285c345d16af0d77a1ce9271f2e6b1946 Mon Sep 17 00:00:00 2001
From: DirectorX <DirectorX@users.noreply.github.com>
Date: Sat, 17 Apr 2021 21:52:25 +0300
Subject: [PATCH 1285/2024] hopper: update to 4.7.4.

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

diff --git a/srcpkgs/hopper/template b/srcpkgs/hopper/template
index 65aab3cee604..66e3722fec34 100644
--- a/srcpkgs/hopper/template
+++ b/srcpkgs/hopper/template
@@ -1,6 +1,6 @@
 # Template file for 'hopper'
 pkgname=hopper
-version=4.7.3
+version=4.7.4
 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=141aa160e37e39c4bab244589999f7e977dffc241a1a5c21b8868079485bcbe8
+checksum=8f44fd525b24a8e722974afdd51f9c976ce3078361907358c5c74cebca965c08
 
 archs="x86_64"
 restricted=yes

From de7b258465ff65972ab32e43c2039dce385f7d36 Mon Sep 17 00:00:00 2001
From: shtayerc <david.murko@mailbox.org>
Date: Sat, 17 Apr 2021 09:01:49 +0200
Subject: [PATCH 1286/2024] bitwise: update to 0.42

---
 .../bitwise/patches/tests-use-bcunit.patch    | 24 +++++++++++++++++++
 srcpkgs/bitwise/template                      |  5 ++--
 2 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/bitwise/patches/tests-use-bcunit.patch

diff --git a/srcpkgs/bitwise/patches/tests-use-bcunit.patch b/srcpkgs/bitwise/patches/tests-use-bcunit.patch
new file mode 100644
index 000000000000..154d098e7d6e
--- /dev/null
+++ b/srcpkgs/bitwise/patches/tests-use-bcunit.patch
@@ -0,0 +1,24 @@
+diff '--color=auto' -ruN bitwise-v0.42/Makefile.in bitwise-v0.42_new/Makefile.in
+--- Makefile.in	2021-04-16 17:21:30.000000000 +0200
++++ Makefile.in	2021-04-17 09:36:46.661320033 +0200
+@@ -518,7 +518,7 @@
+ 								   src/misc.c \
+                                    tests/test-shunting-yard.c
+ 
+-tests_test_shunting_yard_LDADD = -lcunit
++tests_test_shunting_yard_LDADD = -lbcunit
+ TESTS = $(check_PROGRAMS)
+ all: all-am
+ 
+diff '--color=auto' -ruN bitwise-v0.42/tests/test-shunting-yard.c bitwise-v0.42_new/tests/test-shunting-yard.c
+--- tests/test-shunting-yard.c	2021-04-16 17:17:19.000000000 +0200
++++ tests/test-shunting-yard.c	2021-04-17 09:36:46.660320033 +0200
+@@ -7,7 +7,7 @@
+ 
+ #include "../inc/shunting-yard.h"
+ 
+-#include <CUnit/Basic.h>
++#include <BCUnit/Basic.h>
+ #include <stdlib.h>
+ 
+ #define ASSERT_RESULT(expression, expected) \
diff --git a/srcpkgs/bitwise/template b/srcpkgs/bitwise/template
index e1a3765d41b0..16b8b2a23fe4 100644
--- a/srcpkgs/bitwise/template
+++ b/srcpkgs/bitwise/template
@@ -1,13 +1,14 @@
 # Template file for 'bitwise'
 pkgname=bitwise
-version=0.41
+version=0.42
 revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 makedepends="ncurses-devel readline-devel"
+checkdepends="bcunit-devel"
 short_desc="Terminal based bit manipulator in ncurses"
 maintainer="shtayerc <david.murko@mailbox.org>"
 license="GPL-3.0-only"
 homepage="https://github.com/mellowcandle/bitwise"
 distfiles="${homepage}/releases/download/v${version}/bitwise-v${version}.tar.gz"
-checksum=33ce934fb99dadf7652224152cc135a0abf6a211adde53d96e9be7067567749c
+checksum=d3d43cef47bf8f49e85f7ed381c3eaf1df921ca51805e0962f1a97a517e1d1d2

From f787c5a965ba862ec9cffb2bcd92bb73b6de0527 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 17 Apr 2021 19:29:51 +0300
Subject: [PATCH 1287/2024] sbc: update to 1.5.

---
 .../sbc/patches/fix-build-on-non-x86.patch    | 43 +++++++++++++++++++
 srcpkgs/sbc/template                          |  5 ++-
 2 files changed, 46 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/sbc/patches/fix-build-on-non-x86.patch

diff --git a/srcpkgs/sbc/patches/fix-build-on-non-x86.patch b/srcpkgs/sbc/patches/fix-build-on-non-x86.patch
new file mode 100644
index 000000000000..87b545078118
--- /dev/null
+++ b/srcpkgs/sbc/patches/fix-build-on-non-x86.patch
@@ -0,0 +1,43 @@
+From 909a9bdf7ab143e1f0baaf9736baebd3cd79aacf Mon Sep 17 00:00:00 2001
+From: Marius Bakke <marius@gnu.org>
+Date: Tue, 22 Dec 2020 11:04:26 +0000
+Subject: sbc_primitives: Fix build on non-x86.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Don't call __builtin_cpu_init unless targeting i386 or x86_64.
+Otherwise we get an error at link time:
+
+  CC       sbc/sbc_primitives.lo
+sbc/sbc_primitives.c: In function ‘sbc_init_primitives_x86’:
+sbc/sbc_primitives.c:596:2: warning: implicit declaration of function ‘__builtin_cpu_init’; did you mean ‘__builtin_irint’? [-Wimplicit-function-declaration]
+[...]
+  CCLD     src/sbcdec
+ld: sbc/.libs/libsbc-private.a(sbc_primitives.o): in function `sbc_init_primitives':
+sbc_primitives.c:(.text+0x3a30): undefined reference to `__builtin_cpu_init'
+---
+ sbc/sbc_primitives.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/sbc/sbc_primitives.c b/sbc/sbc_primitives.c
+index 97a75be..09c214a 100644
+--- a/sbc/sbc_primitives.c
++++ b/sbc/sbc_primitives.c
+@@ -593,6 +593,7 @@ static int sbc_calc_scalefactors_j(
+ 
+ static void sbc_init_primitives_x86(struct sbc_encoder_state *state)
+ {
++#if defined(__x86_64__) || defined(__i386__)
+ 	__builtin_cpu_init();
+ 
+ #ifdef SBC_BUILD_WITH_MMX_SUPPORT
+@@ -604,6 +605,7 @@ static void sbc_init_primitives_x86(struct sbc_encoder_state *state)
+ 	if (__builtin_cpu_supports("sse4.2"))
+ 		sbc_init_primitives_sse(state);
+ #endif
++#endif
+ }
+ 
+ /*
+-- 
diff --git a/srcpkgs/sbc/template b/srcpkgs/sbc/template
index 9a94af746ef9..7645ce469d68 100644
--- a/srcpkgs/sbc/template
+++ b/srcpkgs/sbc/template
@@ -1,6 +1,6 @@
 # Template file for 'sbc'
 pkgname=sbc
-version=1.4
+version=1.5
 revision=1
 build_style=gnu-configure
 configure_args="--enable-pie --disable-static"
@@ -11,7 +11,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://www.bluez.org/"
 distfiles="${KERNEL_SITE}/bluetooth/${pkgname}-${version}.tar.xz"
-checksum=518bf46e6bb3dc808a95e1eabad26fdebe8a099c1e781c27ed7fca6c2f4a54c9
+checksum=0cbad69823a99e8421fe0700e8cf9eeb8fa0c1ad28e8dbc2182b3353507931d2
+patch_args="-Np1"
 
 sbc-devel_package() {
 	depends="sbc>=${version}_${revision}"

From aae50b065807d650cf5d7cd033865696f82ccdac Mon Sep 17 00:00:00 2001
From: Gerardo Di iorio <arete74@gmail.com>
Date: Sat, 17 Apr 2021 12:25:56 +0200
Subject: [PATCH 1288/2024] minio: update to 2021.04.06.

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

diff --git a/srcpkgs/minio/template b/srcpkgs/minio/template
index 73da4693e43c..58d745f326b1 100644
--- a/srcpkgs/minio/template
+++ b/srcpkgs/minio/template
@@ -1,8 +1,8 @@
 # Template file for 'minio'
 pkgname=minio
-version=2021.03.17
+version=2021.04.06
 revision=1
-_version="${version//./-}T02-33-02Z"
+_version="${version//./-}T23-11-00Z"
 wrksrc=${pkgname}-RELEASE.${_version}
 build_style=go
 go_import_path="github.com/minio/minio"
@@ -13,7 +13,7 @@ maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/minio/minio"
 distfiles="${homepage}/archive/RELEASE.${_version}.tar.gz"
-checksum=e94b099fc84699aa68f0cfecde34f1da848be43023cae5d687729fb1de96b1fe
+checksum=c5c7828eaf15e89c2347afa200d01e22e74a2087f425ecfa656e1d06d5bc29b4
 system_accounts="_minio"
 _minio_homedir="/var/lib/minio"
 _minio_descr="Minio Daemon User"

From 700ce9eae797730252ea54844ab0ebe8e7ac21b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 14 Apr 2021 15:52:57 -0300
Subject: [PATCH 1289/2024] linux5.11: move System.map to -dbg package.

Fedora makes it 600 in the main package, Debian has moved it to their
-dbg package. Since it can help break KASLR on arbitrary attacks and
isn't really useful most of the time, confine to -dbg package.
---
 srcpkgs/linux5.11/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/linux5.11/template b/srcpkgs/linux5.11/template
index d4e86720cad7..eba194f35eab 100644
--- a/srcpkgs/linux5.11/template
+++ b/srcpkgs/linux5.11/template
@@ -325,5 +325,6 @@ linux5.11-dbg_package() {
 	short_desc+=" - debugging symbols"
 	pkg_install() {
 		vmove usr/lib/debug
+		vmove "boot/System.map-${_kernver}"
 	}
 }

From 5707963836d73170d885899766e25396cd36623e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 14 Apr 2021 15:57:53 -0300
Subject: [PATCH 1290/2024] linux4.14: move System.map to -dbg package.

---
 srcpkgs/linux4.14/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/linux4.14/template b/srcpkgs/linux4.14/template
index 974c394bb285..be7732d07bc3 100644
--- a/srcpkgs/linux4.14/template
+++ b/srcpkgs/linux4.14/template
@@ -320,5 +320,6 @@ linux4.14-dbg_package() {
 	short_desc+=" - debugging symbols"
 	pkg_install() {
 		vmove usr/lib/debug
+		vmove "boot/System.map-${_kernver}"
 	}
 }

From cdca0405cf8cc6c755babbd04fe00fa9c2b3916e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 14 Apr 2021 15:57:54 -0300
Subject: [PATCH 1291/2024] linux4.19: move System.map to -dbg package.

---
 srcpkgs/linux4.19/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index 5272ae8a3377..ab02053dcd66 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -327,5 +327,6 @@ linux4.19-dbg_package() {
 	short_desc+=" - debugging symbols"
 	pkg_install() {
 		vmove usr/lib/debug
+		vmove "boot/System.map-${_kernver}"
 	}
 }

From 5b3427f9bce6be87db199f8d08dcf4defc9a5991 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 14 Apr 2021 15:57:54 -0300
Subject: [PATCH 1292/2024] linux4.4: move System.map to -dbg package.

---
 srcpkgs/linux4.4/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/linux4.4/template b/srcpkgs/linux4.4/template
index 83bfcc974680..db6cf3d38e5f 100644
--- a/srcpkgs/linux4.4/template
+++ b/srcpkgs/linux4.4/template
@@ -311,5 +311,6 @@ linux4.4-dbg_package() {
 	short_desc+=" - debugging symbols"
 	pkg_install() {
 		vmove usr/lib/debug
+		vmove "boot/System.map-${_kernver}"
 	}
 }

From 0075e610182f3331b7502698165747626e90c000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 14 Apr 2021 15:57:55 -0300
Subject: [PATCH 1293/2024] linux5.10: move System.map to -dbg package.

---
 srcpkgs/linux5.10/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index c9f1f97634c7..b6ff312d238c 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -335,5 +335,6 @@ linux5.10-dbg_package() {
 	short_desc+=" - debugging symbols"
 	pkg_install() {
 		vmove usr/lib/debug
+		vmove "boot/System.map-${_kernver}"
 	}
 }

From decde06aae4caa0d875fb1a078e5a5b2f43d0953 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 14 Apr 2021 15:57:56 -0300
Subject: [PATCH 1294/2024] linux5.4: move System.map to -dbg package.

---
 srcpkgs/linux5.4/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 9dca04dca109..7393717ae68f 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -335,5 +335,6 @@ linux5.4-dbg_package() {
 	short_desc+=" - debugging symbols"
 	pkg_install() {
 		vmove usr/lib/debug
+		vmove "boot/System.map-${_kernver}"
 	}
 }

From a8ed29d62ec6ad1b721d461d97d2df681c763407 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 14 Apr 2021 15:58:42 -0300
Subject: [PATCH 1295/2024] linux4.9: move System.map to -dbg package.

---
 srcpkgs/linux4.9/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/linux4.9/template b/srcpkgs/linux4.9/template
index b26655e58fb0..553f87b04f6a 100644
--- a/srcpkgs/linux4.9/template
+++ b/srcpkgs/linux4.9/template
@@ -309,5 +309,6 @@ linux4.9-dbg_package() {
 	short_desc+=" - debugging symbols"
 	pkg_install() {
 		vmove usr/lib/debug
+		vmove "boot/System.map-${_kernver}"
 	}
 }

From 842daa2f5afb73df2e0809154939013e72c17202 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sat, 17 Apr 2021 04:11:49 -0300
Subject: [PATCH 1296/2024] linux5.11: update to 5.11.15.

---
 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 eba194f35eab..763098e49578 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.14
+version=5.11.15
 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
- f4bc3454b5068ac94e5c42bea7e6f37641ec1cea0ff8c438be6bf1317afe32ed"
+ c6e3d81d5c3e70a2fcc2dd2e622761d3b12b36fdc7d168d47831ac215eed142b"
 skip_extraction="patch-${version}.xz"
 python_version=3
 patch_args="-Np1"

From 340bb7dadefc2206a56865d37cd45e0ba5c71ed5 Mon Sep 17 00:00:00 2001
From: Imran Khan <imrankhan@teknik.io>
Date: Mon, 12 Apr 2021 21:42:11 +0600
Subject: [PATCH 1297/2024] txr: update to 256.

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

diff --git a/srcpkgs/txr/template b/srcpkgs/txr/template
index a05cb92f7fc1..bcbe6d85b0d7 100644
--- a/srcpkgs/txr/template
+++ b/srcpkgs/txr/template
@@ -1,6 +1,6 @@
 # Template file for 'txr'
 pkgname=txr
-version=248
+version=256
 revision=1
 archs="x86_64* i686* aarch64* arm* ppc64* mips*"
 build_style=configure
@@ -11,9 +11,9 @@ short_desc="Programming language for convenient data munging"
 maintainer="Oliver Kiddle <okiddle@yahoo.co.uk>"
 license="BSD-2-Clause"
 homepage="http://www.nongnu.org/txr/"
-changelog="http://www.kylheku.com/cgit/txr/tree/RELNOTES?id=${pkgname}-${version}"
+changelog="http://www.kylheku.com/cgit/txr/tree/RELNOTES"
 distfiles="http://www.kylheku.com/cgit/txr/snapshot/${pkgname}-${version}.tar.bz2"
-checksum=58d04f9112b966f0b32e5ddf198622c97b4caaf990db23b5980eae7b44e3415e
+checksum=58e3e19bb7f3f9a440761f046fdacbc4d619b11c494a4ed9f8ad25c7a2974ddc
 nopie=yes
 
 if [ "$CROSS_BUILD" ]; then
@@ -26,11 +26,6 @@ pre_configure() {
 	fi
 }
 
-post_configure() {
-	vsed -i config.make -e "\#^PLATFORM_CFLAGS#s#:=.*\$#:= ${CFLAGS}#"
-	vsed -i config.make -e "\#^PLATFORM_LDFLAGS#s#:=.*\$#:= ${LDFLAGS}#"
-}
-
 post_install() {
 	vlicense LICENSE
 	vmkdir usr/share/vim/vimfiles/syntax

From df6acf5d51eda89f2be9d70e36b5ffdae15cbfdf Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Sun, 21 Mar 2021 23:49:20 +0100
Subject: [PATCH 1298/2024] xorg-server: split -common and -xwayland

---
 srcpkgs/xorg-server-common   |  1 +
 srcpkgs/xorg-server/template | 28 ++++++++++++++--------------
 2 files changed, 15 insertions(+), 14 deletions(-)
 create mode 120000 srcpkgs/xorg-server-common

diff --git a/srcpkgs/xorg-server-common b/srcpkgs/xorg-server-common
new file mode 120000
index 000000000000..0e680f217e7c
--- /dev/null
+++ b/srcpkgs/xorg-server-common
@@ -0,0 +1 @@
+xorg-server
\ No newline at end of file
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 7832f45ff7e6..852c3ab2f573 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,7 +1,7 @@
 # Template file for 'xorg-server'
 pkgname=xorg-server
 version=1.20.11
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
  -Dxvfb=true -Dhal=false -Dudev=true -Dxkb_dir=/usr/share/X11/xkb
@@ -9,16 +9,16 @@ configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
  -Ddmx=true -Dlinux_acpi=true -Dlinux_apm=false -Dsuid_wrapper=true
  -Dxcsecurity=true -Dsystemd_logind=$(vopt_if elogind true false)
  -Dos_vendor=Void -Dglamor=true -Ddri2=true -Ddri3=true -Dglx=true
- -Dxwayland=true"
-hostmakedepends="pkg-config wayland-devel xkbcomp flex"
+ -Dxwayland=false"
+hostmakedepends="pkg-config xkbcomp flex"
 makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel
  libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel
  libdmx-devel libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel
- libxkbui-devel pixman-devel wayland-devel wayland-protocols
- xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel
- xcb-util-wm-devel xkbcomp nettle-devel $(vopt_if elogind 'dbus-devel')"
+ libxkbui-devel pixman-devel xcb-util-image-devel xcb-util-keysyms-devel
+ xcb-util-renderutil-devel xcb-util-wm-devel xkbcomp nettle-devel
+ $(vopt_if elogind 'dbus-devel')"
 # See hw/xfree86/common/xf86Module.h. Only care for the major version.
-depends="xkeyboard-config $(vopt_if elogind 'elogind')"
+depends="xkeyboard-config $(vopt_if elogind 'elogind') xorg-server-common"
 checkdepends="xkeyboard-config"
 short_desc="X11 server from X.org"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -77,13 +77,6 @@ xorg-server-xdmx_package() {
 	}
 }
 
-xorg-server-xwayland_package() {
-	short_desc="Nested X server that runs as a wayland client"
-	pkg_install() {
-		vmove usr/bin/Xwayland
-	}
-}
-
 xorg-server-xnest_package() {
 	short_desc="Nested X server that runs as an X application"
 	pkg_install() {
@@ -109,6 +102,13 @@ xorg-server-xvfb_package() {
 	}
 }
 
+xorg-server-common_package() {
+	short_desc+="- common files"
+	pkg_install() {
+		vmove usr/lib/xorg/protocol.txt
+	}
+}
+
 xorg-server-devel_package() {
 	depends="${makedepends}"
 	short_desc+=" - development files"

From 62b7e2d01e0705c240463ccfd83c5189f88350ff Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Sun, 21 Mar 2021 23:55:58 +0100
Subject: [PATCH 1299/2024] New package: xorg-server-xwayland-21.1.1

---
 srcpkgs/xorg-server-xwayland          |  1 -
 srcpkgs/xorg-server-xwayland/template | 27 +++++++++++++++++++++++++++
 srcpkgs/xorg-server-xwayland/update   |  1 +
 3 files changed, 28 insertions(+), 1 deletion(-)
 delete mode 120000 srcpkgs/xorg-server-xwayland
 create mode 100644 srcpkgs/xorg-server-xwayland/template
 create mode 100644 srcpkgs/xorg-server-xwayland/update

diff --git a/srcpkgs/xorg-server-xwayland b/srcpkgs/xorg-server-xwayland
deleted file mode 120000
index 0e680f217e7c..000000000000
--- a/srcpkgs/xorg-server-xwayland
+++ /dev/null
@@ -1 +0,0 @@
-xorg-server
\ No newline at end of file
diff --git a/srcpkgs/xorg-server-xwayland/template b/srcpkgs/xorg-server-xwayland/template
new file mode 100644
index 000000000000..2bc4ff38b1c6
--- /dev/null
+++ b/srcpkgs/xorg-server-xwayland/template
@@ -0,0 +1,27 @@
+# Template file for 'xorg-server-xwayland'
+pkgname=xorg-server-xwayland
+version=21.1.1
+revision=1
+wrksrc="xserver-xwayland-$version"
+build_style=meson
+configure_args="-Dipv6=true -Dxvfb=false -Dxdmcp=false -Dxcsecurity=true
+ -Ddri3=true -Dxwayland_eglstream=false -Dglamor=true -Dxkb_dir=/usr/share/X11/xkb
+ -Dxkb_output_dir=/var/lib/xkb"
+hostmakedepends="pkg-config wayland-devel"
+makedepends="nettle-devel libepoxy-devel font-util libXfont2-devel pixman-devel
+ libxkbfile-devel dbus-devel wayland-devel wayland-protocols libtirpc-devel
+ MesaLib-devel libxcb-devel"
+depends="xorg-server-common"
+short_desc="Nested X server that runs as a wayland client"
+maintainer="Paper <paper@tilde.institute>"
+license="MIT"
+homepage="https://xorg.freedesktop.org"
+distfiles="https://gitlab.freedesktop.org/xorg/xserver/-/archive/xwayland-$version/xserver-xwayland-$version.tar.gz"
+checksum=f93c8a92d1f8eabde40713c7af01200a9040b3b73eafba54589732dac0a937fe
+
+post_install() {
+	# protocol.txt is provided by xorg-server-common
+	rm ${DESTDIR}/usr/lib/xorg/protocol.txt
+	rm ${DESTDIR}/usr/share/man/man1/Xserver.1
+	vlicense COPYING
+}
diff --git a/srcpkgs/xorg-server-xwayland/update b/srcpkgs/xorg-server-xwayland/update
new file mode 100644
index 000000000000..960c2c0b2633
--- /dev/null
+++ b/srcpkgs/xorg-server-xwayland/update
@@ -0,0 +1 @@
+pkgname=xserver-xwayland

From 9b2bb6cc23159281655227515b2cede0349cd8ce Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 7 Mar 2021 00:47:22 +0100
Subject: [PATCH 1300/2024] New package: jalv-1.6.6

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

diff --git a/srcpkgs/jalv/template b/srcpkgs/jalv/template
new file mode 100644
index 000000000000..bf2ac74c0271
--- /dev/null
+++ b/srcpkgs/jalv/template
@@ -0,0 +1,26 @@
+# Template file for 'jalv'
+pkgname=jalv
+version=1.6.6
+revision=1
+build_style=waf3
+configure_args="$(vopt_if portaudio '--portaudio') --no-gtkmm --no-gtk2
+ $(vopt_if gtk3 '' '--no-gtk3') $(vopt_if qt '' '--no-qt5')"
+hostmakedepends="pkg-config $(vopt_if qt qt5-host-tools)"
+makedepends="lv2 lilv-devel suil-devel serd-devel sord-devel sratom-devel
+ $(vopt_if portaudio portaudio-devel jack-devel) $(vopt_if gtk3 gtk+3-devel)
+ $(vopt_if qt qt5-devel)"
+short_desc="LV2 host for JACK"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="ISC"
+homepage="https://drobilla.net/software/jalv"
+distfiles="http://download.drobilla.net/jalv-${version}.tar.bz2"
+checksum=92d141781b664373207c343cebc5e9b8ced461faf26fdccb95df0007b0639e16
+
+build_options="portaudio gtk3 qt"
+build_options_default="gtk3 qt"
+desc_option_portaudio="Use PortAudio backend instead of JACK"
+
+post_install() {
+	vlicense COPYING
+	rm -f ${DESTDIR}/usr/share/man/man1/jalv.gtkmm.1
+}

From a02435c0c4ede43b519226465df3727d9fadef82 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sun, 11 Apr 2021 13:18:27 -0700
Subject: [PATCH 1301/2024] New package: srb2-2.2.8

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

diff --git a/srcpkgs/srb2/template b/srcpkgs/srb2/template
new file mode 100644
index 000000000000..5b136b6d4b97
--- /dev/null
+++ b/srcpkgs/srb2/template
@@ -0,0 +1,46 @@
+# Template file for 'srb2'
+pkgname=srb2
+version=2.2.8
+revision=1
+create_wrksrc=true
+build_wrksrc="SRB2-SRB2_release_${version}"
+build_style=gnu-makefile
+make_use_env=yes
+make_build_args=" -C src LINUX=1 USE_OPENMP=1 EXENAME=${pkgname}
+ DBGNAME=${pkgname}-debug NOOBJDUMP=1 NOUPX=1"
+hostmakedepends="pkg-config gettext"
+makedepends="SDL2-devel SDL2_mixer-devel libpng-devel libupnp-devel libcurl-devel libgme-devel libopenmpt-devel"
+short_desc="3D Sonic fan game based off of Doom Legacy"
+maintainer="oreo639 <oreo6391@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://srb2.org/"
+distfiles="https://github.com/STJr/SRB2/archive/SRB2_release_${version}.tar.gz
+ https://github.com/STJr/SRB2/releases/download/SRB2_release_${version}/SRB2-v${version}-Full.zip"
+checksum="bbb2777a05a16019d8b4a3fcef9829e6e7cfd795710b3ffcce009120f0e2c43c
+ 7a3805b1127bd42db6432a9fe3e25927269e334497d48bdc9c2751edc114d718"
+restricted=yes
+
+case "$XBPS_TARGET_MACHINE" in
+	i686*) makedepends+=" nasm" ;;
+	x86_64*) make_build_args+=" X86_64=1 NONX86=1" ;;
+	*) make_build_args+=" NONX86=1" ;;
+esac
+
+if [ -n "$CROSS_BUILD" ]; then
+	make_build_args+=" OBJCOPY=${XBPS_CROSS_TRIPLET}-objcopy"
+fi
+
+do_install() {
+	vbin bin/Linux/Release/${pkgname}
+
+	PROGRAM_NAME="${pkgname}" PROGRAM_DESCRIPTION="${short_desc}" \
+		PACKAGE_INSTALL_PATH="/usr/bin" PROGRAM_FILENAME="${pkgname}" \
+		envsubst < debian-template/srb2.desktop > srb2.desktop
+
+	vinstall srb2.png 644 /usr/share/pixmaps/
+	vinstall srb2.desktop 644 /usr/share/applications/
+	vmkdir /usr/share/games/SRB2
+	for f in {music,player}.dta {srb2,zones,patch,patch_music}.pk3 models models.dat; do
+		vcopy ../${f} /usr/share/games/SRB2
+	done
+}

From 6a13afe8a8a9e050d1f69a0c8b0968fddf4b16a0 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, 17 Apr 2021 19:22:54 +0700
Subject: [PATCH 1302/2024] cmake-bootstrap: update to 3.20.1.

---
 srcpkgs/cmake-bootstrap/template      |  8 ++----
 srcpkgs/cmake/patches/test-none.patch | 41 +++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/cmake/patches/test-none.patch

diff --git a/srcpkgs/cmake-bootstrap/template b/srcpkgs/cmake-bootstrap/template
index 8b1c0b5aded8..2e01b8bd1e85 100644
--- a/srcpkgs/cmake-bootstrap/template
+++ b/srcpkgs/cmake-bootstrap/template
@@ -1,8 +1,7 @@
 # Template file for 'cmake-bootstrap'
 pkgname=cmake-bootstrap
-reverts="3.20.0_1"
-version=3.19.7
-revision=2
+version=3.20.1
+revision=1
 wrksrc=cmake-$version
 bootstrap=yes
 build_style=configure
@@ -17,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=3f1808b9b00281df06c91dd7a021d7f52f724101000da7985a401678dfe035b0
 conflicts="cmake>=0"
 
 CFLAGS="-DCMAKE_USE_SYSTEM_ZLIB -DCMAKE_USE_SYSTEM_LIBARCHIVE"
@@ -37,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
diff --git a/srcpkgs/cmake/patches/test-none.patch b/srcpkgs/cmake/patches/test-none.patch
new file mode 100644
index 000000000000..3a5540551525
--- /dev/null
+++ b/srcpkgs/cmake/patches/test-none.patch
@@ -0,0 +1,41 @@
+From ce1cadd35a26bd44879675581d8e70b00ff8e0fc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
+ <congdanhqx@gmail.com>
+Date: Thu, 1 Apr 2021 20:14:06 +0700
+Subject: [PATCH] Tests/ConfigSources: fix for non main stream CMAKE_BUILD_TYPE
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+- None is a valid CMAKE_BUILD_TYPE
+- Most of distros uses None as CMAKE_BUILD_TYPE
+- When CMAKE_BUILD_TYPE=None, main_other.cpp will be compiled and linked
+  into final executable, this program requires some symbols only exist
+  when CUSTOM_CFG_OTHER is defined.
+- And CMake also allows other CMAKE_BUILD_TYPE, too, CMake documentation
+  specificaly mentions funny CMAKE_BUILD_TYPE like ReLeAsE [1]
+
+Let's define them when non main stream like None is specified as CMAKE_BUILD_TYPE.
+
+[1]: https://cmake.org/cmake/help/v3.20/variable/CMAKE_BUILD_TYPE.html
+---
+ Tests/ConfigSources/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git Tests/ConfigSources/CMakeLists.txt Tests/ConfigSources/CMakeLists.txt
+index a3d98f685f..f83759ca10 100644
+--- Tests/ConfigSources/CMakeLists.txt
++++ Tests/ConfigSources/CMakeLists.txt
+@@ -74,10 +74,10 @@ add_custom_command(APPEND
+   VERBATIM
+   )
+ foreach(n RANGE 1 5)
+-  set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG)
+-  foreach(other Release RelWithDebInfo MinSizeRel)
++  foreach(other ${CMAKE_BUILD_TYPE} Release RelWithDebInfo MinSizeRel)
+     set_property(SOURCE custom${n}_${other}.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_OTHER)
+   endforeach()
++  set_property(SOURCE custom${n}_Debug.cpp PROPERTY COMPILE_DEFINITIONS CUSTOM_CFG_DEBUG)
+ endforeach()
+ add_library(Custom STATIC
+   custom1_$<CONFIG>.cpp

From 5e4ed5b2df1f36bc5d26a21331ede943e133f6ee 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, 17 Apr 2021 19:23:38 +0700
Subject: [PATCH 1303/2024] cmake: update to 3.20.1.

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

diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index b3d3d4c5159d..deea77e9d2b1 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -1,10 +1,9 @@
 # Template file for 'cmake'
 pkgname=cmake
-reverts="3.20.0_1"
-version=3.19.7
-revision=2
+version=3.20.1
+revision=1
 build_style=cmake
-configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake -DCMAKE_BUILD_TYPE=None
+configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake
  -DCMAKE_USE_SYSTEM_LIBRARIES=ON -DKWSYS_LFS_WORKS=1"
 make_check_target=test
 make_cmd=make
@@ -17,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=3f1808b9b00281df06c91dd7a021d7f52f724101000da7985a401678dfe035b0
 
 export CMAKE_GENERATOR="Unix Makefiles"
 

From 37bd4bac58dbdd7646e86f420e82262c29bd7e16 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, 17 Apr 2021 19:23:42 +0700
Subject: [PATCH 1304/2024] cmake-gui: update to 3.20.1.

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

diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template
index 19b2def02d63..a836709984d0 100644
--- a/srcpkgs/cmake-gui/template
+++ b/srcpkgs/cmake-gui/template
@@ -1,11 +1,10 @@
 # Template file for 'cmake-gui'
 pkgname=cmake-gui
-reverts="3.20.0_1"
-version=3.19.7
-revision=2
+version=3.20.1
+revision=1
 wrksrc="cmake-${version}"
 build_style=cmake
-configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake -DCMAKE_BUILD_TYPE=None
+configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake
  -DBUILD_QtDialog=ON -DCMAKE_USE_SYSTEM_LIBRARIES=ON -DKWSYS_LFS_WORKS=1
  -DCMake_GUI_DISTRIBUTE_WITH_Qt_LGPL=3"
 hostmakedepends="qt5-devel"
@@ -18,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=3f1808b9b00281df06c91dd7a021d7f52f724101000da7985a401678dfe035b0
 
 # XXX: cmake is broken if cmake was built with -GNinja
 # https://bugs.gentoo.org/596460

From 208630e7424ab67f229aa3c1a27317ae535a00b5 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, 5 Apr 2021 22:02:14 +0700
Subject: [PATCH 1305/2024] sip: update to 6.0.3.

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

diff --git a/srcpkgs/sip/template b/srcpkgs/sip/template
index fb967013d774..1227e754298f 100644
--- a/srcpkgs/sip/template
+++ b/srcpkgs/sip/template
@@ -1,6 +1,6 @@
 # Template file for 'sip'
 pkgname=sip
-version=6.0.2
+version=6.0.3
 revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools python3-packaging python3-toml"
@@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only, GPL-3.0-only, custom:SIP"
 homepage="https://riverbankcomputing.com/software/sip/intro"
 distfiles="${PYPI_SITE}/s/sip/sip-${version}.tar.gz"
-checksum=38633bfaa479b1dd35df8f414ffc5c5a342f174ca0c6a21d0e8eb359e33c35b9
+checksum=929e3515428ea962003ccf6795244a5fe4fa6e2c94dc9ab8cb2c58fcd368c34c
 lib32disabled=yes
 replaces="sip5<=${version}_${revision}"
 provides="sip5-${version}_${revision}"

From 64fe0c53f396ee9ba5515b94b3ba5e7f0b8773fb 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, 5 Apr 2021 21:59:12 +0700
Subject: [PATCH 1306/2024] python3-PyQt-builder: update to 1.9.1.

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

diff --git a/srcpkgs/python3-PyQt-builder/template b/srcpkgs/python3-PyQt-builder/template
index db81ee997165..befe99aae73a 100644
--- a/srcpkgs/python3-PyQt-builder/template
+++ b/srcpkgs/python3-PyQt-builder/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-PyQt-builder'
 pkgname=python3-PyQt-builder
-version=1.9.0
+version=1.9.1
 revision=1
 wrksrc=PyQt-builder-$version
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only, GPL-3.0-only, custom:SIP"
 homepage="https://www.riverbankcomputing.com/software/pyqt/"
 distfiles="$PYPI_SITE/P/PyQt-builder/PyQt-builder-$version.tar.gz"
-checksum=54520b4d40d6e6d1307f9cebab4730ae78e01873c88866aa1e5192c24801005a
+checksum=8d669fe8fa434a3e47abde3b40d924d91932e8e19d88b20c778a3e1c77621ebc
 
 post_install() {
 	rm -rf $DESTDIR/$py3_sitelib/pyqtbuild/bundle

From c55e7ab698e0ad350dc7bbfc9d25ae2d6bf61149 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, 5 Apr 2021 22:22:06 +0700
Subject: [PATCH 1307/2024] python3-PyQt5: update to 5.15.4.

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

diff --git a/srcpkgs/python3-PyQt5/template b/srcpkgs/python3-PyQt5/template
index a702bcaa6b2a..a704d41698bc 100644
--- a/srcpkgs/python3-PyQt5/template
+++ b/srcpkgs/python3-PyQt5/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-PyQt5'
 pkgname=python3-PyQt5
-version=5.15.3
+version=5.15.4
 revision=1
 _sipver=12.8.0
 wrksrc="PyQt5-${version}"
@@ -19,7 +19,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-3.0-only"
 homepage="https://riverbankcomputing.com/software/pyqt/intro"
 distfiles="${PYPI_SITE}/P/PyQt5/PyQt5-${version}.tar.gz"
-checksum=965ba50e7029b37f218a54ace24e87c77db3e5a9f0b83baeb21fb57b4154b838
+checksum=2a69597e0dd11caabe75fae133feca66387819fc9bc050f547e5551bce97e5be
 lib32disabled=yes
 CFLAGS=-I$XBPS_CROSS_BASE/usr/include/python$py3_ver
 CXXFLAGS="$CFLAGS"

From 901c02679c64ffa708ef6ecb297c5ea36c2055b3 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, 5 Apr 2021 21:59:56 +0700
Subject: [PATCH 1308/2024] python3-PyQt5-webengine: update to 5.15.4.

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

diff --git a/srcpkgs/python3-PyQt5-webengine/template b/srcpkgs/python3-PyQt5-webengine/template
index aed879a2dbad..2db65a201307 100644
--- a/srcpkgs/python3-PyQt5-webengine/template
+++ b/srcpkgs/python3-PyQt5-webengine/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-PyQt5-webengine'
 pkgname=python3-PyQt5-webengine
-version=5.15.3
+version=5.15.4
 revision=1
 wrksrc="PyQtWebEngine-${version}"
 build_helper="qmake"
@@ -14,7 +14,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-3.0-only"
 homepage="https://www.riverbankcomputing.com/software/pyqtwebengine/intro"
 distfiles="${PYPI_SITE}/P/PyQtWebEngine/PyQtWebEngine-${version}.tar.gz"
-checksum=0badc56e6c9ee2b7b4baa87511737d2a7f1de5a45f52b1da8f4965fc17dcf0b6
+checksum=cedc28f54165f4b8067652145aec7f732a17eadf6736835852868cf76119cc19
 lib32disabled=yes
 CXXFLAGS="-I$XBPS_CROSS_BASE/usr/include/python$py3_ver"
 CXXFLAGS+=" -I$XBPS_CROSS_BASE/usr/include/qt5/QtWebChannel"

From b64f3ce36004c5d68084a0661af078e91bd0dba9 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, 5 Apr 2021 22:10:42 +0700
Subject: [PATCH 1309/2024] python3-PyQt5-networkauth: update to 5.15.4.

---
 srcpkgs/python3-PyQt5-networkauth/template | 5 +++--
 srcpkgs/python3-PyQt5-networkauth/update   | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/python3-PyQt5-networkauth/update

diff --git a/srcpkgs/python3-PyQt5-networkauth/template b/srcpkgs/python3-PyQt5-networkauth/template
index b0768fc041bc..291dbb0cc249 100644
--- a/srcpkgs/python3-PyQt5-networkauth/template
+++ b/srcpkgs/python3-PyQt5-networkauth/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-PyQt5-networkauth'
 pkgname=python3-PyQt5-networkauth
-version=5.15.3
+version=5.15.4
 revision=1
 wrksrc=PyQtNetworkAuth-$version
 build_helper="qmake"
@@ -13,7 +13,8 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-3.0-only"
 homepage="https://www.riverbankcomputing.com/software/pyqtnetworkauth/"
 distfiles="${PYPI_SITE}/P/PyQtNetworkAuth/PyQtNetworkAuth-${version}.tar.gz"
-checksum=2590eae76d4b87ceb9f0d857a5631e13dd14f7fdab2b5e696df61f77e4e3fd82
+checksum=893b9f8afb26a64757e9fa3436261b8bfcb4e696efc2a364a9dc8ac44db67fa7
+lib32disabled=yes
 CFLAGS=-I$XBPS_CROSS_BASE/usr/include/python$py3_ver
 CXXFLAGS="$CFLAGS"
 
diff --git a/srcpkgs/python3-PyQt5-networkauth/update b/srcpkgs/python3-PyQt5-networkauth/update
new file mode 100644
index 000000000000..74e002bb68fc
--- /dev/null
+++ b/srcpkgs/python3-PyQt5-networkauth/update
@@ -0,0 +1 @@
+pkgname=PyQtNetworkAuth

From 3d62933d29132da8317bf5b6739f74957f7735d0 Mon Sep 17 00:00:00 2001
From: make-file <makefile@riseup.net>
Date: Thu, 24 Dec 2020 15:03:35 +0330
Subject: [PATCH 1310/2024] New package: font-vazir-code-1.1.2

Closes: #27400 [via git-merge-pr]
---
 srcpkgs/font-vazir-code/template | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 srcpkgs/font-vazir-code/template

diff --git a/srcpkgs/font-vazir-code/template b/srcpkgs/font-vazir-code/template
new file mode 100644
index 000000000000..ae10ab901909
--- /dev/null
+++ b/srcpkgs/font-vazir-code/template
@@ -0,0 +1,22 @@
+# Template file for 'font-vazir-code'
+pkgname=font-vazir-code
+version=1.1.2
+revision=1
+create_wrksrc=yes
+depends="font-util"
+short_desc="Persian (farsi) monospaced font"
+maintainer="mkf <makefile@riseup.net>"
+license="Public Domain, custom:bitstream"
+homepage="https://github.com/rastikerdar/vazir-code-font"
+distfiles="https://github.com/rastikerdar/vazir-code-font/releases/download/v${version}/vazir-code-font-v${version}.zip"
+checksum=5c10819faef1d281db03703a82d498815b3d73b83badfa3100f9bbcd893b071e
+
+font_dirs="/usr/share/fonts/TTF"
+
+do_install() {
+	vmkdir usr/share/fonts/TTF
+	for f in ./*.ttf; do
+		vinstall "$f" 644 usr/share/fonts/TTF
+	done
+	vlicense LICENSE
+}

From 9946f2cef7c16afe8aa422a5669c8a83d2800e8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 18 Apr 2021 01:38:57 -0300
Subject: [PATCH 1311/2024] i2pd: fix build for i686.

AESNI and AVX aren't required on i686.
Problem reported in #26436.
---
 srcpkgs/i2pd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/i2pd/template b/srcpkgs/i2pd/template
index 8e059004fb55..d0cd1b6e116e 100644
--- a/srcpkgs/i2pd/template
+++ b/srcpkgs/i2pd/template
@@ -1,7 +1,7 @@
 # Template file for 'i2pd'
 pkgname=i2pd
 version=2.37.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="USE_UPNP=yes"
 makedepends="zlib-devel boost-devel openssl-devel miniupnpc-devel
@@ -23,7 +23,7 @@ _i2pd_homedir="/var/lib/i2pd"
 make_dirs="/var/lib/i2pd 0700 _i2pd _i2pd"
 
 case "${XBPS_TARGET_MACHINE}" in
-	x86_64*|i686*) ;;
+	x86_64*) ;;
 	*) make_build_args+=" USE_AESNI=no USE_AVX=no" ;;
 esac
 

From 26ac259bbce7cd197b1497994372a0283a391904 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Thu, 1 Apr 2021 00:17:03 +0200
Subject: [PATCH 1312/2024] prometheus: update to 2.26.0.

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

diff --git a/srcpkgs/prometheus/template b/srcpkgs/prometheus/template
index dcc9ddd28028..397675362761 100644
--- a/srcpkgs/prometheus/template
+++ b/srcpkgs/prometheus/template
@@ -1,6 +1,6 @@
 # Template file for 'prometheus'
 pkgname=prometheus
-version=2.24.1
+version=2.26.0
 revision=1
 build_style=go
 go_import_path="github.com/prometheus/prometheus"
@@ -18,7 +18,7 @@ license="Apache-2.0"
 homepage="https://prometheus.io/"
 changelog="https://raw.githubusercontent.com/prometheus/prometheus/master/CHANGELOG.md"
 distfiles="https://github.com/prometheus/prometheus/archive/v${version}.tar.gz"
-checksum=9e08bacde869c6c4b68a9e34c7074b812be1391b33d033d3072a5e1ad2debd87
+checksum=d2f5187946198e8d0ef820fb4f7e360d3d1b40587c70f6b7061a3a73b6ce90ab
 
 system_accounts="_prometheus"
 

From 29e63169b187b96a446f6131a5dc0b444e989ce2 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 18 Apr 2021 09:24:47 +0200
Subject: [PATCH 1313/2024] lxqt-session: update to 0.17.1.

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

diff --git a/srcpkgs/lxqt-session/template b/srcpkgs/lxqt-session/template
index 2d67a8afed51..88c301d98955 100644
--- a/srcpkgs/lxqt-session/template
+++ b/srcpkgs/lxqt-session/template
@@ -1,6 +1,6 @@
 # Template file for 'lxqt-session'
 pkgname=lxqt-session
-version=0.17.0
+version=0.17.1
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools xdg-user-dirs
@@ -12,5 +12,5 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://lxqt.org/"
 distfiles="https://github.com/lxqt/lxqt-session/releases/download/${version}/lxqt-session-${version}.tar.xz"
-checksum=9d6cac08f2681917cdd4d9aec3bb77a60ea353a9fbeaae080f52320f4ecf08c0
+checksum=d9058ceedb355a43ea2ef070292fc30b0fb740640cf0b579131aaefbac779c47
 replaces="lxqt-common>=0"

From b3ed005bdcb4418d479d7f8ba4f9c30e725ba29f Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 18 Apr 2021 09:29:21 +0200
Subject: [PATCH 1314/2024] obconf-qt: update to 0.16.1.

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

diff --git a/srcpkgs/obconf-qt/template b/srcpkgs/obconf-qt/template
index bd4c1636b4c6..40f4e2f54866 100644
--- a/srcpkgs/obconf-qt/template
+++ b/srcpkgs/obconf-qt/template
@@ -1,9 +1,9 @@
 # Template file for 'obconf-qt'
 pkgname=obconf-qt
-version=0.16.0
+version=0.16.1
 revision=1
 build_style=cmake
-hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools"
+hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools perl"
 makedepends="qt5-x11extras-devel qt5-tools-devel openbox-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="LXQt Openbox configuration tool"
@@ -11,4 +11,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://lxqt.org/"
 distfiles="https://github.com/lxqt/obconf-qt/releases/download/${version}/obconf-qt-${version}.tar.xz"
-checksum=64c6cf341a5cb9249d531c6bb109e59bf9eb01bb65fcad1638c32839c4f0b0a4
+checksum=458d96b63dca8a09a4f477d42030d829e8090aae0ea39b3994fcf0b8da8e8b42

From 700ce5138ea1fa351b91fc9b6cde2bad752dbc23 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 18 Apr 2021 15:05:03 +0200
Subject: [PATCH 1315/2024] texlive2020-bin: use historic texlive repository.

As texlive2021 has been released the default repository no longer
contains the 2020 version. Make the installer use the frozen
historic one.
---
 srcpkgs/texlive2020-bin/INSTALL  | 4 ++--
 srcpkgs/texlive2020-bin/template | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/texlive2020-bin/INSTALL b/srcpkgs/texlive2020-bin/INSTALL
index 8168e595b307..7a067cd7e016 100644
--- a/srcpkgs/texlive2020-bin/INSTALL
+++ b/srcpkgs/texlive2020-bin/INSTALL
@@ -5,10 +5,10 @@ post)
 		cd opt/texlive2020-installer
 		case "${ARCH}" in
 			x86_64-musl)
-			./install-tl -profile void.profile -force-platform x86_64-linuxmusl
+			./install-tl -repository ftp://ftp.tug.org/texlive/historic/2020/tlnet-final/ -profile void.profile -force-platform x86_64-linuxmusl
 			;;
 			*)
-			./install-tl -profile void.profile
+			./install-tl -repository ftp://ftp.tug.org/texlive/historic/2020/tlnet-final/ -profile void.profile
 			;;
 		esac
 	esac
diff --git a/srcpkgs/texlive2020-bin/template b/srcpkgs/texlive2020-bin/template
index f6684c6122ed..939f8a2964cb 100644
--- a/srcpkgs/texlive2020-bin/template
+++ b/srcpkgs/texlive2020-bin/template
@@ -1,7 +1,7 @@
-# Template file for 'texlive-bin'
+# Template file for 'texlive2020-bin'
 pkgname=texlive2020-bin
 version=2020
-revision=3
+revision=4
 archs="x86_64* i686 aarch64 arm*"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 homepage="http://tug.org/texlive/"

From e1680145ed8c48f7f139059392d76bff710f7433 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 18 Apr 2021 15:17:00 +0200
Subject: [PATCH 1316/2024] texlive-bin: update to 2021.

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

diff --git a/srcpkgs/texlive-bin/template b/srcpkgs/texlive-bin/template
index bd3a6e688c21..af5517c46ebd 100644
--- a/srcpkgs/texlive-bin/template
+++ b/srcpkgs/texlive-bin/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive-bin'
 pkgname=texlive-bin
-version=2020
-revision=3
+version=2021
+revision=1
 depends="texlive${version}-bin"
 short_desc="TeX Live Binary distribution through tl-install (newest version)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From a7593f24232b7ce671dbbf1812e6888cd20bbad2 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 18 Apr 2021 18:10:59 +0200
Subject: [PATCH 1317/2024] nettle: always use auxval on ppc, and fix on ppc64
 big endian

---
 .../nettle/patches/musl-ppc-use-auxval.patch  | 21 ++++++++++++++++++
 srcpkgs/nettle/patches/ppc64-elfv2.patch      | 22 +++++++++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 srcpkgs/nettle/patches/musl-ppc-use-auxval.patch
 create mode 100644 srcpkgs/nettle/patches/ppc64-elfv2.patch

diff --git a/srcpkgs/nettle/patches/musl-ppc-use-auxval.patch b/srcpkgs/nettle/patches/musl-ppc-use-auxval.patch
new file mode 100644
index 000000000000..315aebfdcb73
--- /dev/null
+++ b/srcpkgs/nettle/patches/musl-ppc-use-auxval.patch
@@ -0,0 +1,21 @@
+This ensures that efficient capability checks are used on musl.
+
+--- fat-ppc.c
++++ fat-ppc.c
+@@ -42,12 +42,10 @@
+ 
+ #if defined(_AIX)
+ # include <sys/systemcfg.h>
+-#elif defined(__linux__) && defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+-# if __GLIBC_PREREQ(2, 16)
+-#  define USE_GETAUXVAL 1
+-#  include <asm/cputable.h>
+-#  include <sys/auxv.h>
+-# endif
++#elif defined(__linux__)
++# define USE_GETAUXVAL 1
++# include <asm/cputable.h>
++# include <sys/auxv.h>
+ #elif defined(__FreeBSD__)
+ # include <machine/cpu.h>
+ # ifdef PPC_FEATURE2_HAS_VEC_CRYPTO
diff --git a/srcpkgs/nettle/patches/ppc64-elfv2.patch b/srcpkgs/nettle/patches/ppc64-elfv2.patch
new file mode 100644
index 000000000000..c7d463b6a86f
--- /dev/null
+++ b/srcpkgs/nettle/patches/ppc64-elfv2.patch
@@ -0,0 +1,22 @@
+Ensure that ELFv2 ABI is used on all ppc64, including big endian.
+
+--- powerpc64/machine.m4
++++ powerpc64/machine.m4
+@@ -1,7 +1,7 @@
+ define(`PROLOGUE',
+ `.globl C_NAME($1)
+ DECLARE_FUNC(C_NAME($1))
+-ifelse(WORDS_BIGENDIAN,no,
++ifelse(`no',`no',
+ `ifdef(`FUNC_ALIGN',`.align FUNC_ALIGN')
+ C_NAME($1):
+ addis 2,12,(.TOC.-C_NAME($1))@ha
+@@ -17,7 +17,7 @@ ifdef(`FUNC_ALIGN',`.align FUNC_ALIGN')
+ undefine(`FUNC_ALIGN')')
+ 
+ define(`EPILOGUE',
+-`ifelse(WORDS_BIGENDIAN,no,
++`ifelse(`no',`no',
+ `.size C_NAME($1), . - C_NAME($1)',
+ `.size .C_NAME($1), . - .C_NAME($1)
+ .size C_NAME($1), . - .C_NAME($1)')')

From d4adc48b72f53b269b96f6818702faa8fcc4ff2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 14 Nov 2020 00:46:35 -0300
Subject: [PATCH 1318/2024] gfuzz: fix checksum, homepage and module paths.

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

diff --git a/srcpkgs/gfuzz/template b/srcpkgs/gfuzz/template
index a51ea912896f..3925f06c9500 100644
--- a/srcpkgs/gfuzz/template
+++ b/srcpkgs/gfuzz/template
@@ -1,14 +1,14 @@
 # Template file for 'gfuzz'
 pkgname=gfuzz
 version=0.2
-revision=1
-wrksrc="gfuzz-${version}"
+revision=2
+wrksrc="gfz-${version}"
 build_style=go
-go_import_path=github.com/braaaax/gfuzz
+go_import_path=github.com/braaaax/gfz
 hostmakedepends="git"
 short_desc="Web fuzzer like wfuzz written in Golang"
 maintainer="Alex Childs <misuchiru03+void@gmail.com>"
 license="Apache-2.0"
-homepage="https://github.com/braaaax/gfuzz"
-distfiles="https://github.com/braaaax/gfuzz/archive/v${version}.tar.gz"
-checksum=054163243181db528715bf904ee7656aa0a12e9feb120c8afbfd43bd6504ccd1
+homepage="https://github.com/braaaax/gfz"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=8b6a3df0c385fe993ead673df53daa290943220f2cde73e6b1c706ef94aa4e5f

From 07b27aa34e328d155901c153d36d95b3f83b7e49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sun, 18 Apr 2021 14:36:57 +0200
Subject: [PATCH 1319/2024] buildah: update to 1.20.1.

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

diff --git a/srcpkgs/buildah/template b/srcpkgs/buildah/template
index 16dcc457297c..91ddeba3d41c 100644
--- a/srcpkgs/buildah/template
+++ b/srcpkgs/buildah/template
@@ -1,6 +1,6 @@
 # Template file for 'buildah'
 pkgname=buildah
-version=1.20.0
+version=1.20.1
 revision=1
 build_style=go
 go_import_path=github.com/containers/buildah
@@ -16,7 +16,7 @@ license="Apache-2.0"
 homepage="https://github.com/containers/buildah"
 changelog="https://github.com/containers/buildah/blob/master/CHANGELOG.md"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=6af8fd6ad6fdb515f4f806105c8fe3e4ceda63eaea6e33e3c7ac7b272fe61797
+checksum=970c326594acf85665640b721d11839fb9701daef3471cd8dd1823ff33b11db2
 
 post_build() {
 	make -C docs GOMD2MAN=go-md2man

From a3df3c9f30b1041265169a704fbba59505f5e333 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sun, 18 Apr 2021 14:05:10 +0200
Subject: [PATCH 1320/2024] dive: update to 0.10.0.

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

diff --git a/srcpkgs/dive/template b/srcpkgs/dive/template
index 9144579660ac..4821a0dadb2b 100644
--- a/srcpkgs/dive/template
+++ b/srcpkgs/dive/template
@@ -1,16 +1,15 @@
 # Template file for 'dive'
 pkgname=dive
-version=0.9.2
+version=0.10.0
 revision=1
 build_style=go
 go_import_path="github.com/wagoodman/dive"
-hostmakedepends="git"
 short_desc="Container image exploration tool"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="MIT"
 homepage="https://github.com/wagoodman/dive"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=1f84bf3d2ba04986827ff5b1a66920f030f7b4788c927c5e152ff5bcf49f9770
+checksum=293e3ae853c8e7f77e4891addb4504a057ed3b6d97934cc97201031bcaa30b53
 
 post_install() {
 	vlicense LICENSE

From 2df7b66385292750e7fb875fda551e0a586388c0 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sat, 17 Apr 2021 10:52:07 +0200
Subject: [PATCH 1321/2024] lilypond: update to 2.23.2

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

diff --git a/srcpkgs/lilypond/template b/srcpkgs/lilypond/template
index bf7db3ac45e2..8c2f21d45adc 100644
--- a/srcpkgs/lilypond/template
+++ b/srcpkgs/lilypond/template
@@ -1,6 +1,6 @@
 # Template file for 'lilypond'
 pkgname=lilypond
-version=2.23.1
+version=2.23.2
 revision=1
 build_wrksrc="build"
 build_style="gnu-configure"
@@ -17,7 +17,7 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="GPL-3.0-or-later, GFDL-1.3-or-later"
 homepage="https://lilypond.org/"
 distfiles="https://lilypond.org/downloads/sources/v2.23/lilypond-${version}.tar.gz"
-checksum=911a8af1f8dc862ff6fee81292a1d63c6fc592f8d4a9c8080978b6698eddfb07
+checksum=3b850b7af0322db720eafe8141f4a3e275fee6e00325da85decffbdb6ffced8c
 python_version=3
 
 if [ -n "${CROSS_BUILD}" ]; then

From 50b6f80944133a663303d68933dc63d151681cd5 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sat, 17 Apr 2021 10:52:29 +0200
Subject: [PATCH 1322/2024] lilypoond-doc: update to 2.23.2

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

diff --git a/srcpkgs/lilypond-doc/template b/srcpkgs/lilypond-doc/template
index 80fb58e081b1..503ccd745b91 100644
--- a/srcpkgs/lilypond-doc/template
+++ b/srcpkgs/lilypond-doc/template
@@ -1,6 +1,6 @@
 # Template file for 'lilypond-doc'
 pkgname=lilypond-doc
-version=2.23.1
+version=2.23.2
 revision=1
 create_wrksrc=yes
 short_desc="Documentation for the lilypond music engraving program"
@@ -8,7 +8,7 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="GPL-3.0-or-later, GFDL-1.3-or-later"
 homepage="http://lilypond.org/"
 distfiles="http://lilypond.org/downloads/binaries/documentation/lilypond-${version}-1.documentation.tar.bz2"
-checksum=19c842aa96b4f1bea6bc4013c58b6fcd0963c74ba199cc7da3653bd61ab780f5
+checksum=39cd03081b07ff535a943befa529df2ab4e0ac94f3f2942ccfbc15abf0c154e6
 
 do_install() {
 	vmkdir usr

From 49b91c6fa97ae11cc115b6e114469849e99e858b Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sat, 17 Apr 2021 10:51:06 +0200
Subject: [PATCH 1323/2024] zita-njbridge: update to 0.4.8

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

diff --git a/srcpkgs/zita-njbridge/template b/srcpkgs/zita-njbridge/template
index b88d359edce0..7921b0038c43 100644
--- a/srcpkgs/zita-njbridge/template
+++ b/srcpkgs/zita-njbridge/template
@@ -1,6 +1,6 @@
 # Template file for 'zita-njbridge'
 pkgname=zita-njbridge
-version=0.4.4
+version=0.4.8
 revision=1
 build_wrksrc="source"
 build_style=gnu-makefile
@@ -10,4 +10,4 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="GPL-3.0-or-later"
 homepage="https://kokkinizita.linuxaudio.org/linuxaudio/"
 distfiles="https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
-checksum=12bdcf6b2e3fcfecd30e0b57ad43e095196fb47b4d9392ebc10f5c28dbd719d1
+checksum=101176a0bd407cab7bffd326e8d6886c1b65b212bc33f2efb97b03f926c47907

From 24469e67db80e027fa4b70ddce06393051dfc374 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Sun, 18 Apr 2021 14:51:21 +0300
Subject: [PATCH 1324/2024] font-sarasa-gothic: update to 0.30.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 ed3628dd230f..0217e0cc39df 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.21.0
+version=0.30.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=cfe1b519e1272fd2b1d069007456001c489b16f923d2b6356b102af471857c83
+checksum=44b14ab8ec5da43c7804c7d5e077de887bc889c1a1eca62765d46e0a0df36b99
 
 font_dirs="/usr/share/fonts/TTF"
 

From 51562c964961a2569a26754c073655a84e05587a Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Tue, 13 Apr 2021 18:32:52 -0700
Subject: [PATCH 1325/2024] hackrf: update to 2021.03.1

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

diff --git a/srcpkgs/hackrf/template b/srcpkgs/hackrf/template
index 80cd3772bb66..9bd653451bb1 100644
--- a/srcpkgs/hackrf/template
+++ b/srcpkgs/hackrf/template
@@ -1,6 +1,6 @@
 # Template file for 'hackrf'
 pkgname=hackrf
-version=2018.01.1
+version=2021.03.1
 revision=1
 build_wrksrc=host
 build_style=cmake
@@ -9,17 +9,17 @@ makedepends="libusb-devel fftw-devel"
 _desc="Low cost software defined radio (SDR) platform"
 short_desc="${_desc} - tools"
 maintainer="bra1nwave <brainwave@openmailbox.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://greatscottgadgets.com/hackrf/"
 distfiles="https://github.com/mossmann/hackrf/releases/download/v${version}/${pkgname}-${version}.tar.xz"
-checksum=a89badc09a1d2fa18367b3b2c974580ad5f6ce93aaa4e54557dc3d013c029d14
+checksum=a43e5080c11efdfe69ddebcc35a02b018e30e820de0e0ebdc7948cf7b0cd93a3
 
 pre_configure() {
-	sed -i 's|MODE="660", GROUP="plugdev"|TAG+="uaccess"|g' libhackrf/53-hackrf.rules
+	vsed -i 's|MODE="660", GROUP="plugdev"|TAG+="uaccess"|g' libhackrf/53-hackrf.rules
 }
 
 post_install() {
-	for f in ../firmware-bin/*.{bin,dfu,xsvf}; do
+	for f in ../firmware-bin/*.{bin,dfu}; do
 		vinstall "$f" 644 usr/share/hackrf/
 	done
 }

From 236d687c8f25a46f7309542f130c36eb0913b143 Mon Sep 17 00:00:00 2001
From: andry-dev <andry-dev@users.noreply.github.com>
Date: Sun, 18 Apr 2021 13:58:10 +0200
Subject: [PATCH 1326/2024] libluv: update to 1.41.0.0.

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

diff --git a/srcpkgs/libluv/template b/srcpkgs/libluv/template
index 767f729527e8..ac7ef54a6ffa 100644
--- a/srcpkgs/libluv/template
+++ b/srcpkgs/libluv/template
@@ -1,6 +1,6 @@
 # Template file for 'libluv'
 pkgname=libluv
-version=1.36.0.0
+version=1.41.0.0
 revision=1
 _distver="${version%.*}-${version##*.}"
 wrksrc=luv-${_distver}
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://github.com/luvit/luv"
 distfiles="https://github.com/luvit/luv/releases/download/${_distver}/luv-${_distver}.tar.gz
 			https://raw.githubusercontent.com/luvit/luv/${_distver}/libluv.pc.in"
-checksum="f2e7eb372574f25c6978c1dc74280d22efdcd7df2dda4a286c7fe7dceda26445
+checksum="4018f293d71c2d75757b64fcdacf982729c9dc8b0bf8eda4015a8818a5a29321
  be2a4909c724e09a50de42b1caa3c82c1b1afee8b80abf20c6944f1df1c7fd0e"
 skip_extraction="libluv.pc.in"
 

From 372765bc8f946a912507dd58c45338cb6a33164b Mon Sep 17 00:00:00 2001
From: Isaac Freund <ifreund@ifreund.xyz>
Date: Mon, 19 Apr 2021 00:28:20 +0200
Subject: [PATCH 1327/2024] foot: update to 1.7.2.

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

diff --git a/srcpkgs/foot/template b/srcpkgs/foot/template
index 638234994cde..c3b77f690e24 100644
--- a/srcpkgs/foot/template
+++ b/srcpkgs/foot/template
@@ -1,6 +1,6 @@
 # Template file for 'foot'
 pkgname=foot
-version=1.7.1
+version=1.7.2
 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=44a97d36dae6c9989aa68d2d69731679aa1f3e0c4ecc721cf79a80f5bdfdbc5f
+checksum=0c5fa72a315b65100dfb8b7343212535e75e990b2a9500e028c6078c7915eb8a
 
 post_install() {
 	rm -f ${DESTDIR}/usr/share/doc/foot/LICENSE

From 284205058f6387df4ad33b8016e890a158072c54 Mon Sep 17 00:00:00 2001
From: Isaac Freund <ifreund@ifreund.xyz>
Date: Mon, 19 Apr 2021 00:31:44 +0200
Subject: [PATCH 1328/2024] fcft: update to 2.3.3.

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

diff --git a/srcpkgs/fcft/template b/srcpkgs/fcft/template
index 072c1bcb5ef0..5c05d3bb7f84 100644
--- a/srcpkgs/fcft/template
+++ b/srcpkgs/fcft/template
@@ -1,6 +1,6 @@
 # Template file for 'fcft'
 pkgname=fcft
-version=2.3.2
+version=2.3.3
 revision=1
 wrksrc=$pkgname
 build_style=meson
@@ -13,7 +13,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fcft"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=726fdebb1d29bc40c665015666fd9037981c0b4d0ba3ecafa1994053091e7fa8
+checksum=65684da7addb7a2df0bbc1b6018e6e0a08951ac7a427ec08121bbb96f98c2af4
 
 build_options="harfbuzz"
 build_options_default="harfbuzz"

From 9c25cc323b44e2be5a939252ed148acb26b80a67 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 19 Apr 2021 01:14:29 +0300
Subject: [PATCH 1329/2024] terminator: update to 2.1.1.

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

diff --git a/srcpkgs/terminator/template b/srcpkgs/terminator/template
index c29cbc4a756e..cbb554c45f81 100644
--- a/srcpkgs/terminator/template
+++ b/srcpkgs/terminator/template
@@ -1,7 +1,7 @@
 # Template file for 'terminator'
 pkgname=terminator
-version=2.0.1
-revision=2
+version=2.1.1
+revision=1
 build_style=python3-module
 hostmakedepends="intltool python3-setuptools"
 depends="desktop-file-utils gsettings-desktop-schemas libkeybinder3 libnotify
@@ -12,7 +12,7 @@ license="GPL-2.0-only"
 homepage="https://gnome-terminator.org"
 changelog="https://raw.githubusercontent.com/gnome-terminator/terminator/master/CHANGELOG.md"
 distfiles="https://github.com/gnome-terminator/terminator/releases/download/v$version/terminator-$version.tar.gz"
-checksum=e6a21ea18c48b9dcb8fac3b48fd90bc49768de13c2a749047c46a6e0f14abb24
+checksum=bcb5ea52a612893451d0961ac3907a308f3907978f28349ee1ddc277aaaaaf75
 
 post_patch() {
 	# Package does not *need* pytest-runner to build, and Void doesn't have it

From ae3ec65adc190c049f5ff08a06cecc5a6f77330f Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 19 Apr 2021 01:36:24 +0300
Subject: [PATCH 1330/2024] e16: update to 1.0.23.

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

diff --git a/srcpkgs/e16/template b/srcpkgs/e16/template
index 1afa4d34d9b8..246087e36b57 100644
--- a/srcpkgs/e16/template
+++ b/srcpkgs/e16/template
@@ -1,6 +1,6 @@
 # Template file for 'e16'
 pkgname=e16
-version=1.0.22
+version=1.0.23
 revision=1
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc --enable-sound=alsa"
@@ -11,7 +11,7 @@ maintainer="Brihadeesh <brihadeesh@protonmail.com>"
 license="BSD-2-Clause"
 homepage="https://www.enlightenment.org/e16"
 distfiles="$SOURCEFORGE_SITE/enlightenment/${pkgname}-${version}.tar.gz"
-checksum=b07d301a0a67ac020974afcbe779e1d48b376eab2e477fb189277c13b76d4a67
+checksum=5b441bebf0c733e724ebe753f0c74aa632d0fead2bced67a3a7e988dc5de3336
 
 post_install() {
 	# install gnome and kde session scripts

From e2de8f896528a617bf69bfe02d1153386dddad71 Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Sun, 18 Apr 2021 22:03:37 -0400
Subject: [PATCH 1331/2024] oragono: update to 2.6.0.

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

diff --git a/srcpkgs/oragono/template b/srcpkgs/oragono/template
index 68a4f5386bc2..3ad30e162f30 100644
--- a/srcpkgs/oragono/template
+++ b/srcpkgs/oragono/template
@@ -1,6 +1,6 @@
 # Template file for 'oragono'
 pkgname=oragono
-version=2.5.1
+version=2.6.0
 revision=1
 build_style=go
 go_import_path="github.com/oragono/oragono"
@@ -10,7 +10,7 @@ maintainer="Peter Bui <pbui@github.bx612.space>"
 license="MIT"
 homepage="https://oragono.io/"
 distfiles="https://github.com/oragono/oragono/archive/v${version}.tar.gz"
-checksum=1d38f36d73b4f2ffff158dfc47de833111b4c5f25703276a426c0f01618874ac
+checksum=c0fdca73fa39a34166b747c5f556f568edd46d063e9f19d7d4ee066a3803f2ae
 conf_files="/etc/oragono.conf"
 system_accounts="_oragono"
 _oragono_homedir="/var/lib/oragono"

From 35284c1dd3f5d51f22bfc57e94322da118f89081 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 19 Apr 2021 10:38:13 +0200
Subject: [PATCH 1332/2024] gufw: update to 21.04.0.

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

diff --git a/srcpkgs/gufw/template b/srcpkgs/gufw/template
index f676cfaf7628..56e5d1de74e8 100644
--- a/srcpkgs/gufw/template
+++ b/srcpkgs/gufw/template
@@ -1,7 +1,7 @@
 # Template file for 'gufw'
 pkgname=gufw
-version=20.04.1
-revision=2
+version=21.04.0
+revision=1
 wrksrc="gufw-${version}"
 build_style=python3-module
 hostmakedepends="python3-distutils-extra intltool"
@@ -10,8 +10,8 @@ short_desc="GTK+ frontend for ufw"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://gufw.org/"
-distfiles="https://github.com/costales/gufw/releases/download/${version}/gufw-${version}.tar.gz"
-checksum=bc09f67796325b2e1ea4ac2c3c541f5c6eab7aa4510f77fcd7b0a506f1e57fd8
+distfiles="https://github.com/costales/gufw/archive/refs/tags/$version.tar.gz"
+checksum=b57892ec9817ca1520b2fef31cc3ef404b243ef1230bdccfdc6d75ed4e461841
 
 pre_configure() {
 	vsed -i -e "s/python3.5/python$py3_ver/" bin/gufw-pkexec

From 51f7891020841b37c9027e53ac747755949cd566 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 19 Apr 2021 01:24:28 +0300
Subject: [PATCH 1333/2024] vte3: update to 0.64.0.

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

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

From 8a9d48f33929bcbd7d6063aaefc48a70818cd579 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 19 Apr 2021 11:26:20 +0200
Subject: [PATCH 1334/2024] avfs: update to 1.1.4.

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

diff --git a/srcpkgs/avfs/template b/srcpkgs/avfs/template
index 37d0b3f82888..893e2620daa9 100644
--- a/srcpkgs/avfs/template
+++ b/srcpkgs/avfs/template
@@ -1,6 +1,6 @@
 # Template file for 'avfs'
 pkgname=avfs
-version=1.1.3
+version=1.1.4
 revision=1
 build_style=gnu-configure
 configure_args="--with-system-zlib --with-system-bzlib"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only, LGPL-2.0-only"
 homepage="http://avf.sourceforge.net/"
 distfiles="$SOURCEFORGE_SITE/avf/avfs-${version}.tar.bz2"
-checksum=4f4ec1e8c0d5da94949e3dab7500ee29fa3e0dda723daf8e7d60e5f3ce4450df
+checksum=3a7981af8557f864ae10d4b204c29969588fdb526e117456e8efd54bf8faa12b
 
 libavfs_package() {
 	short_desc+=" - library"

From e63cdbd6e3a4c8ebf30f22a4b30e588416e1964a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 19 Apr 2021 11:45:26 +0200
Subject: [PATCH 1335/2024] pax-utils: update to 1.3.1.

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

diff --git a/srcpkgs/pax-utils/template b/srcpkgs/pax-utils/template
index f72f65b9a36e..9f9db18383fc 100644
--- a/srcpkgs/pax-utils/template
+++ b/srcpkgs/pax-utils/template
@@ -1,6 +1,6 @@
 # Template file for 'pax-utils'
 pkgname=pax-utils
-version=1.2.9
+version=1.3.1
 revision=1
 build_style=gnu-configure
 configure_args="--with-caps"
@@ -12,4 +12,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://cgit.gentoo.org/proj/pax-utils.git/"
 distfiles="https://gentoo.osuosl.org/distfiles/${pkgname}-${version}.tar.xz"
-checksum=ebcec269dc9b9876d73bd33a8d00d567e3946ade94d970d5cb2b0cfcac2988b2
+checksum=87e35b46103747b3694f7dafb2a24f205ff6a745777fc63e3ee33623f81e56cd

From c330614cc4b023f26f0e0c1523643542cfec10cf Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Mon, 22 Feb 2021 19:09:36 +0100
Subject: [PATCH 1336/2024] python3-nbxmpp: update to 2.0.2.

---
 srcpkgs/python3-nbxmpp/template | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-nbxmpp/template b/srcpkgs/python3-nbxmpp/template
index bb6b13ae6ffd..f0fe8a25297c 100644
--- a/srcpkgs/python3-nbxmpp/template
+++ b/srcpkgs/python3-nbxmpp/template
@@ -1,15 +1,20 @@
 # Template file for 'python3-nbxmpp'
 pkgname=python3-nbxmpp
-version=1.0.2
-revision=2
+version=2.0.2
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-openssl"
+depends="python3-gobject python3-openssl python3-precis-i18n python3-idna"
+checkdepends="${depends} python3-wheel python3-pylint python3-coverage libsoup"
 short_desc="Non blocking Jabber/XMPP module"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://python-nbxmpp.gajim.org/"
 #changelog="https://dev.gajim.org/gajim/python-nbxmpp/raw/master/ChangeLog"
 distfiles="${PYPI_SITE}/n/nbxmpp/nbxmpp-${version}.tar.gz"
-checksum=991f014a2736123e989da454d6a467be8c4314bf86dbcc889e899f03726e856f
+checksum=a3863671ab88992d3ea5d475b25c88ffe18aa1030c9ce980e1014470d4760291
+
+do_check() {
+	coverage run --source=nbxmpp -m unittest discover -v
+}

From 88d28ba111d87789b29356fba30537a56bc5f472 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Mon, 22 Feb 2021 19:33:08 +0100
Subject: [PATCH 1337/2024] gajim: update to 1.3.1.

---
 srcpkgs/gajim/files/README.voidlinux |  1 +
 srcpkgs/gajim/template               | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/gajim/files/README.voidlinux

diff --git a/srcpkgs/gajim/files/README.voidlinux b/srcpkgs/gajim/files/README.voidlinux
new file mode 100644
index 000000000000..3b19a82a5bb2
--- /dev/null
+++ b/srcpkgs/gajim/files/README.voidlinux
@@ -0,0 +1 @@
+Visit https://dev.gajim.org/gajim/gajim-plugins/-/wikis/home to install plugins.
diff --git a/srcpkgs/gajim/template b/srcpkgs/gajim/template
index e4546a5e72fa..848542981dce 100644
--- a/srcpkgs/gajim/template
+++ b/srcpkgs/gajim/template
@@ -1,19 +1,24 @@
 # Template file for 'gajim'
 pkgname=gajim
-version=1.2.2
-revision=3
+version=1.3.1
+revision=1
+wrksrc=gajim-gajim-${version}
 build_style=python3-module
 hostmakedepends="gettext python3-setuptools"
 depends="python3-gobject python3-nbxmpp python3-pyasn1 python3-setuptools
  python3-precis-i18n python3-keyring python3-cssutils python3-packaging
- python3-css-parser farstream python3-dbus libsoup"
+ python3-css-parser python3-idna farstream python3-dbus libsoup"
 short_desc="Full featured Jabber/XMPP client"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-3.0-only"
 homepage="https://www.gajim.org"
-changelog="https://dev.gajim.org/gajim/gajim/-/raw/master/ChangeLog"
+changelog="https://dev.gajim.org/gajim/gajim/raw/gajim-${version}/ChangeLog"
 distfiles="https://gajim.org/downloads/${version%.*}/gajim-${version}.tar.gz"
-checksum=fd0d1653fb3f7f97207fecc3218d38915adb1d741bf95a7eef83605bd6b8ccbd
+checksum=6a051d51fb45b80b19ccc47a2fb4c3eee948e598f49e63a9f929e158870d101c
 # Does not find gdk, introspection typelib
 # even wtih gdk-pixbuf in checkdepends
 make_check=no
+
+post_install() {
+	vdoc "${FILESDIR}/README.voidlinux"
+}

From 838ff53ff924ee63101ea53b9bf0952611287859 Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Sat, 20 Feb 2021 23:28:15 +0100
Subject: [PATCH 1338/2024] New package: ipp-usb-0.9.17

---
 srcpkgs/ipp-usb/files/README.voidlinux   | 23 +++++++++++++++++++++
 srcpkgs/ipp-usb/files/ipp-usb/run        |  4 ++++
 srcpkgs/ipp-usb/patches/udev_runit.patch |  5 +++++
 srcpkgs/ipp-usb/template                 | 26 ++++++++++++++++++++++++
 4 files changed, 58 insertions(+)
 create mode 100644 srcpkgs/ipp-usb/files/README.voidlinux
 create mode 100644 srcpkgs/ipp-usb/files/ipp-usb/run
 create mode 100644 srcpkgs/ipp-usb/patches/udev_runit.patch
 create mode 100644 srcpkgs/ipp-usb/template

diff --git a/srcpkgs/ipp-usb/files/README.voidlinux b/srcpkgs/ipp-usb/files/README.voidlinux
new file mode 100644
index 000000000000..85c8dabb9778
--- /dev/null
+++ b/srcpkgs/ipp-usb/files/README.voidlinux
@@ -0,0 +1,23 @@
+Void-specific instructions:
+============================
+
+By default, ipp-usb constantly runs in the background. It can also run on
+demand by utilizing udev rules to detect usb printers. You can enable
+this functionality by doing the following:
+
+echo 'OPTS=udev' > /etc/sv/ipp-usb/conf
+touch /etc/sv/ipp-usb/down
+ln -s /etc/sv/ipp-usb /var/service
+cp /usr/share/doc/ipp-usb/71-ipp-usb.rules /etc/udev/rules.d/
+
+Afterwards restart your computer or reload udev rules with `udevadm trigger`.
+
+You can also link the udev rules instead of copying them, this way they get
+updated with the package automatically:
+
+ln -s /usr/share/doc/ipp-usb/71-ipp-usb.rules /etc/udev/rules.d/
+
+Do note that because udev rules may run before runsvdir, having a printer
+connected at boot time will not reliably cause ipp-usb to start.
+Run the ipp-usb service once at startup with a oneshot-style service or cron
+to address this.
diff --git a/srcpkgs/ipp-usb/files/ipp-usb/run b/srcpkgs/ipp-usb/files/ipp-usb/run
new file mode 100644
index 000000000000..7a3fac32ba2d
--- /dev/null
+++ b/srcpkgs/ipp-usb/files/ipp-usb/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+exec 2>&1
+[ -r ./conf ] && . ./conf
+exec ipp-usb ${OPTS:=standalone}
diff --git a/srcpkgs/ipp-usb/patches/udev_runit.patch b/srcpkgs/ipp-usb/patches/udev_runit.patch
new file mode 100644
index 000000000000..a4678d609731
--- /dev/null
+++ b/srcpkgs/ipp-usb/patches/udev_runit.patch
@@ -0,0 +1,5 @@
+--- systemd-udev/71-ipp-usb.rules
++++ systemd-udev/71-ipp-usb.rules
+@@ -1 +1 @@
+-ACTION=="add", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}=="*:070104:*", OWNER="root", GROUP="lp", MODE="0664", TAG+="systemd", ENV{SYSTEMD_WANTS}+="ipp-usb.service"
++ACTION=="add", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}=="*:070104:*", OWNER="root", GROUP="lp", MODE="0664", RUN+="/usr/bin/sv o ipp-usb"
diff --git a/srcpkgs/ipp-usb/template b/srcpkgs/ipp-usb/template
new file mode 100644
index 000000000000..95d82fedf04f
--- /dev/null
+++ b/srcpkgs/ipp-usb/template
@@ -0,0 +1,26 @@
+# Template file for 'ipp-usb'
+pkgname=ipp-usb
+version=0.9.17
+revision=1
+build_style=go
+go_import_path="github.com/OpenPrinting/ipp-usb"
+conf_files="/etc/ipp-usb/ipp-usb.conf"
+hostmakedepends="pkg-config"
+makedepends="avahi-libs-devel libusb-devel"
+depends="avahi"
+short_desc="Allows using the IPP protocol over usb connections"
+maintainer="Philipp David <pd@3b.pm>"
+license="BSD-2-Clause"
+homepage="https://github.com/OpenPrinting/ipp-usb"
+distfiles="https://github.com/OpenPrinting/ipp-usb/archive/$version.tar.gz"
+checksum=4c1fbd89f7d971eed8447cd80d3e4723edd968043cb2fa4c490ac305720156c3
+
+post_install() {
+	vsv ipp-usb
+	vman ipp-usb.8
+	vdoc README.md
+	vdoc ${FILESDIR}/README.voidlinux
+	vdoc systemd-udev/71-ipp-usb.rules
+	vinstall ipp-usb.conf 644 /etc/ipp-usb
+	vlicense LICENSE
+}

From b7673630650c22ff55fbaaf81169fde715f7c5bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Mon, 19 Apr 2021 14:36:41 +0200
Subject: [PATCH 1339/2024] gitui: update to 0.14.0.

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

diff --git a/srcpkgs/gitui/template b/srcpkgs/gitui/template
index 69ea33936ab0..1f621c355fe4 100644
--- a/srcpkgs/gitui/template
+++ b/srcpkgs/gitui/template
@@ -1,6 +1,6 @@
 # Template file for 'gitui'
 pkgname=gitui
-version=0.13.0
+version=0.14.0
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config python3"
@@ -10,7 +10,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"
 homepage="https://github.com/extrawurst/gitui"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=ebf3ba559d05205e629805f60441411a0609e2a84444753cfd3a4a3ff1b98009
+checksum=4312e6028c314bde12c7515a76aaa1fae518c8cefa6ab2e3a1a70c680e7dcb6a
 
 post_install() {
 	vlicense LICENSE.md

From 2b0fdd11f8d43047298efc88da366b1c53c1eab8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Mon, 19 Apr 2021 14:29:23 +0200
Subject: [PATCH 1340/2024] topgrade: update to 6.8.0.

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

diff --git a/srcpkgs/topgrade/template b/srcpkgs/topgrade/template
index 3c0e833c3c71..799ea0366cbb 100644
--- a/srcpkgs/topgrade/template
+++ b/srcpkgs/topgrade/template
@@ -1,6 +1,6 @@
 # Template file for 'topgrade'
 pkgname=topgrade
-version=6.7.0
+version=6.8.0
 revision=1
 build_style=cargo
 short_desc="Meta upgrade tool for pip, flatpak, your distro and everything else"
@@ -8,4 +8,4 @@ maintainer="jcgruenhage <jan.christian@gruenhage.xyz>"
 license="GPL-3.0-only"
 homepage="https://github.com/r-darwish/topgrade"
 distfiles="https://github.com/r-darwish/topgrade/archive/v${version}.tar.gz"
-checksum=490cc78234ebb69a986223eb25c6ed4aceb9a09024497857eb6f1960a62f880f
+checksum=7ed24e5ca728482fc1c862a61e091cb5dfa5353f733c3458fbe1fda662e8fd41

From efad45682198c299adc7d43aaca5f062bfe2dae9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Mon, 19 Apr 2021 14:21:10 +0200
Subject: [PATCH 1341/2024] cargo-crev: update to 0.19.2.

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

diff --git a/srcpkgs/cargo-crev/template b/srcpkgs/cargo-crev/template
index cdd1b547cb71..4b6121655aff 100644
--- a/srcpkgs/cargo-crev/template
+++ b/srcpkgs/cargo-crev/template
@@ -1,6 +1,6 @@
 # Template file for 'cargo-crev'
 pkgname=cargo-crev
-version=0.19.1
+version=0.19.2
 revision=1
 build_style=cargo
 make_install_args="--path ./cargo-crev"
@@ -11,7 +11,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MPL-2.0, MIT, Apache-2.0"
 homepage="https://github.com/crev-dev/cargo-crev"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=2595915cb7dfa63248c6cd86cb0648122d61ba36de8f3cec0860d692d89b3605
+checksum=d4b1ab0089ce25d73f2516209d80102e7e674dc851cf49f08e34a963d16e97ad
 
 post_install() {
 	vlicense LICENSE-APACHE

From 438ec3f6a48d2aea7e03cf58c246b721ccd3ceac Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 19 Apr 2021 10:13:51 -0400
Subject: [PATCH 1342/2024] maturin: update to 0.10.3.

---
 srcpkgs/maturin/patches/add-ppc-tier3.patch | 93 +++++++++++----------
 srcpkgs/maturin/template                    |  8 +-
 2 files changed, 53 insertions(+), 48 deletions(-)

diff --git a/srcpkgs/maturin/patches/add-ppc-tier3.patch b/srcpkgs/maturin/patches/add-ppc-tier3.patch
index cd5eae5c19bb..1dfa70e5bd98 100644
--- a/srcpkgs/maturin/patches/add-ppc-tier3.patch
+++ b/srcpkgs/maturin/patches/add-ppc-tier3.patch
@@ -19,65 +19,70 @@ index 228267f..8fa1c1e 100644
 -            if platform.machine() in ("ppc64le", "ppc64", "powerpc"):
 +            if platform.machine() in ("ppc64le", "ppc64", "powerpc", "ppcle", "ppc"):
                  cargo_args.extend(
-                     ["--no-default-features", "--features=auditwheel,log,human-panic"]
+                     ["--no-default-features", "--features=upload,log,human-panic"]
                  )
 diff --git src/target.rs src/target.rs
-index d13cc34..66cc823 100644
 --- src/target.rs
 +++ src/target.rs
-@@ -58,6 +58,8 @@ enum Arch {
-     ARMV7L,
-     POWERPC64LE,
-     POWERPC64,
-+    POWERPCLE,
-+    POWERPC,
+@@ -41,6 +41,8 @@
+     Armv7L,
+     Powerpc64Le,
+     Powerpc64,
++    PowerpcLe,
++    Powerpc,
      X86,
      X86_64,
- }
-@@ -69,6 +71,8 @@ impl fmt::Display for Arch {
-             Arch::ARMV7L => write!(f, "armv7l"),
-             Arch::POWERPC64LE => write!(f, "ppc64le"),
-             Arch::POWERPC64 => write!(f, "ppc64"),
-+            Arch::POWERPCLE => write!(f, "ppcle"),
-+            Arch::POWERPC => write!(f, "ppc"),
+     S390X,
+@@ -53,6 +55,8 @@
+             Arch::Armv7L => write!(f, "armv7l"),
+             Arch::Powerpc64Le => write!(f, "ppc64le"),
+             Arch::Powerpc64 => write!(f, "ppc64"),
++            Arch::PowerpcLe => write!(f, "ppcle"),
++            Arch::Powerpc => write!(f, "ppc"),
              Arch::X86 => write!(f, "i686"),
              Arch::X86_64 => write!(f, "x86_64"),
-         }
-@@ -109,6 +113,16 @@ impl Target {
-             platforms::target::Arch::X86 => Arch::X86,
-             platforms::target::Arch::ARM => Arch::ARMV7L,
-             platforms::target::Arch::AARCH64 => Arch::AARCH64,
+             Arch::S390X => write!(f, "s390x"),
+@@ -68,6 +72,8 @@
+             Arch::Armv7L,
+             Arch::Powerpc64,
+             Arch::Powerpc64Le,
++            Arch::PowerpcLe,
++            Arch::Powerpc,
+             Arch::X86,
+             Arch::X86_64,
+         ],
+@@ -125,6 +131,16 @@
+             {
+                 Arch::Powerpc64Le
+             }
 +            platforms::target::Arch::POWERPC
 +                if platform.target_triple.starts_with("powerpc-") =>
 +            {
-+                Arch::POWERPC
++                Arch::Powerpc
 +            }
 +            platforms::target::Arch::POWERPC
 +                if platform.target_triple.starts_with("powerpcle-") =>
 +            {
-+                Arch::POWERPCLE
++                Arch::PowerpcLe
 +            }
-             platforms::target::Arch::POWERPC64
-                 if platform.target_triple.starts_with("powerpc64-") =>
-             {
-@@ -147,6 +161,8 @@ impl Target {
+             unsupported => bail!("The architecture {} is not supported", unsupported),
+         };
+ 
+@@ -193,7 +209,7 @@
+     /// Returns the default Manylinux tag for this architecture
+     pub fn get_default_manylinux_tag(&self) -> Manylinux {
          match self.arch {
-             Arch::AARCH64 => 64,
-             Arch::ARMV7L => 32,
-+            Arch::POWERPC => 32,
-+            Arch::POWERPCLE => 32,
-             Arch::POWERPC64 => 64,
-             Arch::POWERPC64LE => 64,
+-            Arch::Aarch64 | Arch::Armv7L | Arch::Powerpc64 | Arch::Powerpc64Le | Arch::S390X => {
++            Arch::Aarch64 | Arch::Armv7L | Arch::Powerpc64 | Arch::Powerpc64Le | Arch::Powerpc | Arch::PowerpcLe | Arch::S390X => {
+                 Manylinux::Manylinux2014
+             }
+             Arch::X86 | Arch::X86_64 => Manylinux::Manylinux2010,
+@@ -207,6 +223,8 @@
+             Arch::Armv7L => 32,
+             Arch::Powerpc64 => 64,
+             Arch::Powerpc64Le => 64,
++            Arch::Powerpc => 32,
++            Arch::PowerpcLe => 32,
              Arch::X86 => 32,
-@@ -210,6 +226,8 @@ impl Target {
-             (OS::FreeBSD, _) => "", // according imp.get_suffixes(), there are no such
-             (OS::Linux, Arch::AARCH64) => "aarch64-linux-gnu", // aka armv8-linux-gnueabihf
-             (OS::Linux, Arch::ARMV7L) => "arm-linux-gnueabihf",
-+            (OS::Linux, Arch::POWERPC) => "powerpc-linux-gnu",
-+            (OS::Linux, Arch::POWERPCLE) => "powerpcle-linux-gnu",
-             (OS::Linux, Arch::POWERPC64) => "powerpc64-linux-gnu",
-             (OS::Linux, Arch::POWERPC64LE) => "powerpc64le-linux-gnu",
-             (OS::Linux, Arch::X86) => "i386-linux-gnu", // not i686
--- 
-2.30.0
-
+             Arch::X86_64 => 64,
+             Arch::S390X => 64,
diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index e97ae1cf099a..daa38d23537e 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -1,11 +1,11 @@
 # Template file for 'maturin'
 pkgname=maturin
-version=0.9.4
-revision=2
+version=0.10.3
+revision=1
 build_style=cargo
 # Disable the 'rustls' feature, which leads to bad platform compatibility
 # The list of enabled features should be reconciled with each new release
-configure_args="--no-default-features --features auditwheel,log,upload,human-panic"
+configure_args="--no-default-features --features log,upload,human-panic"
 hostmakedepends="python3-setuptools python3-toml"
 makedepends="openssl-devel"
 depends="python3-toml"
@@ -16,7 +16,7 @@ homepage="https://github.com/PyO3/maturin"
 # bump platforms version if it changes in Cargo.lock
 distfiles="${homepage}/archive/v${version}.tar.gz
  https://github.com/RustSec/platforms-crate/archive/v1.1.0.tar.gz"
-checksum="130d39cc6ecae9b1cb5602d262c1a8a8230c8ddb3496d2397c49e565c0fc731a
+checksum="48e42dc7b9da5d4aa523d6e6fb607434be4a3ac08639b9c278edf716255ed91b
  2524984c2ef547bb54515828e4afad0e781a439d74cf0197cf168ec6c818594c"
 
 post_extract() {

From c27121461563fe15457ee1e738b64174a5195599 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 19 Apr 2021 19:24:41 +0200
Subject: [PATCH 1343/2024] electron12: update to 12.0.4.

---
 ...mium-89-x11-ozone-fix-two-edge-cases.patch | 135 ------------------
 srcpkgs/electron12/template                   |   8 +-
 2 files changed, 4 insertions(+), 139 deletions(-)
 delete mode 100644 srcpkgs/electron12/files/patches/chromium-89-x11-ozone-fix-two-edge-cases.patch

diff --git a/srcpkgs/electron12/files/patches/chromium-89-x11-ozone-fix-two-edge-cases.patch b/srcpkgs/electron12/files/patches/chromium-89-x11-ozone-fix-two-edge-cases.patch
deleted file mode 100644
index 7fb586da169a..000000000000
--- a/srcpkgs/electron12/files/patches/chromium-89-x11-ozone-fix-two-edge-cases.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-From 5e3a738b1204941aab9f15c0eb3d06e20fefd96e Mon Sep 17 00:00:00 2001
-From: Scott Violet <sky@chromium.org>
-Date: Mon, 8 Mar 2021 21:07:39 +0000
-Subject: [PATCH] x11/ozone: fix two edge cases
-
-WindowTreeHost::OnHostMovedInPixels() may trigger a nested message
-loop (tab dragging), which when the stack unravels means this may
-be deleted. This adds an early out if this happens.
-
-X11WholeScreenMoveLoop has a similar issue, in so far as notifying
-the delegate may delete this.
-
-BUG=1185482
-TEST=WindowTreeHostPlatform.DeleteHostFromOnHostMovedInPixels
-
-Change-Id: Ieca1c90b3e4358da50b332abe2941fdbb50c5c25
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2743555
-Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
-Commit-Queue: Scott Violet <sky@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#860852}
----
- ui/aura/window_tree_host_platform.cc          | 10 ++++-
- ui/aura/window_tree_host_platform_unittest.cc | 40 ++++++++++++++++++-
- ui/base/x/x11_whole_screen_move_loop.cc       |  4 ++
- 3 files changed, 51 insertions(+), 3 deletions(-)
-
-diff --git a/ui/aura/window_tree_host_platform.cc b/ui/aura/window_tree_host_platform.cc
-index ce8395fe07..7589542026 100644
---- ui/aura/window_tree_host_platform.cc
-+++ ui/aura/window_tree_host_platform.cc
-@@ -214,13 +214,21 @@ void WindowTreeHostPlatform::OnBoundsChanged(const gfx::Rect& new_bounds) {
-   float current_scale = compositor()->device_scale_factor();
-   float new_scale = ui::GetScaleFactorForNativeView(window());
-   gfx::Rect old_bounds = bounds_in_pixels_;
-+  auto weak_ref = GetWeakPtr();
-   bounds_in_pixels_ = new_bounds;
--  if (bounds_in_pixels_.origin() != old_bounds.origin())
-+  if (bounds_in_pixels_.origin() != old_bounds.origin()) {
-     OnHostMovedInPixels(bounds_in_pixels_.origin());
-+    // Changing the bounds may destroy this.
-+    if (!weak_ref)
-+      return;
-+  }
-   if (bounds_in_pixels_.size() != old_bounds.size() ||
-       current_scale != new_scale) {
-     pending_size_ = gfx::Size();
-     OnHostResizedInPixels(bounds_in_pixels_.size());
-+    // Changing the size may destroy this.
-+    if (!weak_ref)
-+      return;
-   }
-   DCHECK_GT(on_bounds_changed_recursion_depth_, 0);
-   if (--on_bounds_changed_recursion_depth_ == 0) {
-diff --git a/ui/aura/window_tree_host_platform_unittest.cc b/ui/aura/window_tree_host_platform_unittest.cc
-index eda14e2f0c..4de039c88a 100644
---- ui/aura/window_tree_host_platform_unittest.cc
-+++ ui/aura/window_tree_host_platform_unittest.cc
-@@ -34,7 +34,7 @@ class TestWindowTreeHost : public WindowTreeHostPlatform {
- // OnHostWill/DidProcessBoundsChange. Additionally, this triggers a bounds
- // change from within OnHostResized(). Such a scenario happens in production
- // code.
--class TestWindowTreeHostObserver : public aura::WindowTreeHostObserver {
-+class TestWindowTreeHostObserver : public WindowTreeHostObserver {
-  public:
-   TestWindowTreeHostObserver(WindowTreeHostPlatform* host,
-                              ui::PlatformWindow* platform_window)
-@@ -51,7 +51,7 @@ class TestWindowTreeHostObserver : public aura::WindowTreeHostObserver {
-     return on_host_will_process_bounds_change_count_;
-   }
- 
--  // aura::WindowTreeHostObserver:
-+  // WindowTreeHostObserver:
-   void OnHostResized(WindowTreeHost* host) override {
-     if (!should_change_bounds_in_on_resized_)
-       return;
-@@ -92,5 +92,41 @@ TEST_F(WindowTreeHostPlatformTest, HostWillProcessBoundsChangeRecursion) {
-   EXPECT_EQ(1, observer.on_host_will_process_bounds_change_count());
- }
- 
-+// Deletes WindowTreeHostPlatform from OnHostMovedInPixels().
-+class DeleteHostWindowTreeHostObserver : public WindowTreeHostObserver {
-+ public:
-+  explicit DeleteHostWindowTreeHostObserver(
-+      std::unique_ptr<TestWindowTreeHost> host)
-+      : host_(std::move(host)) {
-+    host_->AddObserver(this);
-+  }
-+  ~DeleteHostWindowTreeHostObserver() override = default;
-+
-+  TestWindowTreeHost* host() { return host_.get(); }
-+
-+  // WindowTreeHostObserver:
-+  void OnHostMovedInPixels(WindowTreeHost* host,
-+                           const gfx::Point& new_origin_in_pixels) override {
-+    host_->RemoveObserver(this);
-+    host_.reset();
-+  }
-+
-+ private:
-+  std::unique_ptr<TestWindowTreeHost> host_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(DeleteHostWindowTreeHostObserver);
-+};
-+
-+// Verifies WindowTreeHostPlatform can be safely deleted when calling
-+// OnHostMovedInPixels().
-+// Regression test for https://crbug.com/1185482
-+TEST_F(WindowTreeHostPlatformTest, DeleteHostFromOnHostMovedInPixels) {
-+  std::unique_ptr<TestWindowTreeHost> host =
-+      std::make_unique<TestWindowTreeHost>();
-+  DeleteHostWindowTreeHostObserver observer(std::move(host));
-+  observer.host()->SetBoundsInPixels(gfx::Rect(1, 2, 3, 4));
-+  EXPECT_EQ(nullptr, observer.host());
-+}
-+
- }  // namespace
- }  // namespace aura
-diff --git a/ui/base/x/x11_whole_screen_move_loop.cc b/ui/base/x/x11_whole_screen_move_loop.cc
-index 5ed215db66..db678799db 100644
---- ui/base/x/x11_whole_screen_move_loop.cc
-+++ ui/base/x/x11_whole_screen_move_loop.cc
-@@ -78,9 +78,13 @@ X11WholeScreenMoveLoop::~X11WholeScreenMoveLoop() {
- void X11WholeScreenMoveLoop::DispatchMouseMovement() {
-   if (!last_motion_in_screen_)
-     return;
-+  auto weak_ref = weak_factory_.GetWeakPtr();
-   delegate_->OnMouseMovement(last_motion_in_screen_->root_location(),
-                              last_motion_in_screen_->flags(),
-                              last_motion_in_screen_->time_stamp());
-+  // The delegate may delete this during dispatch.
-+  if (!weak_ref)
-+    return;
-   last_motion_in_screen_.reset();
- }
- 
diff --git a/srcpkgs/electron12/template b/srcpkgs/electron12/template
index 7d1d14eec961..a45f3caf8827 100644
--- a/srcpkgs/electron12/template
+++ b/srcpkgs/electron12/template
@@ -1,8 +1,8 @@
 # Template file for 'electron12'
 pkgname=electron12
-version=12.0.2
+version=12.0.4
 _nodever=14.16.0
-_chromiumver=89.0.4389.90
+_chromiumver=89.0.4389.114
 revision=1
 archs="x86_64* i686* aarch64* ppc64le*"
 build_wrksrc="src"
@@ -31,8 +31,8 @@ homepage="https://electronjs.org"
 distfiles="https://github.com/electron/electron/archive/v$version.tar.gz>electron-${version}.tar.gz
  https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$_chromiumver.tar.xz
  https://github.com/nodejs/node/archive/v$_nodever.tar.gz>node-$_nodever.tar.gz"
-checksum="e4e15ec16bd8a1541b066b98c9b204da4c01be20aa18808b4fe77f22793458de
- 11c6089c5fdd921216aa4eb34b52818a9b091cad655a24aed0982d29e65b279a
+checksum="0be3860a58c1bfbf058dfdb3e6ab2bcefad5b060bac3b5c4718183446f998f33
+ f2f0abe9697a220a8545df74d832c6c8d85a4fb11845e7e398752d746e72ed00
  bcdf869b0743405515ee897b1047b5e851a717e426b4974d26537c9b10dfd53a"
 
 case "$XBPS_TARGET_MACHINE" in

From 5b53e7999a6211d9a1db34a4746e14782097f936 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Mon, 19 Apr 2021 19:34:28 +0200
Subject: [PATCH 1344/2024] libmirage: update to 3.2.5.

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

diff --git a/srcpkgs/libmirage/template b/srcpkgs/libmirage/template
index fdd18b43911b..283a27e223ca 100644
--- a/srcpkgs/libmirage/template
+++ b/srcpkgs/libmirage/template
@@ -1,6 +1,6 @@
 # Template file for 'libmirage'
 pkgname=libmirage
-version=3.2.4
+version=3.2.5
 revision=1
 build_style=cmake
 build_helper="gir"
@@ -11,8 +11,8 @@ short_desc="CD-ROM image access library written in C"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://cdemu.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/cdemu/libmirage-${version}.tar.bz2"
-checksum=fc5b3b8acd40d63c6194fba65c841b906a8074e89b14a10bf76f35d1c371a355
+distfiles="${SOURCEFORGE_SITE}/cdemu/libmirage-${version}.tar.xz"
+checksum=d50d97e15f180f99fddcdf388b0d9fec073fb8fe080ba6c69cd3674214141139
 
 build_options="gir"
 build_options_default="gir"

From 1986b358d4be440364ce9927bf08645f222a1612 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Mon, 19 Apr 2021 19:36:16 +0200
Subject: [PATCH 1345/2024] cdemu-daemon: update to 3.2.5.

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

diff --git a/srcpkgs/cdemu-daemon/template b/srcpkgs/cdemu-daemon/template
index 156083427b52..72e148a2db3b 100644
--- a/srcpkgs/cdemu-daemon/template
+++ b/srcpkgs/cdemu-daemon/template
@@ -1,6 +1,6 @@
 # Template file for 'cdemu-daemon'
 pkgname=cdemu-daemon
-version=3.2.4
+version=3.2.5
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config intltool"
@@ -10,7 +10,7 @@ short_desc="Userspace daemon part of the cdemu suite"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://cdemu.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/cdemu/cdemu-daemon-${version}.tar.bz2"
-checksum=a6b32d4b78631e5f449f05f8d26b7f2f46dd3e82387f5855ccabb4933592de0b
+distfiles="${SOURCEFORGE_SITE}/cdemu/cdemu-daemon-${version}.tar.xz"
+checksum=8d1053b195e8f9040c5628340740aa9bbfdd4891bac06fbc5eb5cd4ec376e699
 
 CFLAGS="-fcommon"

From ac9e693d2f67d4b02476969c0ea98b24609da281 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Mon, 19 Apr 2021 19:37:42 +0200
Subject: [PATCH 1346/2024] cdemu-client: update to 3.2.5.

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

diff --git a/srcpkgs/cdemu-client/template b/srcpkgs/cdemu-client/template
index c070247bc8b5..6f1fd82d2fe8 100644
--- a/srcpkgs/cdemu-client/template
+++ b/srcpkgs/cdemu-client/template
@@ -1,7 +1,7 @@
 # Template file for 'cdemu-client'
 pkgname=cdemu-client
-version=3.2.4
-revision=2
+version=3.2.5
+revision=1
 build_style=cmake
 configure_args="-DCMAKE_INSTALL_COMPLETIONSDIR=/usr/share/bash-completion/completions"
 hostmakedepends="python3 intltool pkg-config"
@@ -10,5 +10,5 @@ short_desc="Simple command-line client for controlling CDEmu daemon"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://cdemu.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/cdemu/cdemu-client-${version}.tar.bz2"
-checksum=be229d1f42f74ff3d81403e77a2210deb330354c0c153d9c7432dca0a4a29eeb
+distfiles="${SOURCEFORGE_SITE}/cdemu/cdemu-client-${version}.tar.xz"
+checksum=a72d85eb5bfcbced0108cd7c1827e50220f8f1d7998db30ceb0aa808366c39df

From 951269f3ec33e658659d83502a4e5ee55bd67046 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Mon, 19 Apr 2021 19:39:46 +0200
Subject: [PATCH 1347/2024] gcdemu: update to 3.2.5.

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

diff --git a/srcpkgs/gcdemu/template b/srcpkgs/gcdemu/template
index c24e581e3137..6d66b6ddf346 100644
--- a/srcpkgs/gcdemu/template
+++ b/srcpkgs/gcdemu/template
@@ -1,7 +1,7 @@
 # Template file for 'gcdemu'
 pkgname=gcdemu
-version=3.2.4
-revision=2
+version=3.2.5
+revision=1
 wrksrc="gcdemu-${version}"
 build_style=cmake
 hostmakedepends="python3 intltool"
@@ -10,5 +10,5 @@ short_desc="GTK application for controlling CDEmu daemon"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://cdemu.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/cdemu/gcdemu-${version}.tar.bz2"
-checksum=05f11ea40f65ed338cb274c30f4b4a04434a731ea2125785a56b071bd3954783
+distfiles="${SOURCEFORGE_SITE}/cdemu/gcdemu-${version}.tar.xz"
+checksum=844ef7099bce2ae67cb749f3bed5f52b3d03847bc9db8243e28aa15f095e77db

From a24954f9ec1cc7cffec21788b71d11a7768906fa Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Mon, 19 Apr 2021 19:41:20 +0200
Subject: [PATCH 1348/2024] vhba-module-dkms: update to 20210418.

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

diff --git a/srcpkgs/vhba-module-dkms/template b/srcpkgs/vhba-module-dkms/template
index adef34062875..0edd3fa266ae 100644
--- a/srcpkgs/vhba-module-dkms/template
+++ b/srcpkgs/vhba-module-dkms/template
@@ -1,6 +1,6 @@
 # Template file for 'vhba-module-dkms'
 pkgname=vhba-module-dkms
-version=20200106
+version=20210418
 revision=1
 wrksrc=vhba-module-${version}
 conf_files="/usr/lib/udev/rules.d/40-vhba.rules"
@@ -8,8 +8,8 @@ short_desc="Virtual (SCSI) HBA module used by cdemu"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://cdemu.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/cdemu/vhba-module-${version}.tar.bz2"
-checksum=59a3208a7b8fcf1bb03bd4d352ec89d06a8b6b84db325e31b0863b209dde3483
+distfiles="${SOURCEFORGE_SITE}/cdemu/vhba-module-${version}.tar.xz"
+checksum=18bd82ae27721ad1612b3c31accd81898ae326370964385ca52a2a66b67a3f85
 
 dkms_modules="vhba-module ${version}"
 depends="dkms"

From 8556ba3f2bd27e3f42c77a94da99d571534c9f9f Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Mon, 19 Apr 2021 19:54:36 +0200
Subject: [PATCH 1349/2024] gscan2pdf: update to 2.12.0.

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

diff --git a/srcpkgs/gscan2pdf/template b/srcpkgs/gscan2pdf/template
index 2ff0d3dbe66e..cbd283882433 100644
--- a/srcpkgs/gscan2pdf/template
+++ b/srcpkgs/gscan2pdf/template
@@ -1,6 +1,6 @@
 # Template file for 'gscan2pdf'.
 pkgname=gscan2pdf
-version=2.11.2
+version=2.12.0
 revision=1
 build_style=perl-module
 hostmakedepends="perl gettext"
@@ -16,7 +16,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-3.0-or-later"
 homepage="http://gscan2pdf.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=fc20d3d357e685e8348a90101261e1a893d9fa7a3915dc07f0d0c997f180cdb9
+checksum=a3c4666546e1a6346c906a24d547833f2293c7d3a3663f48daa1ec7c9539d103
 nocross=yes
 
 do_check() {

From d0fae32827bd58f5cb61c9e32ce54df6b0630a16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:21 +0200
Subject: [PATCH 1350/2024] ADMS-qucs: fix update file

---
 srcpkgs/ADMS-qucs/update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ADMS-qucs/update b/srcpkgs/ADMS-qucs/update
index 3024f00d9bb3..d30948469939 100644
--- a/srcpkgs/ADMS-qucs/update
+++ b/srcpkgs/ADMS-qucs/update
@@ -1 +1 @@
-pattern='/archive/release-\K[\d\.]+(?=\.tar\.gz)'
+pkgname=release

From 9cebdc129655b1a7b61648cd9b91326010bdd72b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:21 +0200
Subject: [PATCH 1351/2024] CImg: fix update file

---
 srcpkgs/CImg/update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/CImg/update b/srcpkgs/CImg/update
index 245115c10f47..d74e5398bf6a 100644
--- a/srcpkgs/CImg/update
+++ b/srcpkgs/CImg/update
@@ -1 +1 @@
-pattern="/archive/v.\K[\d.]+(?=\.tar\.gz)"
+pattern="/archive/refs/tags/v.\K[\d.]+(?=\.tar\.gz)"

From 64fb56a323398b021e1c072bd924903b35027759 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:21 +0200
Subject: [PATCH 1352/2024] EternalTerminal: fix update file

---
 srcpkgs/EternalTerminal/update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/EternalTerminal/update b/srcpkgs/EternalTerminal/update
index 159ce2ba9b85..4a7b675c6cb1 100644
--- a/srcpkgs/EternalTerminal/update
+++ b/srcpkgs/EternalTerminal/update
@@ -1 +1 @@
-pattern='/archive/et-v\K[\d\.]+(?=\.tar\.gz)'
+pattern='/archive/refs/tags/et-v?\K[\d\.]+(?=\.tar\.gz")'

From 0445f30e8c269b20d9fe8049738e15d50bee656c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:22 +0200
Subject: [PATCH 1353/2024] Fritzing: fix update file

---
 srcpkgs/Fritzing/update | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 srcpkgs/Fritzing/update

diff --git a/srcpkgs/Fritzing/update b/srcpkgs/Fritzing/update
deleted file mode 100644
index 6a0f1c7247ee..000000000000
--- a/srcpkgs/Fritzing/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://github.com/fritzing/fritzing-app/tags"
-pattern='/archive/(v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=b.tar.gz")'

From c758e21c8b497ebf1a6080d438795c0fd1e74c4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:22 +0200
Subject: [PATCH 1354/2024] ImageMagick: fix update file

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

diff --git a/srcpkgs/ImageMagick/update b/srcpkgs/ImageMagick/update
index 5509b6f1cc33..6a9f7e46a667 100644
--- a/srcpkgs/ImageMagick/update
+++ b/srcpkgs/ImageMagick/update
@@ -1 +1 @@
-pattern='/archive/\K[\d\.]+-\d+(?=\.tar\.gz)'
+pattern='/archive/refs/tags/\K[\d\.]+-\d+(?=\.tar\.gz)'

From c871fb76774fd6f71866452ce0571035e6bc8404 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:22 +0200
Subject: [PATCH 1355/2024] ImageMagick6: fix update file

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

diff --git a/srcpkgs/ImageMagick6/update b/srcpkgs/ImageMagick6/update
index 5509b6f1cc33..6a9f7e46a667 100644
--- a/srcpkgs/ImageMagick6/update
+++ b/srcpkgs/ImageMagick6/update
@@ -1 +1 @@
-pattern='/archive/\K[\d\.]+-\d+(?=\.tar\.gz)'
+pattern='/archive/refs/tags/\K[\d\.]+-\d+(?=\.tar\.gz)'

From ddd9c9a987137236f292ccad3090839b5fa95006 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:22 +0200
Subject: [PATCH 1356/2024] amdvlk: fix update file

---
 srcpkgs/amdvlk/update | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/amdvlk/update b/srcpkgs/amdvlk/update
index 01e297536682..11be2b5ae40a 100644
--- a/srcpkgs/amdvlk/update
+++ b/srcpkgs/amdvlk/update
@@ -1,2 +1,2 @@
-homepage="https://github.com/GPUOpen-Drivers/AMDVLK/tags"
-pattern='/archive/(v-?|AMDVLK-)?\K[\d\.Q]+(?=\.tar\.gz")'
+site="https://github.com/GPUOpen-Drivers/AMDVLK/tags"
+pattern='/archive/refs/tags/(v-?|AMDVLK-)?\K[\d\.Q]+(?=\.tar\.gz")'

From 2cb331d795df68b37250ad9fdffdb3fd1a58f423 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:22 +0200
Subject: [PATCH 1357/2024] clog: fix update file

---
 srcpkgs/clog/update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/clog/update b/srcpkgs/clog/update
index 21a41032cb08..3be38c05317d 100644
--- a/srcpkgs/clog/update
+++ b/srcpkgs/clog/update
@@ -1,2 +1,2 @@
 site="https://github.com/GothenburgBitFactory/clog/tags"
-pattern="/archive/v\K[\d.]+(?=\.tar\.gz)"
+pattern="/archive/refs/tags/v\K[\d.]+(?=\.tar\.gz)"

From 61bec626ffdab374e1a0d7513548afd93c3e77a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:22 +0200
Subject: [PATCH 1358/2024] darch: fix update file

---
 srcpkgs/darch/update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/darch/update b/srcpkgs/darch/update
index 3e24c4e12beb..2aa31766515a 100644
--- a/srcpkgs/darch/update
+++ b/srcpkgs/darch/update
@@ -1,2 +1,2 @@
 site="https://${go_import_path}/tags"
-pattern='/archive/(v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar\.gz")'
+pattern='/archive/refs/tags/(v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar\.gz")'

From 24ed5150f15f19485cefca4c445bb127d1442cc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:22 +0200
Subject: [PATCH 1359/2024] emacs-ess: fix update file

---
 srcpkgs/emacs-ess/update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/emacs-ess/update b/srcpkgs/emacs-ess/update
index 43eba209e67c..51179816ee58 100644
--- a/srcpkgs/emacs-ess/update
+++ b/srcpkgs/emacs-ess/update
@@ -1,2 +1,2 @@
 site="https://github.com/emacs-ess/ESS/tags"
-pattern="/archive/v\K[\d.]+(?=\.tar\.gz)"
+pattern="/archive/refs/tags/v\K[\d.]+(?=\.tar\.gz)"

From 47fbd157824540bb4d319463e93c6716d314de97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:23 +0200
Subject: [PATCH 1360/2024] faac: fix update file

---
 srcpkgs/faac/update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/faac/update b/srcpkgs/faac/update
index abec43abfdf5..ab6cfcfb3bc9 100644
--- a/srcpkgs/faac/update
+++ b/srcpkgs/faac/update
@@ -1 +1 @@
-pattern='/archive/(v?|\Q${pkgname}\E-)?\K[\d\._]+(?=\.tar\.gz")'
+pattern='/archive/refs/tags/(v?|\Q${pkgname}\E-)?\K[\d\._]+(?=\.tar\.gz")'

From f1db6cc2a417744041d808fc51ef1381f7406452 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:23 +0200
Subject: [PATCH 1361/2024] faad2: fix update file

---
 srcpkgs/faad2/update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/faad2/update b/srcpkgs/faad2/update
index a900cfb7b0fe..83efe00aab7f 100644
--- a/srcpkgs/faad2/update
+++ b/srcpkgs/faad2/update
@@ -1,2 +1,2 @@
-pattern='/archive/(v?|\Q${pkgname}\E-)?\K[\d\._]+(?=\.tar\.gz")'
+pattern='/archive/refs/tags/(v?|\Q${pkgname}\E-)?\K[\d\._]+(?=\.tar\.gz")'
 ignore="2003*"

From a9305a5b15672b9ce016215c9dce3bfd48d75638 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:23 +0200
Subject: [PATCH 1362/2024] fingerprint-gui: fix update file

---
 srcpkgs/fingerprint-gui/update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fingerprint-gui/update b/srcpkgs/fingerprint-gui/update
index f9b87e4af854..3ed0023886c0 100644
--- a/srcpkgs/fingerprint-gui/update
+++ b/srcpkgs/fingerprint-gui/update
@@ -1 +1 @@
-pattern="/archive/v\K[\d.]+(?=.*\.tar\.gz)"
+pattern="/archive/refs/tags/v\K[\d.]+(?=.*\.tar\.gz)"

From 3d7c98694c25fcca25b7d40fe72a0a86d1be8293 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:23 +0200
Subject: [PATCH 1363/2024] fntsample: fix update file

---
 srcpkgs/fntsample/update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fntsample/update b/srcpkgs/fntsample/update
index b3e6fa03daa2..5f8587f4b49c 100644
--- a/srcpkgs/fntsample/update
+++ b/srcpkgs/fntsample/update
@@ -1 +1 @@
-pattern='/archive/(release/|v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar\.gz")'
+pattern='/archive/refs/tags/(release/|v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar\.gz")'

From ebd2d898c056e6cfa75f98eca5a7930b73851a25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:23 +0200
Subject: [PATCH 1364/2024] godot: fix update file

---
 srcpkgs/godot/update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/godot/update b/srcpkgs/godot/update
index a706f9b4a0b7..6aa1db057e86 100644
--- a/srcpkgs/godot/update
+++ b/srcpkgs/godot/update
@@ -1 +1 @@
-pattern='/archive/(v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=-stable\.tar\.gz")'
+pattern='/archive/refs/tags/(v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=-stable\.tar\.gz")'

From b47848ca7de602eb6babcff11796b9682b5a6d4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:23 +0200
Subject: [PATCH 1365/2024] gopls: fix update file

---
 srcpkgs/gopls/update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gopls/update b/srcpkgs/gopls/update
index b945aba5c703..c729b1e65ee1 100644
--- a/srcpkgs/gopls/update
+++ b/srcpkgs/gopls/update
@@ -1 +1 @@
-pattern='/archive/\Q'"$pkgname"'\E/v\K[\d\.]+(?=\.tar\.gz")'
+pattern='/archive/refs/tags/\Q'"$pkgname"'\E/v\K[\d\.]+(?=\.tar\.gz")'

From 93b0616cf436acd5322e6ffdbfe078faf069768f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:23 +0200
Subject: [PATCH 1366/2024] gpm: fix update file

---
 srcpkgs/gpm/update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gpm/update b/srcpkgs/gpm/update
index c25c7c578cbf..fdd4202697b8 100644
--- a/srcpkgs/gpm/update
+++ b/srcpkgs/gpm/update
@@ -1,3 +1,3 @@
 site="https://github.com/telmich/gpm/tags"
-pattern='archive/\K[\d.]+(?=\.tar\.gz)'
+pattern='archive/refs/tags/\K[\d.]+(?=\.tar\.gz)'
 ignore="1.99*"

From 4fdfbd50993562effc14914df4f83ff037fdbeaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:24 +0200
Subject: [PATCH 1367/2024] gzdoom: fix update file

---
 srcpkgs/gzdoom/update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gzdoom/update b/srcpkgs/gzdoom/update
index af80b9d239c7..94090e5eb8e4 100644
--- a/srcpkgs/gzdoom/update
+++ b/srcpkgs/gzdoom/update
@@ -1 +1 @@
-pattern='/archive/(g|v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar\.gz")'
+pattern='/archive/refs/tags/(g|v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar\.gz")'

From 3feb8395bc64384962f3f55849aba5bb25edcd76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:24 +0200
Subject: [PATCH 1368/2024] inxi: fix update file

---
 srcpkgs/inxi/update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/inxi/update b/srcpkgs/inxi/update
index 78285d51b910..1090ea225549 100644
--- a/srcpkgs/inxi/update
+++ b/srcpkgs/inxi/update
@@ -1,2 +1,2 @@
-pattern='/inxi/archive/\K[-.\d]+(?=\.tar)'
+pattern='/inxi/archive/refs/tags/\K[-.\d]+(?=\.tar)'
 version=${wrksrc##*inxi-}

From d2fc949a6c514c65f7487c42493e0bbb2fdcd39d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:24 +0200
Subject: [PATCH 1369/2024] iverilog: fix update file

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

diff --git a/srcpkgs/iverilog/update b/srcpkgs/iverilog/update
index 15c39abe7f66..d2320226fb43 100644
--- a/srcpkgs/iverilog/update
+++ b/srcpkgs/iverilog/update
@@ -1 +1 @@
-pattern='/archive/(v?|\Q'"$pkgname"'\E-)?\K[\d\_]+(?=\.tar\.gz")'
+pattern='/archive/refs/tags/(v?|\Q'"$pkgname"'\E-)?\K[\d\_]+(?=\.tar\.gz")'

From db86f1f4ba1afb339783235aa170224c554b740e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:24 +0200
Subject: [PATCH 1370/2024] j4-dmenu-desktop: fix update file

---
 srcpkgs/j4-dmenu-desktop/update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/j4-dmenu-desktop/update b/srcpkgs/j4-dmenu-desktop/update
index 80dfab740522..d142c0f52388 100644
--- a/srcpkgs/j4-dmenu-desktop/update
+++ b/srcpkgs/j4-dmenu-desktop/update
@@ -1 +1 @@
-pattern='/archive/(v?|\Q'"$pkgname"'\E-)?\Kr[\d\.]+(?=\.tar\.gz")'
+pattern='/archive/refs/tags/(v?|\Q'"$pkgname"'\E-)?r\K[\d\.]+(?=\.tar\.gz")'

From 8e6bc18e977ec8cb076d32549a35f41c79033d8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:24 +0200
Subject: [PATCH 1371/2024] kotlin-bin: fix update file

---
 srcpkgs/kotlin-bin/update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kotlin-bin/update b/srcpkgs/kotlin-bin/update
index 0c9eae2015b8..99fb0b2417f6 100644
--- a/srcpkgs/kotlin-bin/update
+++ b/srcpkgs/kotlin-bin/update
@@ -1,2 +1,2 @@
 site=https://github.com/JetBrains/kotlin/releases/latest
-pattern='/archive/(v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar\.gz")'
+pattern='/archive/refs/tags/(v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar\.gz")'

From dce692b2e6be58fadc05d56b1179068c51fd699e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:24 +0200
Subject: [PATCH 1372/2024] libgit2: fix update file

---
 srcpkgs/libgit2/update | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 srcpkgs/libgit2/update

diff --git a/srcpkgs/libgit2/update b/srcpkgs/libgit2/update
deleted file mode 100644
index 537536a15c67..000000000000
--- a/srcpkgs/libgit2/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://github.com/libgit2/libgit2/tags"
-pattern='archive/v?\K[\d.]+(?=\.tar\.gz)'

From ab18f142aae3d6ad177141046ddf15a46fb5c287 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:25 +0200
Subject: [PATCH 1373/2024] libkeybinder3: fix update file

---
 srcpkgs/libkeybinder3/update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libkeybinder3/update b/srcpkgs/libkeybinder3/update
index 13df6f8e9035..93e082e81965 100644
--- a/srcpkgs/libkeybinder3/update
+++ b/srcpkgs/libkeybinder3/update
@@ -1 +1 @@
-pattern='/archive/(keybinder-3.0-v|v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar\.gz")'
+pattern='/archive/refs/tags/(keybinder-3.0-v|v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar\.gz")'

From 3bbc0011f80b27a9459e0e1070f087b43f0b161f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:25 +0200
Subject: [PATCH 1374/2024] libluv: fix update file

---
 srcpkgs/libluv/update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libluv/update b/srcpkgs/libluv/update
index 827bac4dbe75..7f8c42dd595f 100644
--- a/srcpkgs/libluv/update
+++ b/srcpkgs/libluv/update
@@ -1 +1 @@
-pattern='/archive/(v?|\Q'"$pkgname"'\E-)?\K[-\d\.]+(?=\.tar\.gz")'
+pattern='/archive/refs/tags/(v?|\Q'"$pkgname"'\E-)?\K[-\d\.]+(?=\.tar\.gz")'

From e7a885d1a32a499beaa912d5a923696402d0c776 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:25 +0200
Subject: [PATCH 1375/2024] libmygui: fix update file

---
 srcpkgs/libmygui/update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libmygui/update b/srcpkgs/libmygui/update
index 69f0d6b04040..ce632c5dedd5 100644
--- a/srcpkgs/libmygui/update
+++ b/srcpkgs/libmygui/update
@@ -1,2 +1,2 @@
 pkgname=MyGUI
-pattern='/archive/(v?|\Q'"$pkgname"'\E)?\K[\d\.]+(?=\.tar\.gz")'
+pattern='/archive/refs/tags/(v?|\Q'"$pkgname"'\E)?\K[\d\.]+(?=\.tar\.gz")'

From 70ff3d15f6eebfa55514bd65c944e6e5d6af0c37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:25 +0200
Subject: [PATCH 1376/2024] libui: fix update file

---
 srcpkgs/libui/update | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/libui/update b/srcpkgs/libui/update
index c8b43cebe119..ce73d30872ed 100644
--- a/srcpkgs/libui/update
+++ b/srcpkgs/libui/update
@@ -1,2 +1 @@
-pattern='/libui/archive/[a-z]+\K[\d+.]+(?=.tar.gz)'
-version="${version/*[:alpha:]/}"
+pattern='/libui/archive/refs/tags/\K[a-z]+[\d+.]+(?=.tar.gz)'

From f5776af93f708bdce8fee8a8eb5a3f2870790aa0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:25 +0200
Subject: [PATCH 1377/2024] litecoin: fix update file

---
 srcpkgs/litecoin/update | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 srcpkgs/litecoin/update

diff --git a/srcpkgs/litecoin/update b/srcpkgs/litecoin/update
deleted file mode 100644
index 9271e0020d77..000000000000
--- a/srcpkgs/litecoin/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://github.com/litecoin-project/litecoin/tags"
-pattern='archive/v?\K[\d.]+(?=\.tar\.gz)'

From e30060b79c8a06b7032b4466f24c35e5d0075f7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:25 +0200
Subject: [PATCH 1378/2024] liteide: fix update file

---
 srcpkgs/liteide/update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/liteide/update b/srcpkgs/liteide/update
index 53046f13f4ba..0dbd917d6eef 100644
--- a/srcpkgs/liteide/update
+++ b/srcpkgs/liteide/update
@@ -1 +1 @@
-pattern='/archive/(x|v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar\.gz")'
+pattern='/archive/refs/tags/(x|v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar\.gz")'

From 0414b3fd99e12700fe48c7dc2dd66c1d3880bb67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:25 +0200
Subject: [PATCH 1379/2024] lua54-luafilesystem: fix update file

---
 srcpkgs/lua54-luafilesystem/update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/lua54-luafilesystem/update b/srcpkgs/lua54-luafilesystem/update
index 7de75e7fbf1b..00a38fcaac60 100644
--- a/srcpkgs/lua54-luafilesystem/update
+++ b/srcpkgs/lua54-luafilesystem/update
@@ -1,2 +1,2 @@
-pattern='/archive/(v?|\Q'"$pkgname"'\E-)?\K[\d\._]+(?=\.tar\.gz")'
+pattern='/archive/refs/tags/(v?|\Q'"$pkgname"'\E-)?\K[\d._]+(?=\.tar\.gz")'
 version=${version//_/.}

From 1f8304787815eac7c8beb9b4773c3d39f5c442f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:26 +0200
Subject: [PATCH 1380/2024] minetest: fix update file

---
 srcpkgs/minetest/update | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 srcpkgs/minetest/update

diff --git a/srcpkgs/minetest/update b/srcpkgs/minetest/update
deleted file mode 100644
index b43b0d98ddf8..000000000000
--- a/srcpkgs/minetest/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://github.com/minetest/minetest/tags"
-pattern='archive/\K[\d.]+(?=\.tar\.gz)'

From 68197658911614aa590f816b964a31cbc58e436d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:26 +0200
Subject: [PATCH 1381/2024] miniflux: fix update file

---
 srcpkgs/miniflux/update | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 srcpkgs/miniflux/update

diff --git a/srcpkgs/miniflux/update b/srcpkgs/miniflux/update
deleted file mode 100644
index 6b32aaff118e..000000000000
--- a/srcpkgs/miniflux/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://github.com/miniflux/miniflux/tags"
-pattern='archive/v?\K[\d.]+(?=\.tar\.gz)'

From b932e90110449095e9e812d2a2b131a4d92fb7e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:26 +0200
Subject: [PATCH 1382/2024] minio: fix update file

---
 srcpkgs/minio/update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/minio/update b/srcpkgs/minio/update
index 21bb98cb1c3e..e45793c85463 100644
--- a/srcpkgs/minio/update
+++ b/srcpkgs/minio/update
@@ -1 +1 @@
-pattern="/archive/RELEASE\.\K[-\d]+(?=T[-\d]+Z\.tar\.gz)"
+pattern="/archive/refs/tags/RELEASE\.\K[-\d]+(?=T[-\d]+Z\.tar\.gz)"

From f1d1a4dbeccfd3bd9154104093584b5841598675 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:26 +0200
Subject: [PATCH 1383/2024] miruo: fix update file

---
 srcpkgs/miruo/update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/miruo/update b/srcpkgs/miruo/update
index be440bcc478d..97780a418e6e 100644
--- a/srcpkgs/miruo/update
+++ b/srcpkgs/miruo/update
@@ -1 +1 @@
-pattern='/archive/(v?|\Q'"$pkgname"'\E-)?\K[\d\.]+[a-z]*(?=\.tar\.gz")'
+pattern='/archive/refs/tags/(v?|\Q'"$pkgname"'\E-)?\K[\d\.]+[a-z]*(?=\.tar\.gz")'

From bd145d47a0d69d3099a42fffaa984015200f64be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:26 +0200
Subject: [PATCH 1384/2024] mixxx: fix update file

---
 srcpkgs/mixxx/update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mixxx/update b/srcpkgs/mixxx/update
index 24fd03366c3a..d30948469939 100644
--- a/srcpkgs/mixxx/update
+++ b/srcpkgs/mixxx/update
@@ -1 +1 @@
-pattern='/archive/release-?\K[\d\.]+(?=\.tar\.gz")'
+pkgname=release

From eb88e75dc28ca1dcd4b5f38799c2df024db92d96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:26 +0200
Subject: [PATCH 1385/2024] mkinitcpio-encryptssh: fix update file

---
 srcpkgs/mkinitcpio-encryptssh/update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mkinitcpio-encryptssh/update b/srcpkgs/mkinitcpio-encryptssh/update
index 5f447f65e007..443fa499fc76 100644
--- a/srcpkgs/mkinitcpio-encryptssh/update
+++ b/srcpkgs/mkinitcpio-encryptssh/update
@@ -1 +1 @@
-pattern='/archive/(v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\-1.tar\.gz")'
+pattern='/archive/refs/tags/(v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\-1.tar\.gz")'

From 374fc319bdc8520e46ceb7b83ca50f40c095b568 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:26 +0200
Subject: [PATCH 1386/2024] monero-gui: fix update file

---
 srcpkgs/monero-gui/update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monero-gui/update b/srcpkgs/monero-gui/update
index 32c77fffe977..5254358a1411 100644
--- a/srcpkgs/monero-gui/update
+++ b/srcpkgs/monero-gui/update
@@ -1,2 +1,2 @@
 site="https://github.com/monero-project/monero-gui/tags"
-pattern='/archive/(v?|\Qmonero-gui\E-)?\K[\d\.]+(?=\.tar\.gz")'
+pattern='/archive/refs/tags/(v?|\Qmonero-gui\E-)?\K[\d\.]+(?=\.tar\.gz")'

From 78f122983c7b5d768f159cfcdc132f809860e5bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:27 +0200
Subject: [PATCH 1387/2024] monero: fix update file

---
 srcpkgs/monero/update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/monero/update b/srcpkgs/monero/update
index b3ec8a7c5723..2f68aaf68b71 100644
--- a/srcpkgs/monero/update
+++ b/srcpkgs/monero/update
@@ -1,2 +1,2 @@
 site="https://github.com/monero-project/monero/tags"
-pattern='/archive/(v?|\Qmonero\E-)?\K[\d\.]+(?=\.tar\.gz")'
+pattern='/archive/refs/tags/(v?|\Qmonero\E-)?\K[\d\.]+(?=\.tar\.gz")'

From 835a3144db9aa24298bb0620394a574de328d8ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:27 +0200
Subject: [PATCH 1388/2024] muffin: fix update file

---
 srcpkgs/muffin/update | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 srcpkgs/muffin/update

diff --git a/srcpkgs/muffin/update b/srcpkgs/muffin/update
deleted file mode 100644
index 413af3c979e7..000000000000
--- a/srcpkgs/muffin/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://github.com/linuxmint/${pkgname}/tags"
-pattern='archive/\K[\d.]+(?=\.tar\.gz)'

From 8264ce1ec31b6902e00c05d0298ebbdb498d970a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:27 +0200
Subject: [PATCH 1389/2024] namecoin: fix update file

---
 srcpkgs/namecoin/update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/namecoin/update b/srcpkgs/namecoin/update
index 0bfaf0d3f8b7..10eae03a7eb4 100644
--- a/srcpkgs/namecoin/update
+++ b/srcpkgs/namecoin/update
@@ -1 +1 @@
-pattern='/archive/(nc|v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar\.gz")'
+pattern='/archive/refs/tags/(nc|v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar\.gz")'

From 28a8d4b0ea7f1bec34d7681043ef389890d10f2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:27 +0200
Subject: [PATCH 1390/2024] nemo: fix update file

---
 srcpkgs/nemo/update | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 srcpkgs/nemo/update

diff --git a/srcpkgs/nemo/update b/srcpkgs/nemo/update
deleted file mode 100644
index 413af3c979e7..000000000000
--- a/srcpkgs/nemo/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://github.com/linuxmint/${pkgname}/tags"
-pattern='archive/\K[\d.]+(?=\.tar\.gz)'

From 7067329fc654c2749d20aa34bd10435216777045 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:27 +0200
Subject: [PATCH 1391/2024] ngircd: fix update file

---
 srcpkgs/ngircd/update | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 srcpkgs/ngircd/update

diff --git a/srcpkgs/ngircd/update b/srcpkgs/ngircd/update
deleted file mode 100644
index 43e3e89b15ba..000000000000
--- a/srcpkgs/ngircd/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='/archive/(v?|\Q'"$pkgname"'\E-)rel-?\K[\d\.]+(?=\.tar\.gz")'

From a3e157f66c5e7143838e0056a9428e2f3d438eb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:27 +0200
Subject: [PATCH 1392/2024] ninja: fix update file

---
 srcpkgs/ninja/update | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 srcpkgs/ninja/update

diff --git a/srcpkgs/ninja/update b/srcpkgs/ninja/update
deleted file mode 100644
index b46171ff8b4c..000000000000
--- a/srcpkgs/ninja/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://github.com/martine/ninja/tags"
-pattern='archive/v\K[\d.]+(?=\.tar\.gz)'

From 45dca44434f876d27eb54b46b149f55bf6132bb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:27 +0200
Subject: [PATCH 1393/2024] nsjail: fix update file

---
 srcpkgs/nsjail/update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nsjail/update b/srcpkgs/nsjail/update
index 89729b202596..88a052a226f0 100644
--- a/srcpkgs/nsjail/update
+++ b/srcpkgs/nsjail/update
@@ -1,2 +1,2 @@
 site="https://github.com/google/nsjail/tags"
-pattern="archive/\K[0-9.]+(?=.tar.gz)"
+pattern="archive/refs/tags/\K[0-9.]+(?=.tar.gz)"

From 17f5d060d6de8b3a0eeac9257816672aae6e44e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:28 +0200
Subject: [PATCH 1394/2024] otfcc: fix update file

---
 srcpkgs/otfcc/update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/otfcc/update b/srcpkgs/otfcc/update
index b357a766c2ba..237d271a07fe 100644
--- a/srcpkgs/otfcc/update
+++ b/srcpkgs/otfcc/update
@@ -1,2 +1,2 @@
-pattern='/archive/(v?|\Q'"$pkgname"'\E-)?\K[-\d\.a-z]+(?=\.tar\.gz")'
+pattern='/archive/refs/tags/(v?|\Q'"$pkgname"'\E-)?\K[-\d\.a-z]+(?=\.tar\.gz")'
 version="${version/alpha/.alpha}"

From 310c757750da19df2c406780478790c12460c9ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:28 +0200
Subject: [PATCH 1395/2024] pgbackrest: fix update file

---
 srcpkgs/pgbackrest/update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pgbackrest/update b/srcpkgs/pgbackrest/update
index 25ca35b6e461..7cd47a23caf4 100644
--- a/srcpkgs/pgbackrest/update
+++ b/srcpkgs/pgbackrest/update
@@ -1 +1 @@
-pattern='/archive/(v?|\Qrelease/\E)?\K[\d\.]+(?=\.tar\.gz")'
+pattern='/archive/refs/tags/(v?|\Qrelease/\E)?\K[\d\.]+(?=\.tar\.gz")'

From 0770839209ab52826ae13d216505ddd37117e8d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:28 +0200
Subject: [PATCH 1396/2024] plex-media-player: fix update file

---
 srcpkgs/plex-media-player/update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/plex-media-player/update b/srcpkgs/plex-media-player/update
index e66523dbbc6f..5adfae106695 100644
--- a/srcpkgs/plex-media-player/update
+++ b/srcpkgs/plex-media-player/update
@@ -1 +1 @@
-pattern='/archive/v?\K[\d+\.]+'
+pattern='/archive/refs/tags/v?\K[\d+\.]+'

From 8b05d78f919241c06347b8cbf1dbfe1531d4c07d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:28 +0200
Subject: [PATCH 1397/2024] poedit: fix update file

---
 srcpkgs/poedit/update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/poedit/update b/srcpkgs/poedit/update
index 02aa4fcb6e4b..93e8bf47ac20 100644
--- a/srcpkgs/poedit/update
+++ b/srcpkgs/poedit/update
@@ -1 +1 @@
-pattern='/archive/(v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=-oss\.tar\.gz")'
+pattern='/archive/refs/tags/(v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=-oss\.tar\.gz")'

From 1466561dd9b63b9e742a8f9dd6678fd6ae57c6b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:28 +0200
Subject: [PATCH 1398/2024] portaudio: fix update file

---
 srcpkgs/portaudio/update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/portaudio/update b/srcpkgs/portaudio/update
index 6d40d6109f6a..c01890e415c0 100644
--- a/srcpkgs/portaudio/update
+++ b/srcpkgs/portaudio/update
@@ -1,2 +1,2 @@
-site='http://www.portaudio.com/download.html'
+site='http://files.portaudio.com/download.html'
 pattern='archives/pa_stable_v\K[0-9_]+(?=\.tgz)'

From e6cb5184ec7c70aec644d0f20961dfa6361ea7c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:28 +0200
Subject: [PATCH 1399/2024] ppsspp: fix update file

---
 srcpkgs/ppsspp/update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ppsspp/update b/srcpkgs/ppsspp/update
index ae1709d2460c..2c799782e187 100644
--- a/srcpkgs/ppsspp/update
+++ b/srcpkgs/ppsspp/update
@@ -1,2 +1,2 @@
 site=https://github.com/hrydgard/ppsspp/tags
-pattern='/archive/(v?|ppsspp-)?\K[\d\.]+(?=\.tar\.gz")'
+pattern='/archive/refs/tags/(v?|ppsspp-)?\K[\d\.]+(?=\.tar\.gz")'

From 37f8829ceccb1533253effbe155470a73edaf557 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:29 +0200
Subject: [PATCH 1400/2024] qt5-fsarchiver: fix update file

---
 srcpkgs/qt5-fsarchiver/update | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/qt5-fsarchiver/update b/srcpkgs/qt5-fsarchiver/update
index ce0d14b4f46e..fcea13f78036 100644
--- a/srcpkgs/qt5-fsarchiver/update
+++ b/srcpkgs/qt5-fsarchiver/update
@@ -1,2 +1,3 @@
 version=$_realversion
-pattern="qt5-fsarchiver-\K[\d\.]+\-[0-9]"
+site=https://sourceforge.net/projects/qt-fsarchiver/rss?limit=200
+pattern="qt-fsarchiver-\K[\d\.]+\-[0-9]+"

From bd410552eeb3dbcb33f8a98bc59ee3aba1dcf788 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:29 +0200
Subject: [PATCH 1401/2024] racket: fix update file

---
 srcpkgs/racket/update | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 srcpkgs/racket/update

diff --git a/srcpkgs/racket/update b/srcpkgs/racket/update
deleted file mode 100644
index cdb6d0fc89f3..000000000000
--- a/srcpkgs/racket/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://github.com/$pkgname/$pkgname/tags"
-pattern='/archive/(v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar\.gz")'

From 8781cec0debf24b14dd61c51c2d0f9cd52f6ca53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:29 +0200
Subject: [PATCH 1402/2024] ruby-sync: fix update file

---
 srcpkgs/ruby-sync/update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-sync/update b/srcpkgs/ruby-sync/update
index 4334aa7d251a..7f88b04b5984 100644
--- a/srcpkgs/ruby-sync/update
+++ b/srcpkgs/ruby-sync/update
@@ -1,2 +1,2 @@
 site='https://github.com/ruby/sync/tags'
-pattern='/archive/(v?|\Qruby-sync\E-)?\K[\d\.]+(?=\.tar\.gz")'
+pattern='/archive/refs/tags/(v?|\Qruby-sync\E-)?\K[\d\.]+(?=\.tar\.gz")'

From a95dfeb9c6b0208dc4f2049dfa927fd174e2acfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:29 +0200
Subject: [PATCH 1403/2024] s3cmd: fix update file

---
 srcpkgs/s3cmd/update | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 srcpkgs/s3cmd/update

diff --git a/srcpkgs/s3cmd/update b/srcpkgs/s3cmd/update
deleted file mode 100644
index a36dd1db2299..000000000000
--- a/srcpkgs/s3cmd/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='archive/v?\K[\d.]+(-rc\d)?(?=\.tar\.gz)'

From 9e9ef58eeb9cd026ab721a4131480b09d32ab413 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:29 +0200
Subject: [PATCH 1404/2024] sasm: fix update file

---
 srcpkgs/sasm/update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sasm/update b/srcpkgs/sasm/update
index 2f4cde77b8f8..e87dd25c3d26 100644
--- a/srcpkgs/sasm/update
+++ b/srcpkgs/sasm/update
@@ -1 +1 @@
-pattern=".*/archive/\K.+(?=\.tar\.gz)"
+pattern=".*/archive/refs/tags/v\K.+(?=\.tar\.gz)"

From 0d3922dccb41df50a772f62a9a21b5337fd486ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:29 +0200
Subject: [PATCH 1405/2024] sc3-plugins: fix update file

---
 srcpkgs/sc3-plugins/update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sc3-plugins/update b/srcpkgs/sc3-plugins/update
index 5dd21bb5654a..cbd0b48a3664 100644
--- a/srcpkgs/sc3-plugins/update
+++ b/srcpkgs/sc3-plugins/update
@@ -1,3 +1,3 @@
 site="https://github.com/supercollider/sc3-plugins/tags"
-pattern='/archive/(Version-?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar\.gz")'
+pattern='/archive/refs/tags/(Version-?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar\.gz")'
 ignore="*beta*"

From 2b2a02514ab6a5246b9a51ddc504e8ca17e9a884 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:29 +0200
Subject: [PATCH 1406/2024] sslh: fix update file

---
 srcpkgs/sslh/update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sslh/update b/srcpkgs/sslh/update
index 10395c809d39..5cc0bafd03c3 100644
--- a/srcpkgs/sslh/update
+++ b/srcpkgs/sslh/update
@@ -1 +1 @@
-pattern='sslh/archive/v\K[\d.]+[a-z]?(?=\.tar)'
+site=https://www.rutschle.net/tech/sslh/download.html

From b60017414e55d43612aa3596ccfb65808b4a4160 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:30 +0200
Subject: [PATCH 1407/2024] tbb: fix update file

---
 srcpkgs/tbb/update | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 srcpkgs/tbb/update

diff --git a/srcpkgs/tbb/update b/srcpkgs/tbb/update
deleted file mode 100644
index 8c8c0ba230bf..000000000000
--- a/srcpkgs/tbb/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="archive/\K[0-9_U]+(?=\.tar\.gz)"

From d604f520aa72f0b5f78f35d9fcd1f42ab7d554e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:30 +0200
Subject: [PATCH 1408/2024] testssl.sh: fix update file

---
 srcpkgs/testssl.sh/update | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 srcpkgs/testssl.sh/update

diff --git a/srcpkgs/testssl.sh/update b/srcpkgs/testssl.sh/update
deleted file mode 100644
index c9f2dabe732e..000000000000
--- a/srcpkgs/testssl.sh/update
+++ /dev/null
@@ -1,2 +0,0 @@
-pattern='/archive/(v?|\Q'"$pkgname"'\E-)?\K[-\d\.]+(?=\.tar\.gz")'
-version=${version/r/.}

From d363596636ff91f2f827e94e5507d8851954b6f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:30 +0200
Subject: [PATCH 1409/2024] tlp: fix update file

---
 srcpkgs/tlp/update | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 srcpkgs/tlp/update

diff --git a/srcpkgs/tlp/update b/srcpkgs/tlp/update
deleted file mode 100644
index 87c493d30c66..000000000000
--- a/srcpkgs/tlp/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site='https://github.com/linrunner/TLP/releases'
-pattern='archive/\K[\d.]+(?=\.tar\.gz)'

From 72aadf199766da82324c5db8c499170effd95a34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:30 +0200
Subject: [PATCH 1410/2024] transmission: fix update file

---
 srcpkgs/transmission/update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/transmission/update b/srcpkgs/transmission/update
index d5656f4ed0a4..0791911df73b 100644
--- a/srcpkgs/transmission/update
+++ b/srcpkgs/transmission/update
@@ -1,2 +1,2 @@
 site="https://github.com/transmission/transmission/tags"
-pattern='/archive/(v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar\.gz")'
+pattern='/archive/refs/tags/(v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar\.gz")'

From 2d5f436da0bebdb334f0db12dacb8e897b58eae3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:30 +0200
Subject: [PATCH 1411/2024] urbanterror-data: fix update file

---
 srcpkgs/urbanterror-data/update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/urbanterror-data/update b/srcpkgs/urbanterror-data/update
index d44392c320c5..354e81448682 100644
--- a/srcpkgs/urbanterror-data/update
+++ b/srcpkgs/urbanterror-data/update
@@ -1,2 +1,2 @@
 site="https://github.com/Barbatos/ioq3-for-UrbanTerror-4/tags"
-pattern='/archive/(release-?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar\.gz")'
+pattern='/archive/refs/tags/(release-?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar\.gz")'

From 05aebd0c1a1061ba68c36988524849f2233a971f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:30 +0200
Subject: [PATCH 1412/2024] urbanterror: fix update file

---
 srcpkgs/urbanterror/update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/urbanterror/update b/srcpkgs/urbanterror/update
index d44392c320c5..354e81448682 100644
--- a/srcpkgs/urbanterror/update
+++ b/srcpkgs/urbanterror/update
@@ -1,2 +1,2 @@
 site="https://github.com/Barbatos/ioq3-for-UrbanTerror-4/tags"
-pattern='/archive/(release-?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar\.gz")'
+pattern='/archive/refs/tags/(release-?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar\.gz")'

From e6c8ed00e06bbaf425efb6fcce38d7fa57064ab3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:31 +0200
Subject: [PATCH 1413/2024] util-linux-libs: fix update file

---
 srcpkgs/util-linux-libs/update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/util-linux-libs/update b/srcpkgs/util-linux-libs/update
index 66f75411a4b7..4cd9fc7d9ea5 100644
--- a/srcpkgs/util-linux-libs/update
+++ b/srcpkgs/util-linux-libs/update
@@ -1,2 +1,2 @@
 site='https://github.com/karelzak/util-linux/releases'
-pattern='/archive/v\K[\d\.]+(?=\.tar\.gz")'
+pattern='/archive/refs/tags/v\K[\d\.]+(?=\.tar\.gz")'

From ddf4a1d17e51f1c300a411a06b8e4e4e39d1004c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:31 +0200
Subject: [PATCH 1414/2024] util-linux: fix update file

---
 srcpkgs/util-linux/update | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 srcpkgs/util-linux/update

diff --git a/srcpkgs/util-linux/update b/srcpkgs/util-linux/update
deleted file mode 100644
index 66f75411a4b7..000000000000
--- a/srcpkgs/util-linux/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site='https://github.com/karelzak/util-linux/releases'
-pattern='/archive/v\K[\d\.]+(?=\.tar\.gz")'

From 11feaec93b8156822817ea334baaab8f73d2f3ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 19 Apr 2021 19:50:31 +0200
Subject: [PATCH 1415/2024] w3m: fix update file

---
 srcpkgs/w3m/update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/w3m/update b/srcpkgs/w3m/update
index 7402903fb1bd..04b31ff7efac 100644
--- a/srcpkgs/w3m/update
+++ b/srcpkgs/w3m/update
@@ -1 +1 @@
-pattern="/archive/v\K[\d\.]+\+git\d+(?=\.tar)"
+pattern="/archive/refs/tags/v\K[\d\.]+\+git\d+(?=(\+deb[u\+.\d]+)?\.tar)"

From 8e53cdb0c2fa4967ee2e46e5d15b4817ceaa6d88 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Mon, 19 Apr 2021 20:10:36 +0200
Subject: [PATCH 1416/2024] warzone2100: update to 4.0.1.

---
 srcpkgs/warzone2100/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template
index 3af4ebc401f0..0d2134820a95 100644
--- a/srcpkgs/warzone2100/template
+++ b/srcpkgs/warzone2100/template
@@ -1,6 +1,6 @@
 # Template file for 'warzone2100'
 pkgname=warzone2100
-version=4.0.0
+version=4.0.1
 revision=1
 wrksrc="warzone2100"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="http://wz2100.net"
 distfiles="https://github.com/Warzone2100/${pkgname}/releases/download/${version}/${pkgname}_src.tar.xz"
-checksum=3368f6653a5ebe5579938f0ebbcfe7907b1f0fc635f0a7aecc5d68ebc50124b5
+checksum=337622d5f813bbc1f9a3b4fee0874fcc074806781cfa9c25a252534ddd240ab9
 nocross="fails to detect SDL2 when cross-compiling"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then

From aed0a424026d6938531f2185cb66713e5fb3675d Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 19 Apr 2021 14:32:39 -0500
Subject: [PATCH 1417/2024] ffuf: update to 1.3.0.

---
 srcpkgs/ffuf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ffuf/template b/srcpkgs/ffuf/template
index eecf6bd8a603..122cd1949be9 100644
--- a/srcpkgs/ffuf/template
+++ b/srcpkgs/ffuf/template
@@ -1,6 +1,6 @@
 # Template file for 'ffuf'
 pkgname=ffuf
-version=1.2.1
+version=1.3.0
 revision=1
 build_style=go
 go_import_path="github.com/ffuf/ffuf"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/ffuf/ffuf"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=ff474b21e192005a2df0f09f942b0370bdcb45d64ee35bd8782eb44a5c636e96
+checksum=f717ede958c16846c7f67c14fac2a9296fcb3ad249045d04ec97c2d1d30e83ea
 
 post_install() {
 	vlicense LICENSE

From 13d11700e8943d7755ec80f1ad83fc62904f7c15 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 19 Apr 2021 14:57:28 -0500
Subject: [PATCH 1418/2024] Amass: update to 3.12.1.

---
 srcpkgs/Amass/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template
index 914353276941..957e15f5f662 100644
--- a/srcpkgs/Amass/template
+++ b/srcpkgs/Amass/template
@@ -1,6 +1,6 @@
 # Template file for 'Amass'
 pkgname=Amass
-version=3.11.13
+version=3.12.1
 revision=1
 build_style=go
 go_import_path="github.com/OWASP/Amass/v3/..."
@@ -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=012b5c01209c56b4698c605c74c39001341a5319b90e65d484329fd4a3e2b7cf
+checksum=136984d32e6b19d830c15a4aee90cbff7bfd7691edb9be1bdeec9d1bb6ff4f39

From 91383bf901c71f64f8cbeac2734245ded8bcf6f9 Mon Sep 17 00:00:00 2001
From: eater <=@eater.me>
Date: Mon, 19 Apr 2021 14:17:12 +0200
Subject: [PATCH 1419/2024] musikcube: update to 0.96.6

---
 srcpkgs/musikcube-pipewire                    |  1 +
 .../patches/fix-install-locations.patch       | 19 +++++++--------
 .../patches/use-pkg-config-for-pipewire.patch | 18 +++++++++++++++
 srcpkgs/musikcube/template                    | 23 +++++++++++--------
 4 files changed, 43 insertions(+), 18 deletions(-)
 create mode 120000 srcpkgs/musikcube-pipewire
 create mode 100644 srcpkgs/musikcube/patches/use-pkg-config-for-pipewire.patch

diff --git a/srcpkgs/musikcube-pipewire b/srcpkgs/musikcube-pipewire
new file mode 120000
index 000000000000..b3cc8e74bf48
--- /dev/null
+++ b/srcpkgs/musikcube-pipewire
@@ -0,0 +1 @@
+musikcube
\ No newline at end of file
diff --git a/srcpkgs/musikcube/patches/fix-install-locations.patch b/srcpkgs/musikcube/patches/fix-install-locations.patch
index aaa0d7c16721..cf1dce80f00a 100644
--- a/srcpkgs/musikcube/patches/fix-install-locations.patch
+++ b/srcpkgs/musikcube/patches/fix-install-locations.patch
@@ -2,10 +2,10 @@ Currently all ELF files (binaries and libraries), get installed to /usr/share/mu
 This patch moves all those files to their normal locations and fixes the code to expect that
 
 diff --git CMakeLists.txt CMakeLists.txt
-index 7e0ea437..896d45d4 100644
+index d685695f..5ac43f1f 100644
 --- CMakeLists.txt
 +++ CMakeLists.txt
-@@ -193,7 +193,7 @@ if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
+@@ -208,7 +208,7 @@ if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
    install(FILES ${plugins} DESTINATION share/musikcube/plugins)
  else ()
    file(GLOB plugins "bin/plugins/*.so")
@@ -14,7 +14,7 @@ index 7e0ea437..896d45d4 100644
  endif ()
  
  file(GLOB sdk_headers "src/musikcore/sdk/*.h")
-@@ -228,20 +228,12 @@ endif()
+@@ -237,20 +237,12 @@ endif()
  if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
    install(FILES "bin/libmusikcore.dylib" DESTINATION share/musikcube)
  else()
@@ -36,7 +36,7 @@ index 7e0ea437..896d45d4 100644
    DESTINATION bin/
    PERMISSIONS
      OWNER_EXECUTE OWNER_READ OWNER_WRITE
-@@ -251,14 +243,6 @@ install(
+@@ -260,14 +252,6 @@ install(
  # executable and shell script for daemon
  install(
    FILES bin/musikcubed
@@ -52,17 +52,17 @@ index 7e0ea437..896d45d4 100644
    PERMISSIONS
      OWNER_EXECUTE OWNER_READ OWNER_WRITE
 diff --git src/musikcore/support/Common.cpp src/musikcore/support/Common.cpp
-index 9e327b63..08f49351 100644
+index 58bc4d2f..1670c2f7 100644
 --- src/musikcore/support/Common.cpp
 +++ src/musikcore/support/Common.cpp
-@@ -86,64 +86,11 @@ namespace musik { namespace core {
+@@ -90,65 +90,11 @@ namespace musik { namespace core {
      }
  
      std::string GetPluginDirectory() {
 -        std::string path(GetApplicationDirectory());
 -        path.append("/plugins/");
 -        return path;
-+      return std::string("/usr/lib/musikcube/plugins");
++        return std::string("/usr/lib/musikcube/plugins");
      }
  
      std::string GetApplicationDirectory() {
@@ -111,14 +111,15 @@ index 9e327b63..08f49351 100644
 -            #else
 -                std::string pathToProc = u8fmt("/proc/%d/exe", (int) getpid());
 -                readlink(pathToProc.c_str(), pathbuf, PATH_MAX);
--        #endif
+-            #endif
+-
 -            result.assign(pathbuf);
 -            size_t last = result.find_last_of("/");
 -            result = result.substr(0, last); /* remove filename component */
 -        #endif
 -
 -        return result;
-+      return std::string("/usr/share/musikcube");
++        return std::string("/usr/share/musikcube");
      }
  
      std::string GetHomeDirectory() {
diff --git a/srcpkgs/musikcube/patches/use-pkg-config-for-pipewire.patch b/srcpkgs/musikcube/patches/use-pkg-config-for-pipewire.patch
new file mode 100644
index 000000000000..e98bf1f7955b
--- /dev/null
+++ b/srcpkgs/musikcube/patches/use-pkg-config-for-pipewire.patch
@@ -0,0 +1,18 @@
+diff --git src/plugins/pipewireout/CMakeLists.txt src/plugins/pipewireout/CMakeLists.txt
+index 7c24320d..233adab2 100644
+--- src/plugins/pipewireout/CMakeLists.txt
++++ src/plugins/pipewireout/CMakeLists.txt
+@@ -7,10 +7,8 @@ ensure_library_exists(pipewire-0.3)
+ 
+ message(STATUS "[pipewireout] plugin enabled")
+ 
+-include_directories("/usr/include/spa-0.2")
+-include_directories("/usr/local/include/spa-0.2")
+-include_directories("/usr/include/pipewire-0.3")
+-include_directories("/usr/local/include/pipewire-0.3")
++find_package(PkgConfig)
++pkg_check_modules(PIPEWIRE REQUIRED IMPORTED_TARGET libpipewire-0.3)
+ 
+ add_library(pipewireout SHARED ${pipewireout_SOURCES})
+-target_link_libraries(pipewireout ${musikcube_LINK_LIBS} pipewire-0.3)
++target_link_libraries(pipewireout ${musikcube_LINK_LIBS} PkgConfig::PIPEWIRE)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index 633432afe5ad..7a217ebb96e2 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,21 +1,22 @@
 # Template file for 'musikcube'
 pkgname=musikcube
-version=0.96.4
+version=0.96.6
 revision=1
 build_style=cmake
 make_cmd=make
-configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=true -DDISABLE_STRIP=true"
+configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=true -DDISABLE_STRIP=true
+ -DENABLE_PIPEWIRE=true -DENABLE_BUNDLED_TAGLIB=false"
 hostmakedepends="pkg-config"
 makedepends="boost-devel libogg-devel libmicrohttpd-devel ffmpeg-devel
  openssl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
  libvorbis-devel libcurl-devel ncurses-devel libev-devel taglib-devel
- sndio-devel"
+ sndio-devel pipewire-devel"
 short_desc="Terminal-based music player in c++"
 maintainer="eater <=@eater.me>"
 license="BSD-3-Clause"
 homepage="https://musikcube.com/"
 distfiles="https://github.com/clangen/musikcube/archive/${version}.tar.gz"
-checksum=c184fe12a62da15f6dfabab885a991f5ad49065fcc7e1bef2b2892b15ed7bb99
+checksum=3d3512ae03ff5a233de8d6787417b32731e50d813035fd49188b2fca66c6d21e
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
@@ -28,10 +29,6 @@ export CMAKE_GENERATOR="Unix Makefiles"
 # SDL2-2.0.10_3: broken, unresolvable shlib 'libGL.so.1'
 makedepends+=" libglvnd"
 
-post_patch() {
-	vsed -i -e 's/00097000/00097001/' src/plugins/server/HttpServer.h
-}
-
 post_install() {
 	vlicense LICENSE.txt
 }
@@ -45,9 +42,17 @@ musikcube-devel_package() {
 }
 
 musikcube-sndio_package() {
-	depends="musikcube-${version}_${revision}"
+	depends="musikcube>=${version}_${revision}"
 	short_desc+=" - sndio output plugin"
 	pkg_install() {
 		vmove usr/lib/musikcube/plugins/libsndioout.so
 	}
 }
+
+musikcube-pipewire_package() {
+	depends="musikcube>=${version}_${revision}"
+	short_desc+=" - pipewire output plugin"
+	pkg_install() {
+		vmove usr/lib/musikcube/plugins/libpipewireout.so
+	}
+}

From 9614e5d9597de069f614f41bf40e9b3bcd7c438e Mon Sep 17 00:00:00 2001
From: noarchwastaken <noarch@n0ar.ch>
Date: Mon, 19 Apr 2021 11:59:44 -0400
Subject: [PATCH 1420/2024] python3-pikepdf: use python3-setuptools_scm

---
 .../patches/remove_setuptools_scm_dependency.patch    | 11 -----------
 srcpkgs/python3-pikepdf/template                      |  6 +++---
 2 files changed, 3 insertions(+), 14 deletions(-)
 delete mode 100644 srcpkgs/python3-pikepdf/patches/remove_setuptools_scm_dependency.patch

diff --git a/srcpkgs/python3-pikepdf/patches/remove_setuptools_scm_dependency.patch b/srcpkgs/python3-pikepdf/patches/remove_setuptools_scm_dependency.patch
deleted file mode 100644
index 0aafb8264a64..000000000000
--- a/srcpkgs/python3-pikepdf/patches/remove_setuptools_scm_dependency.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- setup.py
-+++ setup.py
-@@ -90,8 +90,6 @@ if __name__ == '__main__':
-         setup_requires=[
-             'setuptools >= 50',
-             'wheel >= 0.35',
--            'setuptools_scm[toml] >= 4.1',
--            'setuptools_scm_git_archive',
-             'pybind11 >= 2.6.0, <3',
-         ],
-         extras_require={'docs': docs_require},
diff --git a/srcpkgs/python3-pikepdf/template b/srcpkgs/python3-pikepdf/template
index 1f59777c503c..ec24f17799c5 100644
--- a/srcpkgs/python3-pikepdf/template
+++ b/srcpkgs/python3-pikepdf/template
@@ -1,10 +1,10 @@
 # Template file for 'python3-pikepdf'
 pkgname=python3-pikepdf
 version=2.11.1
-revision=1
+revision=2
 wrksrc="pikepdf-${version}"
 build_style=python3-module
-hostmakedepends="python3-pybind11 python3-setuptools python3-toml python3-wheel"
+hostmakedepends="python3-pybind11 python3-setuptools_scm python3-toml python3-wheel"
 makedepends="libqpdf-devel python3-pybind11"
 depends="python3-lxml python3-Pillow"
 checkdepends="python3-dateutil python3-hypothesis python3-lxml python3-Pillow python3-psutil python3-pytest"
@@ -16,7 +16,7 @@ distfiles="${PYPI_SITE}/p/pikepdf/pikepdf-${version}.tar.gz"
 checksum=810488f80a1d93652498222f9d1391d9287b3b842971d7a8878e69a287c2476f
 
 pre_build() {
-	vsed -i "s/__version__.*/__version__ = '${version}'/g" setup.py
+	vsed -e '/setuptools_scm_git_archive/d' -i setup.py
 }
 
 do_check() {

From 960beacf6ccf724f29c2f5890ad4a30089a4c7d7 Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Fri, 16 Apr 2021 14:29:31 -0400
Subject: [PATCH 1421/2024] chromium: update to 90.0.4430.72.

- Built for x86_64, i686, x86_64-musl.
- Tested on x86_64.

- Removes API key.
- Changes by q66: ppc patch fixes

Closes https://github.com/void-linux/void-packages/pull/30271
---
 .../files/musl-patches/musl-fixes.patch       |  25 +++-
 .../files/musl-patches/no-mallinfo.patch      |  20 +++
 .../musl-patches/xxx-ppc64le-support.patch    |  15 ++
 ...chromium-89-AXTreeSerializer-include.patch |  25 ----
 ...-add-dependency-on-opus-in-webcodecs.patch |  43 ------
 .../patches/chromium-89-dawn-include.patch    |  28 ----
 .../patches/chromium-89-quiche-dcheck.patch   |  29 ----
 .../patches/chromium-89-skia-CropRect.patch   |  38 -----
 ...mium-89-x11-ozone-fix-two-edge-cases.patch | 135 ------------------
 .../chromium-90-TokenizedOutput-include.patch |  24 ++++
 .../patches/chromium-90-angle-constexpr.patch |  28 ++++
 ...romium-90-quantization_utils-include.patch |  24 ++++
 ...lang-nomerge-attribute-to-CheckError.patch |  25 ++++
 .../patches/chromium-90-ruy-include.patch     |  24 ++++
 .../patches/xxx-ppc64le-support.patch         | 104 ++++++++++----
 srcpkgs/chromium/template                     |  10 +-
 16 files changed, 264 insertions(+), 333 deletions(-)
 delete mode 100644 srcpkgs/chromium/patches/chromium-89-AXTreeSerializer-include.patch
 delete mode 100644 srcpkgs/chromium/patches/chromium-89-add-dependency-on-opus-in-webcodecs.patch
 delete mode 100644 srcpkgs/chromium/patches/chromium-89-dawn-include.patch
 delete mode 100644 srcpkgs/chromium/patches/chromium-89-quiche-dcheck.patch
 delete mode 100644 srcpkgs/chromium/patches/chromium-89-skia-CropRect.patch
 delete mode 100644 srcpkgs/chromium/patches/chromium-89-x11-ozone-fix-two-edge-cases.patch
 create mode 100644 srcpkgs/chromium/patches/chromium-90-TokenizedOutput-include.patch
 create mode 100644 srcpkgs/chromium/patches/chromium-90-angle-constexpr.patch
 create mode 100644 srcpkgs/chromium/patches/chromium-90-quantization_utils-include.patch
 create mode 100644 srcpkgs/chromium/patches/chromium-90-revert-add-clang-nomerge-attribute-to-CheckError.patch
 create mode 100644 srcpkgs/chromium/patches/chromium-90-ruy-include.patch

diff --git a/srcpkgs/chromium/files/musl-patches/musl-fixes.patch b/srcpkgs/chromium/files/musl-patches/musl-fixes.patch
index aec60fd62092..fb84bd986489 100644
--- a/srcpkgs/chromium/files/musl-patches/musl-fixes.patch
+++ b/srcpkgs/chromium/files/musl-patches/musl-fixes.patch
@@ -107,8 +107,8 @@ diff --git a/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc b
  #include <algorithm>
  #include <utility>
 diff --git a/third_party/ots/include/opentype-sanitiser.h b/third_party/ots/include/opentype-sanitiser.h
---- third_party/ots/include/opentype-sanitiser.h
-+++ third_party/ots/include/opentype-sanitiser.h
+--- third_party/ots/src/include/opentype-sanitiser.h
++++ third_party/ots/src/include/opentype-sanitiser.h
 @@ -20,6 +20,7 @@ typedef unsigned __int64 uint64_t;
  #define htonl(x) _byteswap_ulong (x)
  #define htons(x) _byteswap_ushort (x)
@@ -200,3 +200,24 @@ diff --git a/third_party/ots/include/opentype-sanitiser.h b/third_party/ots/incl
  #include <sys/socket.h>
  #include <sys/un.h>
  #include <unistd.h>
+
+--- third_party/perfetto/include/perfetto/ext/base/thread_utils.h
++++ third_party/perfetto/include/perfetto/ext/base/thread_utils.h
+@@ -29,7 +29,7 @@
+ #include <algorithm>
+ #endif
+ 
+-#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
++#if 1
+ #include <sys/prctl.h>
+ #endif
+ 
+@@ -58,7 +58,7 @@ inline bool MaybeSetThreadName(const std::string& name) {
+ 
+ inline bool GetThreadName(std::string& out_result) {
+   char buf[16] = {};
+-#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
++#if 1
+   if (prctl(PR_GET_NAME, buf) != 0)
+     return false;
+ #else
diff --git a/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch b/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch
index 254a1f632da5..b0c9832515d0 100644
--- a/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch
+++ b/srcpkgs/chromium/files/musl-patches/no-mallinfo.patch
@@ -52,3 +52,23 @@
  
  /* Define to 1 if you have the <malloc.h> header file. */
  #define HAVE_MALLOC_H 1
+--- third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc.orig	2021-04-16 17:34:36.666385207 -0400
++++ third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc	2021-04-16 17:36:01.197602953 -0400
+@@ -27,7 +27,7 @@
+ const int MemoryUsage::kValueNotSet = 0;
+ 
+ bool MemoryUsage::IsSupported() {
+-#ifdef __linux__
++#ifdef defined(__GLIBC__)
+   return true;
+ #endif
+   return false;
+@@ -35,7 +35,7 @@
+ 
+ MemoryUsage GetMemoryUsage() {
+   MemoryUsage result;
+-#ifdef __linux__
++#ifdef defined(__GLIBC__)
+   rusage res;
+   if (getrusage(RUSAGE_SELF, &res) == 0) {
+     result.max_rss_kb = res.ru_maxrss;
diff --git a/srcpkgs/chromium/files/musl-patches/xxx-ppc64le-support.patch b/srcpkgs/chromium/files/musl-patches/xxx-ppc64le-support.patch
index 9001a2a854d0..1e0bca1439a6 100644
--- a/srcpkgs/chromium/files/musl-patches/xxx-ppc64le-support.patch
+++ b/srcpkgs/chromium/files/musl-patches/xxx-ppc64le-support.patch
@@ -1,3 +1,18 @@
+diff --git base/allocator/partition_allocator/partition_freelist_entry.h base/allocator/partition_allocator/partition_freelist_entry.h
+index f7703ee..57b6e6c 100644
+--- base/allocator/partition_allocator/partition_freelist_entry.h
++++ base/allocator/partition_allocator/partition_freelist_entry.h
+@@ -19,8 +19,10 @@
+ // Disabled on ARM64 Macs, as this crashes very early (crbug.com/1172236).
+ // TODO(lizeb): Enable in as many configurations as possible.
+ #if !(defined(OS_MAC) && defined(ARCH_CPU_ARM64))
++#if !defined(__powerpc64__)
+ #define PA_HAS_FREELIST_HARDENING
+ #endif
++#endif
+ 
+ namespace base {
+ namespace internal {
 diff --git sandbox/linux/bpf_dsl/seccomp_macros.h sandbox/linux/bpf_dsl/seccomp_macros.h
 index a6aec544e..2a4a7f1bc 100644
 --- sandbox/linux/bpf_dsl/seccomp_macros.h
diff --git a/srcpkgs/chromium/patches/chromium-89-AXTreeSerializer-include.patch b/srcpkgs/chromium/patches/chromium-89-AXTreeSerializer-include.patch
deleted file mode 100644
index 7372e44d1547..000000000000
--- a/srcpkgs/chromium/patches/chromium-89-AXTreeSerializer-include.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From c06ddc4935bf1394812c011ce5d93898ccc8a53a Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Tue, 09 Feb 2021 19:22:57 +0000
-Subject: [PATCH] IWYU: add ctime for std::time
-
-Bug: None
-Change-Id: I8bdae43209984242b9f5e538d74ece4409b65e3c
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2679610
-Reviewed-by: Katie Dektar <katie@chromium.org>
-Commit-Queue: Katie Dektar <katie@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#852287}
----
-
-diff --git a/ui/accessibility/ax_tree_serializer.h b/ui/accessibility/ax_tree_serializer.h
-index ddbbdcd..1790e3b 100644
---- ui/accessibility/ax_tree_serializer.h
-+++ ui/accessibility/ax_tree_serializer.h
-@@ -8,6 +8,7 @@
- #include <stddef.h>
- #include <stdint.h>
- 
-+#include <ctime>
- #include <ostream>
- #include <unordered_map>
- #include <unordered_set>
diff --git a/srcpkgs/chromium/patches/chromium-89-add-dependency-on-opus-in-webcodecs.patch b/srcpkgs/chromium/patches/chromium-89-add-dependency-on-opus-in-webcodecs.patch
deleted file mode 100644
index c25897791d95..000000000000
--- a/srcpkgs/chromium/patches/chromium-89-add-dependency-on-opus-in-webcodecs.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From b5b80df7dafba8cafa4c6c0ba2153dfda467dfc9 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Wed, 27 Jan 2021 20:31:51 +0000
-Subject: [PATCH] add dependency on opus in webcodecs
-
-webcodecs uses opus, but dependency is missing. With unbundled
-opus library build fails, because include path is incomplete.
-
-Bug: 1169758
-Change-Id: I01369364327461196a81002479636cf45017669a
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2644623
-Reviewed-by: Dale Curtis <dalecurtis@chromium.org>
-Commit-Queue: Dale Curtis <dalecurtis@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#847754}
----
- third_party/blink/renderer/modules/webcodecs/BUILD.gn | 1 +
- third_party/blink/renderer/modules/webcodecs/DEPS     | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/third_party/blink/renderer/modules/webcodecs/BUILD.gn b/third_party/blink/renderer/modules/webcodecs/BUILD.gn
-index fdf4ca0fafc72..01a7bf809ffca 100644
---- third_party/blink/renderer/modules/webcodecs/BUILD.gn
-+++ third_party/blink/renderer/modules/webcodecs/BUILD.gn
-@@ -65,6 +65,7 @@ blink_modules_sources("webcodecs") {
-     "//media/mojo/clients",
-     "//media/mojo/mojom",
-     "//third_party/libyuv:libyuv",
-+    "//third_party/opus",
-   ]
-   if (media_use_openh264) {
-     deps += [ "//third_party/openh264:encoder" ]
-diff --git a/third_party/blink/renderer/modules/webcodecs/DEPS b/third_party/blink/renderer/modules/webcodecs/DEPS
-index b8dd596da8caf..ea1919d12205a 100644
---- third_party/blink/renderer/modules/webcodecs/DEPS
-+++ third_party/blink/renderer/modules/webcodecs/DEPS
-@@ -19,6 +19,7 @@ include_rules = [
- 
-     "+third_party/libyuv",
-     "+third_party/openh264",
-+    "+third_party/opus",
- 
-     "+ui/gfx/color_space.h",
-     "+ui/gfx/geometry/rect.h",
diff --git a/srcpkgs/chromium/patches/chromium-89-dawn-include.patch b/srcpkgs/chromium/patches/chromium-89-dawn-include.patch
deleted file mode 100644
index 9876ba20eb51..000000000000
--- a/srcpkgs/chromium/patches/chromium-89-dawn-include.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 5a56bfe8d281250a1deee0d116a9fcde65b9c29a Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Fri, 15 Jan 2021 18:37:05 +0000
-Subject: [PATCH] IWYU: add various missing includes
-
-std::weak_ptr and std::shared_ptr require map
-*int*_t types require cstdint
----
- third_party/dawn/src/dawn_wire/client/Device.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/third_party/dawn/src/dawn_wire/client/Device.h b/third_party/dawn/src/dawn_wire/client/Device.h
-index 3f16700..1082549 100644
---- third_party/dawn/src/dawn_wire/client/Device.h
-+++ third_party/dawn/src/dawn_wire/client/Device.h
-@@ -22,7 +22,9 @@
- #include "dawn_wire/client/ApiObjects_autogen.h"
- #include "dawn_wire/client/ObjectBase.h"
- 
-+#include <cstdint>
- #include <map>
-+#include <memory>
- 
- namespace dawn_wire { namespace client {
- 
--- 
-2.26.2
-
diff --git a/srcpkgs/chromium/patches/chromium-89-quiche-dcheck.patch b/srcpkgs/chromium/patches/chromium-89-quiche-dcheck.patch
deleted file mode 100644
index b2f164fac9ba..000000000000
--- a/srcpkgs/chromium/patches/chromium-89-quiche-dcheck.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 7cd4eab0bfca6192f14d6143410e1ae774eb1c29 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Thu, 31 Dec 2020 11:57:22 +0000
-Subject: [PATCH] GCC: do not pass unique_ptr to DCHECK_NE, but the actual
- pointer
-
-DCHECK_NE comparison requires CheckOpValueStr to be defined for the
-type, or providing an output stream operator. A unique_ptr does not
-provide any. USE DCHECK instead.
----
- net/third_party/quiche/src/quic/core/quic_path_validator.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/net/third_party/quiche/src/quic/core/quic_path_validator.cc b/net/third_party/quiche/src/quic/core/quic_path_validator.cc
-index 0722216..fb2aeaf 100644
---- net/third_party/quiche/src/quic/core/quic_path_validator.cc
-+++ net/third_party/quiche/src/quic/core/quic_path_validator.cc
-@@ -68,7 +68,7 @@ void QuicPathValidator::OnPathResponse(const QuicPathFrameBuffer& probing_data,
- void QuicPathValidator::StartPathValidation(
-     std::unique_ptr<QuicPathValidationContext> context,
-     std::unique_ptr<ResultDelegate> result_delegate) {
--  DCHECK_NE(nullptr, context);
-+  DCHECK(context);
-   QUIC_DLOG(INFO) << "Start validating path " << *context
-                   << " via writer: " << context->WriterToUse();
-   if (path_context_ != nullptr) {
--- 
-2.26.2
-
diff --git a/srcpkgs/chromium/patches/chromium-89-skia-CropRect.patch b/srcpkgs/chromium/patches/chromium-89-skia-CropRect.patch
deleted file mode 100644
index 9712c92658f6..000000000000
--- a/srcpkgs/chromium/patches/chromium-89-skia-CropRect.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/third_party/skia/include/effects/SkImageFilters.h b/third_party/skia/include/effects/SkImageFilters.h
-index 04cce0a..d06b007 100644
---- third_party/skia/include/effects/SkImageFilters.h
-+++ third_party/skia/include/effects/SkImageFilters.h
-@@ -23,6 +23,9 @@ class SkColorFilter;
- class SkPaint;
- class SkRegion;
- 
-+constexpr SkRect kNoCropRect = {SK_ScalarNegativeInfinity, SK_ScalarNegativeInfinity,
-+                                SK_ScalarInfinity, SK_ScalarInfinity};
-+
- // A set of factory functions providing useful SkImageFilter effects. For image filters that take an
- // input filter, providing nullptr means it will automatically use the dynamic source image. This
- // source depends on how the filter is applied, but is either the contents of a saved layer when
-@@ -33,8 +36,6 @@ public:
-     // to those types as a crop rect for the image filter factories. It's not intended to be used
-     // directly.
-     struct CropRect {
--        static constexpr SkRect kNoCropRect = {SK_ScalarNegativeInfinity, SK_ScalarNegativeInfinity,
--                                               SK_ScalarInfinity, SK_ScalarInfinity};
-         CropRect() : fCropRect(kNoCropRect) {}
-         // Intentionally not explicit so callers don't have to use this type but can use SkIRect or
-         // SkRect as desired.
-diff --git a/third_party/skia/src/effects/imagefilters/SkImageFilters.cpp b/third_party/skia/src/effects/imagefilters/SkImageFilters.cpp
-index 5290b00..fb97fc1 100644
---- third_party/skia/src/effects/imagefilters/SkImageFilters.cpp
-+++ third_party/skia/src/effects/imagefilters/SkImageFilters.cpp
-@@ -47,10 +47,6 @@ static SkImageFilter::CropRect to_legacy_crop_rect(const SkImageFilters::CropRec
-                                          : SkImageFilter::CropRect(SkRect::MakeEmpty(), 0x0);
- }
- 
--// Allow kNoCropRect to be referenced (for certain builds, e.g. macOS libFuzzer chromium target,
--// see crbug.com/1139725)
--constexpr SkRect SkImageFilters::CropRect::kNoCropRect;
--
- void SkImageFilters::RegisterFlattenables() {
-     SkAlphaThresholdFilter::RegisterFlattenables();
-     SkArithmeticImageFilter::RegisterFlattenables();
diff --git a/srcpkgs/chromium/patches/chromium-89-x11-ozone-fix-two-edge-cases.patch b/srcpkgs/chromium/patches/chromium-89-x11-ozone-fix-two-edge-cases.patch
deleted file mode 100644
index 7fb586da169a..000000000000
--- a/srcpkgs/chromium/patches/chromium-89-x11-ozone-fix-two-edge-cases.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-From 5e3a738b1204941aab9f15c0eb3d06e20fefd96e Mon Sep 17 00:00:00 2001
-From: Scott Violet <sky@chromium.org>
-Date: Mon, 8 Mar 2021 21:07:39 +0000
-Subject: [PATCH] x11/ozone: fix two edge cases
-
-WindowTreeHost::OnHostMovedInPixels() may trigger a nested message
-loop (tab dragging), which when the stack unravels means this may
-be deleted. This adds an early out if this happens.
-
-X11WholeScreenMoveLoop has a similar issue, in so far as notifying
-the delegate may delete this.
-
-BUG=1185482
-TEST=WindowTreeHostPlatform.DeleteHostFromOnHostMovedInPixels
-
-Change-Id: Ieca1c90b3e4358da50b332abe2941fdbb50c5c25
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2743555
-Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
-Commit-Queue: Scott Violet <sky@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#860852}
----
- ui/aura/window_tree_host_platform.cc          | 10 ++++-
- ui/aura/window_tree_host_platform_unittest.cc | 40 ++++++++++++++++++-
- ui/base/x/x11_whole_screen_move_loop.cc       |  4 ++
- 3 files changed, 51 insertions(+), 3 deletions(-)
-
-diff --git a/ui/aura/window_tree_host_platform.cc b/ui/aura/window_tree_host_platform.cc
-index ce8395fe07..7589542026 100644
---- ui/aura/window_tree_host_platform.cc
-+++ ui/aura/window_tree_host_platform.cc
-@@ -214,13 +214,21 @@ void WindowTreeHostPlatform::OnBoundsChanged(const gfx::Rect& new_bounds) {
-   float current_scale = compositor()->device_scale_factor();
-   float new_scale = ui::GetScaleFactorForNativeView(window());
-   gfx::Rect old_bounds = bounds_in_pixels_;
-+  auto weak_ref = GetWeakPtr();
-   bounds_in_pixels_ = new_bounds;
--  if (bounds_in_pixels_.origin() != old_bounds.origin())
-+  if (bounds_in_pixels_.origin() != old_bounds.origin()) {
-     OnHostMovedInPixels(bounds_in_pixels_.origin());
-+    // Changing the bounds may destroy this.
-+    if (!weak_ref)
-+      return;
-+  }
-   if (bounds_in_pixels_.size() != old_bounds.size() ||
-       current_scale != new_scale) {
-     pending_size_ = gfx::Size();
-     OnHostResizedInPixels(bounds_in_pixels_.size());
-+    // Changing the size may destroy this.
-+    if (!weak_ref)
-+      return;
-   }
-   DCHECK_GT(on_bounds_changed_recursion_depth_, 0);
-   if (--on_bounds_changed_recursion_depth_ == 0) {
-diff --git a/ui/aura/window_tree_host_platform_unittest.cc b/ui/aura/window_tree_host_platform_unittest.cc
-index eda14e2f0c..4de039c88a 100644
---- ui/aura/window_tree_host_platform_unittest.cc
-+++ ui/aura/window_tree_host_platform_unittest.cc
-@@ -34,7 +34,7 @@ class TestWindowTreeHost : public WindowTreeHostPlatform {
- // OnHostWill/DidProcessBoundsChange. Additionally, this triggers a bounds
- // change from within OnHostResized(). Such a scenario happens in production
- // code.
--class TestWindowTreeHostObserver : public aura::WindowTreeHostObserver {
-+class TestWindowTreeHostObserver : public WindowTreeHostObserver {
-  public:
-   TestWindowTreeHostObserver(WindowTreeHostPlatform* host,
-                              ui::PlatformWindow* platform_window)
-@@ -51,7 +51,7 @@ class TestWindowTreeHostObserver : public aura::WindowTreeHostObserver {
-     return on_host_will_process_bounds_change_count_;
-   }
- 
--  // aura::WindowTreeHostObserver:
-+  // WindowTreeHostObserver:
-   void OnHostResized(WindowTreeHost* host) override {
-     if (!should_change_bounds_in_on_resized_)
-       return;
-@@ -92,5 +92,41 @@ TEST_F(WindowTreeHostPlatformTest, HostWillProcessBoundsChangeRecursion) {
-   EXPECT_EQ(1, observer.on_host_will_process_bounds_change_count());
- }
- 
-+// Deletes WindowTreeHostPlatform from OnHostMovedInPixels().
-+class DeleteHostWindowTreeHostObserver : public WindowTreeHostObserver {
-+ public:
-+  explicit DeleteHostWindowTreeHostObserver(
-+      std::unique_ptr<TestWindowTreeHost> host)
-+      : host_(std::move(host)) {
-+    host_->AddObserver(this);
-+  }
-+  ~DeleteHostWindowTreeHostObserver() override = default;
-+
-+  TestWindowTreeHost* host() { return host_.get(); }
-+
-+  // WindowTreeHostObserver:
-+  void OnHostMovedInPixels(WindowTreeHost* host,
-+                           const gfx::Point& new_origin_in_pixels) override {
-+    host_->RemoveObserver(this);
-+    host_.reset();
-+  }
-+
-+ private:
-+  std::unique_ptr<TestWindowTreeHost> host_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(DeleteHostWindowTreeHostObserver);
-+};
-+
-+// Verifies WindowTreeHostPlatform can be safely deleted when calling
-+// OnHostMovedInPixels().
-+// Regression test for https://crbug.com/1185482
-+TEST_F(WindowTreeHostPlatformTest, DeleteHostFromOnHostMovedInPixels) {
-+  std::unique_ptr<TestWindowTreeHost> host =
-+      std::make_unique<TestWindowTreeHost>();
-+  DeleteHostWindowTreeHostObserver observer(std::move(host));
-+  observer.host()->SetBoundsInPixels(gfx::Rect(1, 2, 3, 4));
-+  EXPECT_EQ(nullptr, observer.host());
-+}
-+
- }  // namespace
- }  // namespace aura
-diff --git a/ui/base/x/x11_whole_screen_move_loop.cc b/ui/base/x/x11_whole_screen_move_loop.cc
-index 5ed215db66..db678799db 100644
---- ui/base/x/x11_whole_screen_move_loop.cc
-+++ ui/base/x/x11_whole_screen_move_loop.cc
-@@ -78,9 +78,13 @@ X11WholeScreenMoveLoop::~X11WholeScreenMoveLoop() {
- void X11WholeScreenMoveLoop::DispatchMouseMovement() {
-   if (!last_motion_in_screen_)
-     return;
-+  auto weak_ref = weak_factory_.GetWeakPtr();
-   delegate_->OnMouseMovement(last_motion_in_screen_->root_location(),
-                              last_motion_in_screen_->flags(),
-                              last_motion_in_screen_->time_stamp());
-+  // The delegate may delete this during dispatch.
-+  if (!weak_ref)
-+    return;
-   last_motion_in_screen_.reset();
- }
- 
diff --git a/srcpkgs/chromium/patches/chromium-90-TokenizedOutput-include.patch b/srcpkgs/chromium/patches/chromium-90-TokenizedOutput-include.patch
new file mode 100644
index 000000000000..bad98247e735
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-90-TokenizedOutput-include.patch
@@ -0,0 +1,24 @@
+From 30dcae908492a3ec811b5f5b9f518d792a01da38 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Sun, 28 Feb 2021 12:36:04 +0000
+Subject: [PATCH] IWYU: include missing cstring for strlen
+
+---
+ .../translate/core/language_detection/ngram_hash_ops_utils.cc    | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/components/translate/core/language_detection/ngram_hash_ops_utils.cc b/components/translate/core/language_detection/ngram_hash_ops_utils.cc
+index cf91033..dd03a3d 100644
+--- components/translate/core/language_detection/ngram_hash_ops_utils.cc
++++ components/translate/core/language_detection/ngram_hash_ops_utils.cc
+@@ -4,6 +4,7 @@
+ 
+ #include "components/translate/core/language_detection/ngram_hash_ops_utils.h"
+ 
++#include <cstring>
+ #include <vector>
+ 
+ #include "third_party/utf/src/include/utf.h"
+-- 
+2.26.2
+
diff --git a/srcpkgs/chromium/patches/chromium-90-angle-constexpr.patch b/srcpkgs/chromium/patches/chromium-90-angle-constexpr.patch
new file mode 100644
index 000000000000..5e0c253cb51a
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-90-angle-constexpr.patch
@@ -0,0 +1,28 @@
+From b1669139f475ebe39ded6f7905f4c901f17eef83 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Wed, 24 Feb 2021 07:38:37 +0000
+Subject: [PATCH] add missing static constexpr member definition
+
+C++14 requires to definition of static constexpr members to
+emit a linker symbol.
+---
+ .../angle/src/libANGLE/renderer/glslang_wrapper_utils.cpp      | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/third_party/angle/src/libANGLE/renderer/glslang_wrapper_utils.cpp b/third_party/angle/src/libANGLE/renderer/glslang_wrapper_utils.cpp
+index 56b46e6..8f8158c 100644
+--- third_party/angle/src/libANGLE/renderer/glslang_wrapper_utils.cpp
++++ third_party/angle/src/libANGLE/renderer/glslang_wrapper_utils.cpp
+@@ -2069,6 +2069,9 @@ class SpirvTransformFeedbackCodeGenerator final : angle::NonCopyable
+     spirv::IdRef mTransformFeedbackExtensionPositionId;
+ };
+ 
++constexpr size_t SpirvTransformFeedbackCodeGenerator::kXfbDecorationCount;
++constexpr spv::Decoration SpirvTransformFeedbackCodeGenerator::kXfbDecorations[kXfbDecorationCount];
++
+ void SpirvTransformFeedbackCodeGenerator::visitVariable(const ShaderInterfaceVariableInfo &info,
+                                                         gl::ShaderType shaderType,
+                                                         const spirv::LiteralString &name,
+-- 
+2.26.2
+
diff --git a/srcpkgs/chromium/patches/chromium-90-quantization_utils-include.patch b/srcpkgs/chromium/patches/chromium-90-quantization_utils-include.patch
new file mode 100644
index 000000000000..2cfb06430b7d
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-90-quantization_utils-include.patch
@@ -0,0 +1,24 @@
+From 980ae0fbe6d985efce517c8f6c9aa139b076322b Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Sun, 28 Feb 2021 12:55:19 +0000
+Subject: [PATCH] IWYU: add missing cstdint for uint32_t
+
+---
+ .../translate/core/language_detection/quantization_utils.h       | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/components/translate/core/language_detection/quantization_utils.h b/components/translate/core/language_detection/quantization_utils.h
+index eb8f6d1..699a488 100644
+--- components/translate/core/language_detection/quantization_utils.h
++++ components/translate/core/language_detection/quantization_utils.h
+@@ -7,6 +7,7 @@
+ 
+ #include <algorithm>
+ #include <cmath>
++#include <cstdint>
+ 
+ namespace translate {
+ 
+-- 
+2.26.2
+
diff --git a/srcpkgs/chromium/patches/chromium-90-revert-add-clang-nomerge-attribute-to-CheckError.patch b/srcpkgs/chromium/patches/chromium-90-revert-add-clang-nomerge-attribute-to-CheckError.patch
new file mode 100644
index 000000000000..094a94feb095
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-90-revert-add-clang-nomerge-attribute-to-CheckError.patch
@@ -0,0 +1,25 @@
+--- base/check.h.orig	2021-04-15 19:44:05.656259734 -0400
++++ base/check.h	2021-04-15 19:44:13.386279197 -0400
+@@ -85,7 +85,7 @@
+   // Stream for adding optional details to the error message.
+   std::ostream& stream();
+ 
+-  NOMERGE ~CheckError();
++  ~CheckError();
+ 
+   CheckError(const CheckError& other) = delete;
+   CheckError& operator=(const CheckError& other) = delete;
+--- base/compiler_specific.h.orig	2021-04-15 19:44:28.781317968 -0400
++++ base/compiler_specific.h	2021-04-15 19:44:54.136381820 -0400
+@@ -332,11 +332,4 @@
+ 
+ #endif  // defined(__clang_analyzer__)
+ 
+-// Use nomerge attribute to disable optimization of merging multiple same calls.
+-#if defined(__clang__) && __has_attribute(nomerge) && !defined(OS_CHROMEOS)
+-#define NOMERGE [[clang::nomerge]]
+-#else
+-#define NOMERGE
+-#endif
+-
+ #endif  // BASE_COMPILER_SPECIFIC_H_
diff --git a/srcpkgs/chromium/patches/chromium-90-ruy-include.patch b/srcpkgs/chromium/patches/chromium-90-ruy-include.patch
new file mode 100644
index 000000000000..09f64266f92c
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-90-ruy-include.patch
@@ -0,0 +1,24 @@
+From 714092f336bb14d2fcc27396ec323b3d843bb962 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Thu, 4 Mar 2021 15:05:46 +0000
+Subject: [PATCH] IWYU: include limits for std::numeric_limits
+
+---
+ third_party/ruy/src/ruy/block_map.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/third_party/ruy/src/ruy/block_map.cc b/third_party/ruy/src/ruy/block_map.cc
+index 44e5039..a7a7559 100644
+--- third_party/ruy/src/ruy/block_map.cc
++++ third_party/ruy/src/ruy/block_map.cc
+@@ -17,6 +17,7 @@ limitations under the License.
+ 
+ #include <algorithm>
+ #include <cstdint>
++#include <limits>
+ 
+ #ifdef RUY_MAKEBLOCKMAP_DEBUG
+ #include <cstdio>
+-- 
+2.26.2
+
diff --git a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
index 389ac3b7aa22..24bf586057df 100644
--- a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
+++ b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
@@ -195,21 +195,21 @@ index 6a1ec2389..f20c582dd 100644
  #endif
 diff --git sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
 index 01c046dda..7e5a6be82 100644
---- sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
-+++ sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
-@@ -302,7 +302,7 @@ TEST_BASELINE_SIGSYS(__NR_sysinfo)
+--- sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc.orig	2021-04-15 13:11:10.481579470 -0400
++++ sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc	2021-04-15 13:12:43.524831376 -0400
+@@ -302,7 +302,7 @@
  TEST_BASELINE_SIGSYS(__NR_syslog)
  TEST_BASELINE_SIGSYS(__NR_timer_create)
  
 -#if !defined(__aarch64__)
 +#if !defined(__aarch64__) && !defined(__powerpc64__)
- TEST_BASELINE_SIGSYS(__NR_eventfd)
  TEST_BASELINE_SIGSYS(__NR_inotify_init)
  TEST_BASELINE_SIGSYS(__NR_vserver)
+ #endif
 diff --git sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
 index 2a97d3916..8e81aa6cf 100644
---- sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
-+++ sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
+--- sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc.orig	2021-04-14 14:41:08.000000000 -0400
++++ sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc	2021-04-15 13:17:57.808715733 -0400
 @@ -40,7 +40,8 @@
  #include <sys/ptrace.h>
  #if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \
@@ -232,7 +232,7 @@ index 2a97d3916..8e81aa6cf 100644
  #if defined(OS_ANDROID)
  
  #if !defined(F_DUPFD_CLOEXEC)
-@@ -98,6 +104,15 @@ inline bool IsArchitectureMips() {
+@@ -98,6 +104,15 @@
  #endif
  }
  
@@ -248,7 +248,7 @@ index 2a97d3916..8e81aa6cf 100644
  // Ubuntu's version of glibc has a race condition in sem_post that can cause
  // it to call futex(2) with bogus op arguments. To workaround this, we need
  // to allow those futex(2) calls to fail with EINVAL, instead of crashing the
-@@ -239,6 +254,8 @@ ResultExpr RestrictFcntlCommands() {
+@@ -239,6 +254,8 @@
    uint64_t kOLargeFileFlag = O_LARGEFILE;
    if (IsArchitectureX86_64() || IsArchitectureI386() || IsArchitectureMips())
      kOLargeFileFlag = 0100000;
@@ -257,12 +257,11 @@ index 2a97d3916..8e81aa6cf 100644
  
    const Arg<int> cmd(1);
    const Arg<long> long_arg(2);
-@@ -253,14 +270,23 @@ ResultExpr RestrictFcntlCommands() {
+@@ -256,7 +273,16 @@
                F_SETLKW,
                F_GETLK,
                F_DUPFD,
 -              F_DUPFD_CLOEXEC),
--             Allow())
 +              F_DUPFD_CLOEXEC
 +#if defined(__powerpc64__)
 +// On PPC64, F_SETLK, F_GETLK, F_SETLKW are defined as the 64-bit variants
@@ -272,11 +271,12 @@ index 2a97d3916..8e81aa6cf 100644
 +              6, /* F_SETLK (32) */
 +              7  /* F_SETLKW (32) */
 +#endif
-+              ),
-+            Allow())
++	     ),
+              Allow())
        .Case(F_SETFL,
              If((long_arg & ~kAllowedMask) == 0, Allow()).Else(CrashSIGSYS()))
-       .Default(CrashSIGSYS());
+@@ -266,7 +292,7 @@
+   // clang-format on
  }
  
 -#if defined(__i386__) || defined(__mips__)
@@ -284,7 +284,7 @@ index 2a97d3916..8e81aa6cf 100644
  ResultExpr RestrictSocketcallCommand() {
    // Unfortunately, we are unable to restrict the first parameter to
    // socketpair(2). Whilst initially sounding bad, it's noteworthy that very
-@@ -413,7 +439,7 @@ ResultExpr RestrictPtrace() {
+@@ -419,7 +445,7 @@
  #endif
    return Switch(request)
        .CASES((
@@ -3379,17 +3379,16 @@ index c59cb0821..3060284a8 100644
    "libdav1d/src/cdef_tmpl.c",
 diff --git third_party/dav1d/generate_source.py third_party/dav1d/generate_source.py
 index 9ab5e00b8..ad3feffee 100755
---- third_party/dav1d/generate_source.py
-+++ third_party/dav1d/generate_source.py
-@@ -50,7 +50,8 @@ def WriteGn(fd):
-   WriteArray(fd, "arm32_asm_sources", glob.glob("libdav1d/src/arm/32/*.S"))
-   WriteArray(fd, "arm64_asm_sources", glob.glob("libdav1d/src/arm/64/*.S"))
-   WriteArray(fd, "arm_template_sources", glob.glob("libdav1d/src/arm/*_tmpl.c"))
--
-+  WriteArray(fd, "ppc64_template_sources", glob.glob("libdav1d/src/ppc/*_tmpl.c"))
-+ 
-   template_sources = glob.glob("libdav1d/src/*_tmpl.c")
-   WriteArray(fd, "template_sources", template_sources)
+--- third_party/dav1d/generate_source.py.orig	2021-04-15 13:11:10.489579490 -0400
++++ third_party/dav1d/generate_source.py	2021-04-15 13:19:08.229913892 -0400
+@@ -57,6 +57,8 @@
+   _WriteArray(fd, "arm64_asm_sources", _Glob("libdav1d/src/arm/64/*.S"))
+   _WriteArray(fd, "arm_template_sources", _Glob("libdav1d/src/arm/*_tmpl.c"))
+ 
++  _WriteArray(fd, "ppc64_template_sources", glob.glob("libdav1d/src/ppc/*_tmpl.c"))
++
+   template_sources = _Glob("libdav1d/src/*_tmpl.c")
+   _WriteArray(fd, "template_sources", template_sources)
  
 diff --git third_party/dav1d/libdav1d/src/ppc/types.h third_party/dav1d/libdav1d/src/ppc/types.h
 index 0b4bd72f0..a0caa5e71 100644
@@ -3415,6 +3414,44 @@ index 0b4bd72f0..a0caa5e71 100644
 +#endif
 +
  #endif /* DAV1D_SRC_PPC_TYPES_H */
+diff --git third_party/eigen3/BUILD.gn third_party/eigen3/BUILD.gn
+index 0d4e184..f2ce484 100644
+--- third_party/eigen3/BUILD.gn
++++ third_party/eigen3/BUILD.gn
+@@ -22,4 +22,8 @@ config("eigen_includes") {
+     # for this component on Windows on Arm due to compilation errors.
+     defines += [ "EIGEN_DONT_VECTORIZE" ]
+   }
++
++  if (target_cpu == "ppc64") {
++    defines += [ "EIGEN_DONT_VECTORIZE" ]
++  }
+ }
+
+diff --git third_party/libaom/BUILD.gn third_party/libaom/BUILD.gn
+index 9b065bd..df3af02 100644
+--- third_party/libaom/BUILD.gn
++++ third_party/libaom/BUILD.gn
+@@ -36,6 +36,8 @@ if (enable_libaom) {
+     } else {
+       cpu_arch_full = "arm"
+     }
++  } else if (current_cpu == "ppc64") {
++    cpu_arch_full = "generic"
+   } else {
+     cpu_arch_full = current_cpu
+   }
+diff --git third_party/libgav1/options.gni third_party/libgav1/options.gni
+index 11af801..4b13d05 100644
+--- third_party/libgav1/options.gni
++++ third_party/libgav1/options.gni
+@@ -12,5 +12,5 @@ declare_args() {
+       is_chromeos_ash && (target_cpu == "arm" || target_cpu == "arm64")
+   use_libgav1_parser =
+       (is_chromeos || is_linux || is_win) &&
+-      (target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm64")
++      (target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm64" || target_cpu == "ppc64")
+ }
 diff --git third_party/lss/linux_syscall_support.h third_party/lss/linux_syscall_support.h
 index e4ac22644..1c57015db 100644
 --- third_party/lss/linux_syscall_support.h
@@ -3437,6 +3474,23 @@ index e4ac22644..1c57015db 100644
       (defined(__s390__) && !defined(__s390x__))
      /* On these architectures, implement mmap() with mmap2(). */
      LSS_INLINE void* LSS_NAME(mmap)(void *s, size_t l, int p, int f, int d,
+diff --git third_party/pdfium/third_party/libpng16/pngpriv.h third_party/pdfium/third_party/libpng16/pngpriv.h
+index 583c26f..e03d697 100644
+--- third_party/pdfium/third_party/libpng16/pngpriv.h
++++ third_party/pdfium/third_party/libpng16/pngpriv.h
+@@ -196,11 +196,7 @@
+ #endif
+ 
+ #ifndef PNG_POWERPC_VSX_OPT
+-#  if defined(__PPC64__) && defined(__ALTIVEC__) && defined(__VSX__)
+-#     define PNG_POWERPC_VSX_OPT 2
+-#  else
+-#     define PNG_POWERPC_VSX_OPT 0
+-#  endif
++#  define PNG_POWERPC_VSX_OPT 0
+ #endif
+ 
+ #ifndef PNG_INTEL_SSE_OPT
 diff --git third_party/pffft/src/pffft.c third_party/pffft/src/pffft.c
 index bdac4d784..51e0f2cac 100644
 --- third_party/pffft/src/pffft.c
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index 5800c4e6e105..75b1c48613bb 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,7 +1,7 @@
 # Template file for 'chromium'
 pkgname=chromium
 # See http://www.chromium.org/developers/calendar for the latest version
-version=89.0.4389.82
+version=90.0.4430.72
 revision=1
 archs="i686* x86_64* aarch64* armv7l* ppc64le*"
 short_desc="Google's attempt at creating a safer, faster, and more stable browser"
@@ -9,7 +9,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://www.chromium.org/"
 distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz"
-checksum=df4914407b68afdc6449cb8e3f1b08d110eb8689ac41f86490e337fa4d1be379
+checksum=a5cc88ca8fffac21ec4d1646980f698dfb6f388a225dd7a2c5a3d252a4098943
 nocross=yes
 
 lib32disabled=yes
@@ -156,12 +156,6 @@ do_configure() {
 
 	third_party/libaddressinput/chromium/tools/update-strings.py
 
-	# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
-	# Note: These are for Void Linux use ONLY.
-	conf+=(
-		'google_api_key="AIzaSyA9gWazKaHaNIPPg2hrMj6_ZSG8AFmq738"'
-	)
-
 	conf+=(
 		'enable_nacl=false'
 		'enable_nacl_nonsfi=false'

From bd78253fd965065cbd79c3051d2c4588bd64c191 Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Sat, 17 Apr 2021 09:00:08 -0400
Subject: [PATCH 1422/2024] chromium-widevine: update to 90.0.4430.72.

---
 srcpkgs/chromium-widevine/INSTALL  | 2 +-
 srcpkgs/chromium-widevine/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chromium-widevine/INSTALL b/srcpkgs/chromium-widevine/INSTALL
index e7026792dd76..fed7323d9dbc 100644
--- a/srcpkgs/chromium-widevine/INSTALL
+++ b/srcpkgs/chromium-widevine/INSTALL
@@ -1,6 +1,6 @@
 # INSTALL
 
-checksum=183089861c5c4c048b479f64b3baac2345bbd06736115210f4180d4c69fc1feb
+checksum=43f141970ab61d9c5a993dcf094625d9a7a1d24212a3c2443e7092b40c3a354c
 _baseUrl="https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable"
 _filename="google-chrome-stable_${VERSION%_*}-1_amd64.deb"
 DISTFILE="${_baseUrl}/${_filename}"
diff --git a/srcpkgs/chromium-widevine/template b/srcpkgs/chromium-widevine/template
index 4f016b60aa97..cac7cca3dd56 100644
--- a/srcpkgs/chromium-widevine/template
+++ b/srcpkgs/chromium-widevine/template
@@ -6,7 +6,7 @@ _chromeVersion="current"
 _channel="stable"
 
 pkgname=chromium-widevine
-version=89.0.4389.82
+version=90.0.4430.72
 revision=1
 archs="x86_64"
 create_wrksrc=yes

From 9d67f24cd1832bbf143d0aa20feb45bc4b9923a5 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Mon, 19 Apr 2021 17:50:07 +0300
Subject: [PATCH 1423/2024] tiff: ignore rc for updates

---
 srcpkgs/tiff/update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tiff/update b/srcpkgs/tiff/update
index 125db71da82d..2e4fc10d2079 100644
--- a/srcpkgs/tiff/update
+++ b/srcpkgs/tiff/update
@@ -1 +1 @@
-ignore="*beta*"
+ignore="*beta* *rc*"

From e8f5c046790ed7e9f5cb39b57eda3d47b8fd352a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Mon, 19 Apr 2021 15:58:37 +0200
Subject: [PATCH 1424/2024] cargo-geiger: update to 0.11.1.

---
 srcpkgs/cargo-geiger/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cargo-geiger/template b/srcpkgs/cargo-geiger/template
index 24a3e3a35e55..ffe49404187e 100644
--- a/srcpkgs/cargo-geiger/template
+++ b/srcpkgs/cargo-geiger/template
@@ -1,7 +1,7 @@
 # Template file for 'cargo-geiger'
 pkgname=cargo-geiger
-version=0.10.2
-revision=2
+version=0.11.1
+revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_wrksrc="${pkgname}"
 build_style=cargo
@@ -12,7 +12,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"
 homepage="https://github.com/rust-secure-code/cargo-geiger"
 distfiles="https://github.com/rust-secure-code/cargo-geiger/archive/cargo-geiger-${version}.tar.gz"
-checksum=5cc0d568047561781680f40f0ee49d8cafdcb24e25df3872b539faf4629af56c
+checksum=d3c88fc3bdb574108504a1a49ae7b8ee5b55b1744a47d58214d0f088d2b2ef00
 
 post_install() {
 	vlicense LICENSE-MIT

From 7c3f3a6ec448a7b8847bf3a0e2b5d706db6024b0 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Mon, 19 Apr 2021 17:40:39 +0300
Subject: [PATCH 1425/2024] libwebp: update to 1.2.0.

---
 srcpkgs/libwebp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libwebp/template b/srcpkgs/libwebp/template
index b67a2fb6bf02..7e3d09050bf9 100644
--- a/srcpkgs/libwebp/template
+++ b/srcpkgs/libwebp/template
@@ -1,7 +1,7 @@
 # Template file for 'libwebp'
 pkgname=libwebp
-version=1.1.0
-revision=2
+version=1.2.0
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static --enable-libwebpmux
  --enable-libwebpdemux --enable-libwebpdecoder"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://developers.google.com/speed/webp/"
 distfiles="http://downloads.webmproject.org/releases/webp/${pkgname}-${version}.tar.gz"
-checksum=98a052268cc4d5ece27f76572a7f50293f439c17a98e67c4ea0c7ed6f50ef043
+checksum=2fc8bbde9f97f2ab403c0224fb9ca62b2e6852cbc519e91ceaa7c153ffd88a0c
 
 case "$XBPS_TARGET_MACHINE" in
 	armv6*) configure_args+=" --disable-neon";;

From e07d50728f91927eb1998e3fa71cdff1d7475cb0 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Mon, 19 Apr 2021 10:03:16 -0500
Subject: [PATCH 1426/2024] zrepl: update to 0.4.0.

---
 srcpkgs/zrepl/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zrepl/template b/srcpkgs/zrepl/template
index 15747454d02c..102ae31a17c4 100644
--- a/srcpkgs/zrepl/template
+++ b/srcpkgs/zrepl/template
@@ -1,6 +1,6 @@
 # Template file for 'zrepl'
 pkgname=zrepl
-version=0.2.1
+version=0.4.0
 revision=1
 build_style=go
 go_import_path=github.com/zrepl/zrepl
@@ -12,7 +12,7 @@ maintainer="Frans Bergman <frans@tankernn.eu>"
 license="MIT"
 homepage="https://github.com/zrepl/zrepl"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=df474e70f5a51d84816ee8a06038ded167a7548e547e2d2822c313f088eeeafd
+checksum=e7035a8a40913614f4ab24d7caad2c26419fd2b0aaa3565c16439e59214ae590
 
 conf_files="/etc/zrepl/*"
 
@@ -21,7 +21,7 @@ post_install() {
 	vinstall ${FILESDIR}/zrepl.yml 644 etc/zrepl
 	vsconf ${FILESDIR}/zrepl.yml
 	vcopy config/samples/* usr/share/examples/${pkgname}
-	vsconf dist/grafana/grafana-prometheus-zrepl-0.1.json
+	vsconf dist/grafana/grafana-prometheus-zrepl.json
 
 	vlicense LICENSE
 	vsv zrepl

From 8aeb34dc2571b0ef100ebdb9de02c420daeccc4b Mon Sep 17 00:00:00 2001
From: Isaac Freund <ifreund@ifreund.xyz>
Date: Wed, 7 Apr 2021 22:02:02 +0200
Subject: [PATCH 1427/2024] wlroots: update to 0.13.0.

---
 common/shlibs            |  2 +-
 srcpkgs/wlroots/template | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 001fcd56590d..5f51c81f52b9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3461,7 +3461,7 @@ libcodecore.so.0 libio.elementary.code-3.0_1
 libio.elementary.music-core.so.0 libio.elementary.music-5.0_1
 libpantheon-files-core.so.4 libio.elementary.files-4.1.4_1
 libpantheon-files-widgets.so.4 libio.elementary.files-4.1.4_1
-libwlroots.so.7 wlroots-0.12.0_1
+libwlroots.so.8 wlroots-0.13.0_1
 libbaseencode.so.1 libbaseencode-1.0.9_1
 libcotp.so.12 libcotp-1.2.1_1
 libunarr.so.1 libunarr-1.0.1_1
diff --git a/srcpkgs/wlroots/template b/srcpkgs/wlroots/template
index c4d3bad99c6b..fd3a4b0b5aae 100644
--- a/srcpkgs/wlroots/template
+++ b/srcpkgs/wlroots/template
@@ -1,25 +1,25 @@
 # Template file for 'wlroots'
 pkgname=wlroots
-version=0.12.0
-revision=2
+version=0.13.0
+revision=1
 build_style=meson
-# enable assertions - upstream uses them only for unreachable situations
-configure_args="-Dlogind=disabled -Dlibseat=enabled
- -Dxcb-errors=enabled -Dxcb-icccm=enabled -Dxwayland=enabled
- -Dx11-backend=enabled -Dexamples=false -Dwerror=false -Db_ndebug=false"
+# Follow upstream packaging recommendations:
+# https://github.com/swaywm/wlroots/wiki/Packaging-recommendations
+configure_args="--auto-features=enabled -Dlogind=disabled
+ -Dexamples=false -Dwerror=false -Db_ndebug=false"
 hostmakedepends="pkg-config wayland-devel"
 _devel_depends="MesaLib-devel libseat-devel eudev-libudev-devel libdrm-devel
  libinput-devel libxkbcommon-devel pixman-devel wayland-devel wayland-protocols
- xcb-util-errors-devel xcb-util-wm-devel"
+ xcb-util-errors-devel xcb-util-wm-devel xcb-util-renderutil-devel"
 makedepends="${_devel_depends}
  libxcb-devel xcb-util-cursor-devel xcb-util-devel xcb-util-image-devel
- xcb-util-keysyms-devel xcb-util-renderutil-devel xcb-util-xrm-devel"
+ xcb-util-keysyms-devel xcb-util-xrm-devel xorg-server-xwayland"
 short_desc="Modular Wayland compositor library"
 maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://github.com/swaywm/wlroots"
 distfiles="https://github.com/swaywm/wlroots/archive/${version}.tar.gz"
-checksum=c9e9f4f6d2f526d0b2886daf3ec37e64831773059aa669fb98a88522a1626bdb
+checksum=f6bea37fd4a6f5e5f552b83d61adae8c73e64b0bcb9ae0ab464ebcd9309d3cf3
 
 post_install() {
 	vlicense LICENSE

From 5b44ea3d346d067fbe3ba32e12e70d9bc7ea7108 Mon Sep 17 00:00:00 2001
From: Isaac Freund <ifreund@ifreund.xyz>
Date: Wed, 7 Apr 2021 22:42:06 +0200
Subject: [PATCH 1428/2024] sway: update to 1.6.

Use configure args recommended by upstream:
- new warnings shouldn't break building the package
- assertions are used only for supposedly unreachable code
and should be kept (our build style sets b_ndebug=true)
---
 srcpkgs/sway/INSTALL.msg        |   6 --
 srcpkgs/sway/patches/6046.patch | 133 --------------------------------
 srcpkgs/sway/template           |  12 +--
 3 files changed, 4 insertions(+), 147 deletions(-)
 delete mode 100644 srcpkgs/sway/INSTALL.msg
 delete mode 100644 srcpkgs/sway/patches/6046.patch

diff --git a/srcpkgs/sway/INSTALL.msg b/srcpkgs/sway/INSTALL.msg
deleted file mode 100644
index 05274ffcc3aa..000000000000
--- a/srcpkgs/sway/INSTALL.msg
+++ /dev/null
@@ -1,6 +0,0 @@
-Setting the SUID bit after install has been retired for all Wayland
-compositors. It is recommended that users use a session management daemon
-such as elogind or seatd and do not rely on compositors dropping privileges.
-
-All users who require this functionality will need to set the SUID bit manually
-after each update going forward.
diff --git a/srcpkgs/sway/patches/6046.patch b/srcpkgs/sway/patches/6046.patch
deleted file mode 100644
index 34845cd99b59..000000000000
--- a/srcpkgs/sway/patches/6046.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-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 2858c7026b56..3297f668adf4 100644
--- a/srcpkgs/sway/template
+++ b/srcpkgs/sway/template
@@ -1,8 +1,9 @@
 # Template file for 'sway'
 pkgname=sway
-version=1.5.1
-revision=2
+version=1.6
+revision=1
 build_style=meson
+configure_args="-Dwerror=false -Db_ndebug=false"
 conf_files="/etc/sway/config"
 hostmakedepends="pkg-config wayland-devel scdoc git"
 makedepends="wlroots-devel pcre-devel json-c-devel pango-devel cairo-devel
@@ -13,12 +14,7 @@ maintainer="Olaf Mersmann <olafm@p-value.net>"
 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
-}
+checksum=9ecfd2f38239f7e90922a13cd348fc95fc059e8fa0e4b75b8ffcc7b61685a5fb
 
 post_install() {
 	vlicense LICENSE

From d69f3327bf12dc3fcc18951b297b59a2d30218c8 Mon Sep 17 00:00:00 2001
From: Isaac Freund <ifreund@ifreund.xyz>
Date: Sat, 10 Apr 2021 19:46:49 +0200
Subject: [PATCH 1429/2024] hikari: update to 2.3.0.

---
 srcpkgs/hikari/INSTALL.msg | 6 ------
 srcpkgs/hikari/template    | 9 ++++++---
 2 files changed, 6 insertions(+), 9 deletions(-)
 delete mode 100644 srcpkgs/hikari/INSTALL.msg

diff --git a/srcpkgs/hikari/INSTALL.msg b/srcpkgs/hikari/INSTALL.msg
deleted file mode 100644
index 05274ffcc3aa..000000000000
--- a/srcpkgs/hikari/INSTALL.msg
+++ /dev/null
@@ -1,6 +0,0 @@
-Setting the SUID bit after install has been retired for all Wayland
-compositors. It is recommended that users use a session management daemon
-such as elogind or seatd and do not rely on compositors dropping privileges.
-
-All users who require this functionality will need to set the SUID bit manually
-after each update going forward.
diff --git a/srcpkgs/hikari/template b/srcpkgs/hikari/template
index 093d55610b0b..4d189cf0ae3e 100644
--- a/srcpkgs/hikari/template
+++ b/srcpkgs/hikari/template
@@ -1,6 +1,6 @@
 # Template file for 'hikari'
 pkgname=hikari
-version=2.2.3
+version=2.3.0
 revision=1
 build_style=gnu-makefile
 make_cmd=bmake
@@ -16,8 +16,11 @@ 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=0727d8652e6debea52a9d975bd656cb573556e0e14184b069925c40f2f1b02b4
+checksum=8577ea568d2a41b0dc7b2fae784446778e3ddd5b9563576c9756dfbf7b9435d2
 conf_files="/etc/pam.d/hikari-unlocker /etc/hikari/hikari.conf"
+# bmake's -q flag seems to differ in behavior from gnu make which causes the
+# build style's handling of the check target not existing to fail.
+make_check=no
 
 pre_build() {
 	# The hikari Makefile appends to the CFLAGS and LDFLAGS variables;
@@ -25,7 +28,7 @@ pre_build() {
 	# command line (i.e., when make_use_env is undefined), but it ignores
 	# the values in the environment when make_use_env=yes. The _EXTRA
 	# variables provided in the Makefile allow us to force the right flags.
-	export CFLAGS_EXTRA="${CFLAGS}"
+	export CFLAGS_EXTRA="${CFLAGS} -Wno-error"
 	export LDFLAGS_EXTRA="${LDFLAGS}"
 
 	# bmake tends to ignore CC in the environment

From 1294a9324db4df6da7fd0267c4bd6f0fad8b4e59 Mon Sep 17 00:00:00 2001
From: Isaac Freund <ifreund@ifreund.xyz>
Date: Sun, 18 Apr 2021 11:25:11 +0200
Subject: [PATCH 1430/2024] cage: update to 0.1.3.

---
 srcpkgs/cage/INSTALL.msg | 6 ------
 srcpkgs/cage/template    | 6 +++---
 2 files changed, 3 insertions(+), 9 deletions(-)
 delete mode 100644 srcpkgs/cage/INSTALL.msg

diff --git a/srcpkgs/cage/INSTALL.msg b/srcpkgs/cage/INSTALL.msg
deleted file mode 100644
index 05274ffcc3aa..000000000000
--- a/srcpkgs/cage/INSTALL.msg
+++ /dev/null
@@ -1,6 +0,0 @@
-Setting the SUID bit after install has been retired for all Wayland
-compositors. It is recommended that users use a session management daemon
-such as elogind or seatd and do not rely on compositors dropping privileges.
-
-All users who require this functionality will need to set the SUID bit manually
-after each update going forward.
diff --git a/srcpkgs/cage/template b/srcpkgs/cage/template
index 960ccfac2156..1b447bcf2ba1 100644
--- a/srcpkgs/cage/template
+++ b/srcpkgs/cage/template
@@ -1,7 +1,7 @@
 # Template file for 'cage'
 pkgname=cage
-version=0.1.2.1
-revision=3
+version=0.1.3
+revision=1
 build_style=meson
 configure_args="$(vopt_bool xwayland xwayland)"
 hostmakedepends="pkg-config wayland-devel scdoc"
@@ -12,7 +12,7 @@ maintainer="Illia Shestakov <ishestakov@airmail.cc>"
 license="MIT"
 homepage="https://www.hjdskes.nl/projects/cage/"
 distfiles="https://github.com/Hjdskes/cage/archive/v${version}.tar.gz"
-checksum=38a3e3968f00cc58fe1d9448e972cfac7d1efa30c48699f09032f264101a55ac
+checksum=c28aa8230f937c89b564967748451c1eb15d8633a71a1ed6e22d532afa15462e
 
 build_options="xwayland"
 build_options_default="xwayland"

From d265240318c5a31193138f8a7e259b7e49389f20 Mon Sep 17 00:00:00 2001
From: Isaac Freund <ifreund@ifreund.xyz>
Date: Sun, 18 Apr 2021 12:18:32 +0200
Subject: [PATCH 1431/2024] wayfire: revbump for wlroots 0.13.0.

---
 srcpkgs/wayfire/INSTALL.msg             |   6 -
 srcpkgs/wayfire/patches/wlroots13.patch | 189 ++++++++++++++++++++++++
 srcpkgs/wayfire/template                |   3 +-
 3 files changed, 191 insertions(+), 7 deletions(-)
 delete mode 100644 srcpkgs/wayfire/INSTALL.msg
 create mode 100644 srcpkgs/wayfire/patches/wlroots13.patch

diff --git a/srcpkgs/wayfire/INSTALL.msg b/srcpkgs/wayfire/INSTALL.msg
deleted file mode 100644
index 05274ffcc3aa..000000000000
--- a/srcpkgs/wayfire/INSTALL.msg
+++ /dev/null
@@ -1,6 +0,0 @@
-Setting the SUID bit after install has been retired for all Wayland
-compositors. It is recommended that users use a session management daemon
-such as elogind or seatd and do not rely on compositors dropping privileges.
-
-All users who require this functionality will need to set the SUID bit manually
-after each update going forward.
diff --git a/srcpkgs/wayfire/patches/wlroots13.patch b/srcpkgs/wayfire/patches/wlroots13.patch
new file mode 100644
index 000000000000..d42dbc425a3a
--- /dev/null
+++ b/srcpkgs/wayfire/patches/wlroots13.patch
@@ -0,0 +1,189 @@
+diff --git a/meson.build b/meson.build
+index 4a8992cb..117f928c 100644
+--- a/meson.build
++++ b/meson.build
+@@ -28,7 +28,7 @@ libinput       = dependency('libinput', version: '>=1.7.0')
+ pixman         = dependency('pixman-1')
+ threads        = dependency('threads')
+ xkbcommon      = dependency('xkbcommon')
+-wlroots        = dependency('wlroots', version: ['>=0.12.0', '<0.13.0'], required: get_option('use_system_wlroots'))
++wlroots        = dependency('wlroots', version: ['>=0.13.0', '<0.14.0'], required: get_option('use_system_wlroots'))
+ wfconfig       = dependency('wf-config', version: ['>=0.7.0', '<0.8.0'], required: get_option('use_system_wfconfig'))
+ 
+ use_system_wlroots = not get_option('use_system_wlroots').disabled() and wlroots.found()
+diff --git a/plugins/single_plugins/vswipe.cpp b/plugins/single_plugins/vswipe.cpp
+index da37448c..26c8f399 100644
+--- a/plugins/single_plugins/vswipe.cpp
++++ b/plugins/single_plugins/vswipe.cpp
+@@ -1,3 +1,4 @@
++#include <wayfire/nonstd/wlroots-full.hpp>
+ #include <wayfire/plugin.hpp>
+ #include <wayfire/output.hpp>
+ #include <wayfire/core.hpp>
+diff --git a/src/api/wayfire/nonstd/wlroots-full.hpp b/src/api/wayfire/nonstd/wlroots-full.hpp
+index 77a12c70..4a24f1a1 100644
+--- a/src/api/wayfire/nonstd/wlroots-full.hpp
++++ b/src/api/wayfire/nonstd/wlroots-full.hpp
+@@ -112,6 +112,8 @@ extern "C"
+ #include <wlr/types/wlr_pointer_gestures_v1.h>
+ #include <wlr/types/wlr_idle.h>
+ #include <wlr/interfaces/wlr_keyboard.h>
++#include <wlr/types/wlr_touch.h>
++#include <wlr/types/wlr_pointer_gestures_v1.h>
+ #include <wlr/xcursor.h>
+ #include <wlr/types/wlr_data_control_v1.h>
+ #include <wlr/types/wlr_virtual_keyboard_v1.h>
+diff --git a/src/api/wayfire/nonstd/wlroots.hpp b/src/api/wayfire/nonstd/wlroots.hpp
+index 4686d14f..402ab3cd 100644
+--- a/src/api/wayfire/nonstd/wlroots.hpp
++++ b/src/api/wayfire/nonstd/wlroots.hpp
+@@ -43,7 +43,14 @@ extern "C"
+     struct wlr_viewporter;
+ 
+ #include <wlr/types/wlr_input_device.h>
++#include <wlr/types/wlr_pointer.h>
++#include <wlr/types/wlr_keyboard.h>
++#include <wlr/types/wlr_touch.h>
+ #include <wlr/types/wlr_output.h>
+ #include <wlr/types/wlr_box.h>
+ #include <wlr/util/edges.h>
++#include <wayland-server.h>
++
++    static constexpr uint32_t WLR_KEY_PRESSED  = WL_KEYBOARD_KEY_STATE_PRESSED;
++    static constexpr uint32_t WLR_KEY_RELEASED = WL_KEYBOARD_KEY_STATE_RELEASED;
+ }
+diff --git a/src/core/opengl.cpp b/src/core/opengl.cpp
+index 09022930..aacb0800 100644
+--- a/src/core/opengl.cpp
++++ b/src/core/opengl.cpp
+@@ -227,25 +227,27 @@ void render_rectangle(wf::geometry_t geometry, wf::color_t color,
+ 
+ void render_begin()
+ {
+-    /* No real reason for 10, 10, 0 but it doesn't matter */
+-    render_begin(10, 10, 0);
++    if (!wlr_egl_is_current(wf::get_core_impl().egl))
++    {
++        wlr_egl_make_current(wf::get_core_impl().egl);
++    }
++
++    GL_CALL(glEnable(GL_BLEND));
++    GL_CALL(glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA));
+ }
+ 
+ void render_begin(const wf::framebuffer_base_t& fb)
+ {
+-    render_begin(fb.viewport_width, fb.viewport_height, fb.fb);
++    render_begin();
++    fb.bind();
+ }
+ 
+-void render_begin(int32_t viewport_width, int32_t viewport_height, uint32_t fb)
++void render_begin(int32_t width, int32_t height, uint32_t fb)
+ {
+-    if (!wlr_egl_is_current(wf::get_core_impl().egl))
+-    {
+-        wlr_egl_make_current(wf::get_core_impl().egl, EGL_NO_SURFACE, NULL);
+-    }
++    render_begin();
+ 
+-    wlr_renderer_begin(wf::get_core_impl().renderer,
+-        viewport_width, viewport_height);
+-    GL_CALL(glBindFramebuffer(GL_FRAMEBUFFER, fb));
++    GL_CALL(glBindFramebuffer(GL_DRAW_FRAMEBUFFER, fb));
++    GL_CALL(glViewport(0, 0, width, height));
+ }
+ 
+ void clear(wf::color_t col, uint32_t mask)
+@@ -257,8 +259,7 @@ void clear(wf::color_t col, uint32_t mask)
+ void render_end()
+ {
+     GL_CALL(glBindFramebuffer(GL_FRAMEBUFFER, current_output_fb));
+-    wlr_renderer_scissor(wf::get_core().renderer, NULL);
+-    wlr_renderer_end(wf::get_core().renderer);
++    GL_CALL(glDisable(GL_SCISSOR_TEST));
+ }
+ }
+ 
+diff --git a/src/core/seat/cursor.cpp b/src/core/seat/cursor.cpp
+index 7ba23b06..d6006f17 100644
+--- a/src/core/seat/cursor.cpp
++++ b/src/core/seat/cursor.cpp
+@@ -160,7 +160,10 @@ void wf::cursor_t::set_cursor(std::string name)
+         name = "left_ptr";
+     }
+ 
+-    wlr_xcursor_manager_set_cursor_image(xcursor, name.c_str(), cursor);
++    idle_set_cursor.run_once([name, this] ()
++    {
++        wlr_xcursor_manager_set_cursor_image(xcursor, name.c_str(), cursor);
++    });
+ }
+ 
+ void wf::cursor_t::unhide_cursor()
+@@ -175,6 +178,7 @@ void wf::cursor_t::unhide_cursor()
+ 
+ void wf::cursor_t::hide_cursor()
+ {
++    idle_set_cursor.disconnect();
+     wlr_cursor_set_surface(cursor, NULL, 0, 0);
+     this->hide_ref_counter++;
+ }
+diff --git a/src/core/seat/cursor.hpp b/src/core/seat/cursor.hpp
+index 0c4ab8fe..aec8f1aa 100644
+--- a/src/core/seat/cursor.hpp
++++ b/src/core/seat/cursor.hpp
+@@ -3,6 +3,7 @@
+ 
+ #include "seat.hpp"
+ #include "wayfire/plugin.hpp"
++#include "wayfire/util.hpp"
+ 
+ namespace wf
+ {
+@@ -28,6 +29,13 @@ struct cursor_t
+     void hide_cursor();
+     int hide_ref_counter = 0;
+ 
++    /**
++     * Delay setting the cursor, in order to avoid setting the cursor
++     * multiple times in a single frame and to avoid setting it in the middle
++     * of the repaint loop (not allowed by wlroots).
++     */
++    wf::wl_idle_call idle_set_cursor;
++
+     /**
+      * Start/stop touchscreen mode, which means the cursor will be hidden.
+      * It will be shown again once a pointer or tablet event happens.
+diff --git a/src/main.cpp b/src/main.cpp
+index bd07d618..0c5e97e7 100644
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -260,7 +260,7 @@ int main(int argc, char *argv[])
+     /** TODO: move this to core_impl constructor */
+     core.display  = display;
+     core.ev_loop  = wl_display_get_event_loop(core.display);
+-    core.backend  = wlr_backend_autocreate(core.display, NULL);
++    core.backend  = wlr_backend_autocreate(core.display);
+     core.renderer = wlr_backend_get_renderer(core.backend);
+     core.egl = wlr_gles2_renderer_get_egl(core.renderer);
+     assert(core.egl);
+diff --git a/src/output/render-manager.cpp b/src/output/render-manager.cpp
+index 2039333c..cb2a38bf 100644
+--- a/src/output/render-manager.cpp
++++ b/src/output/render-manager.cpp
+@@ -1019,8 +1019,12 @@ class wf::render_manager::impl
+             swap_damage |= output_damage->get_wlr_damage_box();
+         }
+ 
+-        OpenGL::render_begin(postprocessing->get_target_framebuffer());
+-        wlr_output_render_software_cursors(output->handle, swap_damage.to_pixman());
++        OpenGL::render_begin();
++        wlr_renderer_begin(wf::get_core().renderer,
++            output->handle->width, output->handle->height);
++        wlr_output_render_software_cursors(output->handle,
++            swap_damage.to_pixman());
++        wlr_renderer_end(wf::get_core().renderer);
+         OpenGL::render_end();
+ 
+         /* Part 4: postprocessing effects */
diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template
index ab6136b72473..a7e80c4239e3 100644
--- a/srcpkgs/wayfire/template
+++ b/srcpkgs/wayfire/template
@@ -1,7 +1,7 @@
 # Template file for 'wayfire'
 pkgname=wayfire
 version=0.7.0
-revision=2
+revision=3
 _utils_commit=f45641beef46babdc8f1b8d18a924e72beaf8ee6
 _touch_commit=b1075c54a280f913edc26b9757262f4f9d6b62b0
 build_style=meson
@@ -19,6 +19,7 @@ distfiles="https://github.com/WayfireWM/wayfire/archive/v${version}.tar.gz
 checksum="b1a94ad2843db19e78cbd361ceebaade4507647ad893d5b5117a9fc7724ce41c
  d172f8c21e0bac01e4116cd957fb0159c5cb39ddfdce897beb0d9c753796d5f1
  2b22e03d3a522baeff5798f630ffe5aa95899fd3233b291527503af5fd3e30be"
+patch_args=-Np1
 
 # Optimization for nested STL calls
 CXXFLAGS="-O3"

From c4242196218c35fcd34a6e850c8b6ad89ca7bdfc Mon Sep 17 00:00:00 2001
From: Isaac Freund <ifreund@ifreund.xyz>
Date: Sun, 18 Apr 2021 12:31:27 +0200
Subject: [PATCH 1432/2024] wayfire-plugins-extra: revbump for wlroots 0.13.0.

---
 srcpkgs/wayfire-plugins-extra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wayfire-plugins-extra/template b/srcpkgs/wayfire-plugins-extra/template
index 60fd9784e783..320429eb61d1 100644
--- a/srcpkgs/wayfire-plugins-extra/template
+++ b/srcpkgs/wayfire-plugins-extra/template
@@ -1,7 +1,7 @@
 # Template file for 'wayfire-plugins-extra'
 pkgname=wayfire-plugins-extra
 version=0.7.0
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config wayland-devel"
 makedepends="wayfire-devel glibmm-devel"

From a6d851be009326807cc268ba717f99655f910a4f Mon Sep 17 00:00:00 2001
From: Isaac Freund <ifreund@ifreund.xyz>
Date: Mon, 19 Apr 2021 00:07:05 +0200
Subject: [PATCH 1433/2024] xdg-desktop-portal-wlr: update to 0.3.0.

---
 .../fix-return-value-on-cmd-failure.patch     | 22 +++++++++++++++++++
 srcpkgs/xdg-desktop-portal-wlr/template       | 10 +++++----
 2 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/xdg-desktop-portal-wlr/patches/fix-return-value-on-cmd-failure.patch

diff --git a/srcpkgs/xdg-desktop-portal-wlr/patches/fix-return-value-on-cmd-failure.patch b/srcpkgs/xdg-desktop-portal-wlr/patches/fix-return-value-on-cmd-failure.patch
new file mode 100644
index 000000000000..40b7a809516c
--- /dev/null
+++ b/srcpkgs/xdg-desktop-portal-wlr/patches/fix-return-value-on-cmd-failure.patch
@@ -0,0 +1,22 @@
+From ebb50839a560134d44d7a7512faae15deae9c0fb Mon Sep 17 00:00:00 2001
+From: Stefano Ragni <stefano.ragni@outlook.com>
+Date: Sun, 18 Apr 2021 19:55:19 +0200
+Subject: [PATCH] wlr_screencast: fix return value on cmd failure
+
+---
+ src/screencast/wlr_screencast.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/screencast/wlr_screencast.c b/src/screencast/wlr_screencast.c
+index 45bea73..a3b0637 100644
+--- a/src/screencast/wlr_screencast.c
++++ b/src/screencast/wlr_screencast.c
+@@ -406,7 +406,7 @@ static bool wlr_output_chooser(struct xdpw_output_chooser *chooser,
+ 
+ 	if (!wait_chooser(pid)) {
+ 		close(chooser_out[0]);
+-		goto end;
++		return false;
+ 	}
+ 
+ 	FILE *f = fdopen(chooser_out[0], "r");
diff --git a/srcpkgs/xdg-desktop-portal-wlr/template b/srcpkgs/xdg-desktop-portal-wlr/template
index 3392d274358e..2854b7e0de27 100644
--- a/srcpkgs/xdg-desktop-portal-wlr/template
+++ b/srcpkgs/xdg-desktop-portal-wlr/template
@@ -1,17 +1,19 @@
 # Template file for 'xdg-desktop-portal-wlr'
 pkgname=xdg-desktop-portal-wlr
-version=0.2.0
+version=0.3.0
 revision=1
 build_style=meson
-hostmakedepends="pkg-config wayland-devel"
-makedepends="wayland-devel wayland-protocols elogind-devel pipewire-devel"
+hostmakedepends="pkg-config wayland-devel scdoc"
+makedepends="wayland-devel wayland-protocols elogind-devel pipewire-devel
+ iniparser-devel"
 depends="xdg-desktop-portal"
 short_desc="Backend of xdg-desktop-portal for wlroots"
 maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://github.com/emersion/xdg-desktop-portal-wlr"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=316f5df3a70331c2fa5476e33acf92349e56eb0514d245b942fcf3122ba32df6
+checksum=5c80469b04c4e5d22689f755d61adcf92758bc1c85f0747ae1f586b4bcd7873c
+patch_args=-Np1
 
 post_install() {
 	vlicense LICENSE

From fe03260f474448ea759029e095e9fb060865e6c1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 19 Apr 2021 12:03:52 +0200
Subject: [PATCH 1434/2024] less: update to 581.

---
 srcpkgs/less/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/less/template b/srcpkgs/less/template
index 4d5077313b8b..945149838fc0 100644
--- a/srcpkgs/less/template
+++ b/srcpkgs/less/template
@@ -1,6 +1,6 @@
 # Template file for 'less'
 pkgname=less
-version=563
+version=581
 revision=1
 build_style=gnu-configure
 configure_args="--with-regex=pcre"
@@ -10,4 +10,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.greenwoodsoftware.com/less"
 distfiles="http://www.greenwoodsoftware.com/less/less-${version}.tar.gz"
-checksum=ce5b6d2b9fc4442d7a07c93ab128d2dff2ce09a1d4f2d055b95cf28dd0dc9a9a
+checksum=1d077f83fe7867e0ecfd278eab3122326b21c22c9161366189c38e09b96a2c65

From 8c1c341e98fbf31c1f68582fdb5cbaad647c6aa0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 19 Apr 2021 12:15:02 +0200
Subject: [PATCH 1435/2024] gedit: update to 40.1.

---
 srcpkgs/gedit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gedit/template b/srcpkgs/gedit/template
index 8ec2ec020a9b..26778866273c 100644
--- a/srcpkgs/gedit/template
+++ b/srcpkgs/gedit/template
@@ -1,6 +1,6 @@
 # Template file for 'gedit'
 pkgname=gedit
-version=40.0
+version=40.1
 revision=1
 build_helper="gir"
 build_style=meson
@@ -17,7 +17,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Gedit"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0e8aac632b8879a57346aaf35c66f7df40c3fd5ea37a78e04ea218e41e3984e9
+checksum=55e394a82cb65678b1ab49526cf5bd43f00d8fba21476a4849051a8e137d3691
 shlib_provides="libgedit-40.0.so"
 python_version=3
 

From bbc599d249f0fa7d187e9c45b2bf71b90bd152a0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 19 Apr 2021 12:11:18 +0200
Subject: [PATCH 1436/2024] file-roller: update to 3.38.1.

---
 srcpkgs/file-roller/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/file-roller/template b/srcpkgs/file-roller/template
index f856c324229c..7b86c7282de6 100644
--- a/srcpkgs/file-roller/template
+++ b/srcpkgs/file-roller/template
@@ -1,6 +1,6 @@
 # Template file for 'file-roller'
 pkgname=file-roller
-version=3.38.0
+version=3.38.1
 revision=1
 build_style=meson
 hostmakedepends="gettext glib-devel itstool pkg-config"
@@ -12,6 +12,6 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/FileRoller"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=723d1c6e567d35dad5eeeaeb86b8d18705658ee73e0b3b97ea16adc7a4dc331a
+checksum=94a0130e12d321aa119793a14d09716523e2e4a61f29570cee53fd88dd6abc57
 
 CFLAGS="-fcommon"

From 4bf2af4e8d3d65ef1f607ca78fcf443023491bd8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 19 Apr 2021 12:09:57 +0200
Subject: [PATCH 1437/2024] fbgrab: update to 1.5.

---
 srcpkgs/fbgrab/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fbgrab/template b/srcpkgs/fbgrab/template
index b0c1000a63a9..ff6fb48eb988 100644
--- a/srcpkgs/fbgrab/template
+++ b/srcpkgs/fbgrab/template
@@ -1,6 +1,6 @@
 # Template file for 'fbgrab'
 pkgname=fbgrab
-version=1.4
+version=1.5
 revision=1
 build_style=gnu-makefile
 makedepends="zlib-devel libpng-devel"
@@ -9,4 +9,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/GunnarMonell/fbgrab"
 distfiles="https://github.com/GunnarMonell/fbgrab/archive/$version.tar.gz"
-checksum="62d7aa82138ac36db0921832f3b5267b4cffc0dc22c8701857ebcb997960a32e"
+checksum=0202a9c4fb430eee4d8f566d09ab5f6e35c50804a192ba106046e54eb886f8f1

From 937b23eb5b9abdcc7c46b559b5d3c76d1d739d4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sun, 18 Apr 2021 14:18:46 +0200
Subject: [PATCH 1438/2024] conmon: update to 2.0.27.

---
 srcpkgs/conmon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/conmon/template b/srcpkgs/conmon/template
index 9154f4ca6b7b..d1dca472b03b 100644
--- a/srcpkgs/conmon/template
+++ b/srcpkgs/conmon/template
@@ -1,6 +1,6 @@
 # Template file for 'conmon'
 pkgname=conmon
-version=2.0.26
+version=2.0.27
 revision=1
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://github.com/containers/conmon"
 distfiles="https://github.com/containers/conmon/archive/v${version}.tar.gz"
-checksum=845744c3323bbf9adab4444d70fd7de0ceb12a578c9cf2fd2366c6bed0ac7970
+checksum=cb953fa418835a3f57af175df3641140d9c44ec219a7ad2efcc07952241f9ea5
 
 do_install() {
 	vbin bin/conmon

From 4237aee7e1eb205c42ff8207223bbfba9e9647d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sun, 18 Apr 2021 14:19:20 +0200
Subject: [PATCH 1439/2024] fuse-overlayfs: update to 1.5.0.

---
 srcpkgs/fuse-overlayfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fuse-overlayfs/template b/srcpkgs/fuse-overlayfs/template
index 8a7ef532b2cc..6e830c071cd0 100644
--- a/srcpkgs/fuse-overlayfs/template
+++ b/srcpkgs/fuse-overlayfs/template
@@ -1,6 +1,6 @@
 # Template file for 'fuse-overlayfs'
 pkgname=fuse-overlayfs
-version=1.4.0
+version=1.5.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="autoconf automake pkg-config"
@@ -10,7 +10,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/containers/fuse-overlayfs"
 distfiles="https://github.com/containers/fuse-overlayfs/archive/v${version}.tar.gz"
-checksum=7e5666aef4f2047e6a5202d6438b08c2d314dba5b40e431014e7dbb8168d9018
+checksum=6c81b65b71067b303aaa9871f512c2cabc23e2b793f19c6c854d01a492b5a923
 
 pre_configure() {
 	./autogen.sh

From dadc2f61d5b56ceae2d9273cbd47d88867c21bf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sun, 18 Apr 2021 14:19:43 +0200
Subject: [PATCH 1440/2024] podman: update to 3.1.1.

---
 srcpkgs/podman/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index a875fdc013a9..710f2352df44 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,6 +1,6 @@
 # Template file for 'podman'
 pkgname=podman
-version=3.1.0
+version=3.1.1
 revision=1
 build_style=go
 go_import_path="github.com/containers/podman/v3"
@@ -13,8 +13,8 @@ short_desc="Simple management tool for containers and images"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://podman.io/"
-distfiles="https://github.com/containers/libpod/archive/v${version}.tar.gz"
-checksum=60031aa620cbfab641ffef9cb4e68240a0383c23ffd0276938684e98794bb5db
+distfiles="https://github.com/containers/podman/archive/v${version}.tar.gz"
+checksum=4e6fb106c6363566b6edc4ac6caee0bdf6b788e01255c3b3bfcb64f4b6842229
 
 if [ "$CROSS_BUILD" ]; then
 	go_build_tags+=" containers_image_openpgp"

From 57b34ef4d24d9d75875bdc231cace79d93cb0ecc Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 20 Apr 2021 09:43:15 +0200
Subject: [PATCH 1441/2024] glab: update to 1.16.0.

---
 srcpkgs/glab/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/glab/template b/srcpkgs/glab/template
index 0a9e24b29972..1a520e436e55 100644
--- a/srcpkgs/glab/template
+++ b/srcpkgs/glab/template
@@ -1,6 +1,6 @@
 # Template file for 'glab'
 pkgname=glab
-version=1.14.0
+version=1.16.0
 revision=1
 build_style=go
 go_import_path=github.com/profclems/glab
@@ -10,7 +10,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/profclems/glab"
 distfiles=https://github.com/profclems/glab/archive/v$version.tar.gz
-checksum=927206802cda67f0b725d0ed2b355a67ab9eb560a9e8b8c6e4ca994d9aba3daa
+checksum=eac7ac0dae3b709aea7c7eaa578d09b8f101e590f1c2d83c66926afa233993b0
 
 post_install() {
 	vlicense LICENSE

From b7c20ae6220fe8125f0b51394ff64396e7116b73 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 19 Apr 2021 12:08:52 +0200
Subject: [PATCH 1442/2024] faketime: update to 0.9.9.

---
 srcpkgs/faketime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/faketime/template b/srcpkgs/faketime/template
index ba9acf87766b..aa450abd50ab 100644
--- a/srcpkgs/faketime/template
+++ b/srcpkgs/faketime/template
@@ -1,6 +1,6 @@
 # Template file for 'faketime'
 pkgname=faketime
-version=0.9.8
+version=0.9.9
 revision=1
 wrksrc=lib$pkgname-$version
 build_style=gnu-makefile
@@ -9,6 +9,6 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/wolfcw/libfaketime"
 distfiles="https://github.com/wolfcw/libfaketime/archive/v$version.tar.gz"
-checksum=06288237cd5890eca148489e5b904ed852ed0ffa8424bfb479342f4daa8442a3
+checksum=57d0181150361c0a9b5c8eef05b11392f6134ada2c2d998e92e63daed639647c
 CFLAGS='-fPIC -DPREFIX=\"/usr\" -DLIBDIRNAME=\"/lib/faketime\"'
 LDFLAGS='-lpthread'

From 0a6f4449977013b5736d23859176b4e9822b5de1 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 19 Apr 2021 10:49:45 +0200
Subject: [PATCH 1443/2024] miniserve: update to 0.14.0.

---
 srcpkgs/miniserve/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/miniserve/template b/srcpkgs/miniserve/template
index 9a04ae8d2b29..6b55e67ad131 100644
--- a/srcpkgs/miniserve/template
+++ b/srcpkgs/miniserve/template
@@ -1,6 +1,6 @@
 # Template file for 'miniserve'
 pkgname=miniserve
-version=0.13.0
+version=0.14.0
 revision=1
 build_style=cargo
 checkdepends="curl"
@@ -9,7 +9,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/svenstaro/miniserve"
 distfiles="https://github.com/svenstaro/miniserve/archive/v${version}.tar.gz"
-checksum=3578fd2dfe8dbebecd15b1e82cfb6d6656fed5e54ae4fccc4e7a6879b61dd1e1
+checksum=68e21c35a4577251f656f3d1ccac2de23abd68432810b11556bcc8976bb19fc5
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|arm*|aarch64*) ;;

From a9985acafbc5c842d0f7c25ac298103ee6119f91 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 6 Apr 2021 20:11:23 +0200
Subject: [PATCH 1444/2024] cairo-dock-plugins: replace vte290 with vte3.

---
 srcpkgs/cairo-dock-plugins/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cairo-dock-plugins/template b/srcpkgs/cairo-dock-plugins/template
index 7069ed9ed64d..6bb439f1b5df 100644
--- a/srcpkgs/cairo-dock-plugins/template
+++ b/srcpkgs/cairo-dock-plugins/template
@@ -6,7 +6,7 @@ build_style=cmake
 hostmakedepends="gettext pkg-config"
 makedepends="alsa-lib-devel fftw-devel pulseaudio-devel libexif-devel
  libical-devel libxklavier-devel zeitgeist-devel libsensors-devel vala-devel
- cairo-dock-devel gnome-menus-devel vte290-devel python3-devel upower-devel"
+ cairo-dock-devel gnome-menus-devel vte3-devel python3-devel upower-devel"
 depends="cairo-dock>=${version} upower"
 short_desc="Plugins for cairo-dock"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 3331cb62ffac1f1091dd1c28c1af55ca40e3522b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 6 Apr 2021 20:19:05 +0200
Subject: [PATCH 1445/2024] nemiver: replace vte290 with vte3.

This commit also fixes issues with xlint.
---
 srcpkgs/nemiver/template | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/nemiver/template b/srcpkgs/nemiver/template
index 8c6f02c6b0c6..947ef8352a17 100644
--- a/srcpkgs/nemiver/template
+++ b/srcpkgs/nemiver/template
@@ -1,22 +1,26 @@
-# Template build file for 'nemiver'.
+# Template file for 'nemiver'
 pkgname=nemiver
 version=0.9.6
-revision=4
-lib32disabled=yes
+revision=5
 build_style=gnu-configure
 configure_args="--disable-static --enable-gsettings=yes
  --disable-schemas-install --disable-schemas-compile"
-depends="gdb gsettings-desktop-schemas"
+hostmakedepends="pkg-config gdb intltool itstool glib-devel"
 makedepends="boost-devel sqlite-devel libxml2-devel libgtop-devel ghex-devel
- gtksourceviewmm-devel vte290-devel gsettings-desktop-schemas-devel
+ gtksourceviewmm-devel vte3-devel gsettings-desktop-schemas-devel
  libgdlmm-devel"
-hostmakedepends="pkg-config gdb intltool itstool glib-devel"
+depends="gdb gsettings-desktop-schemas"
 short_desc="Graphical front-end for gdb"
 maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-2.0-only"
 homepage="https://wiki.gnome.org/Apps/Nemiver"
-license="GPL-2"
 distfiles="https://download.gnome.org/sources/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=85ab8cf6c4f83262f441cb0952a6147d075c3c53d0687389a3555e946b694ef2
+lib32disabled=yes
+
+pre_configure() {
+	cp data/nemiver.appdata.xml data/nemiver.appdata.xml.in
+}
 
 post_install() {
 	rm -rf ${DESTDIR}/usr/include

From 550fd75231b0bc01f50256f70ca4b9712b20e707 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 6 Apr 2021 20:27:56 +0200
Subject: [PATCH 1446/2024] removed-packages: add vte290

---
 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 163647c10e49..7e5d660788ad 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=42
+revision=43
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -292,6 +292,8 @@ replaces="
  vte<=0.28.2_16
  vte-devel<=0.28.2_16
  vte-python<=0.28.2_16
+ vte290-devel<=0.36.5_5
+ vte290<=0.36.5_5
  wireguard-go<=0.0.20181222_2
  wireshark-gtk<=3.0.7_1
  libxnoise<=0.2.21_4

From 31b8a4feaea271fdca82196adc999307137ba36b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 6 Apr 2021 20:29:44 +0200
Subject: [PATCH 1447/2024] vte290: removed, obsolete. use vte3 instead

---
 srcpkgs/vte290-devel    |  1 -
 srcpkgs/vte290/template | 47 -----------------------------------------
 srcpkgs/vte290/update   |  2 --
 3 files changed, 50 deletions(-)
 delete mode 120000 srcpkgs/vte290-devel
 delete mode 100644 srcpkgs/vte290/template
 delete mode 100644 srcpkgs/vte290/update

diff --git a/srcpkgs/vte290-devel b/srcpkgs/vte290-devel
deleted file mode 120000
index 1c5ff05369a4..000000000000
--- a/srcpkgs/vte290-devel
+++ /dev/null
@@ -1 +0,0 @@
-vte290
\ No newline at end of file
diff --git a/srcpkgs/vte290/template b/srcpkgs/vte290/template
deleted file mode 100644
index c030b2c06b45..000000000000
--- a/srcpkgs/vte290/template
+++ /dev/null
@@ -1,47 +0,0 @@
-# Template file for 'vte290'
-pkgname=vte290
-version=0.36.5
-revision=5
-wrksrc=vte-${version}
-build_style=gnu-configure
-build_helper="gir"
-configure_args="--with-gtk=3.0 --disable-gnome-pty-helper --disable-static
- $(vopt_enable gir introspection) $(vopt_enable gir vala)"
-hostmakedepends="glib-devel intltool pkg-config
- $(vopt_if gir 'gobject-introspection vala-devel')"
-makedepends="gtk+3-devel ncurses-devel"
-short_desc="Terminal widget with improved accessibility and I18N support"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1-or-later"
-homepage="http://www.gnome.org"
-distfiles="${GNOME_SITE}/vte/${version%.*}/vte-${version}.tar.xz"
-checksum=c2c2ce9640f08b07667f1037862fe991081495446b735c0afb98f45e35b64edf
-
-# Fix musl build
-CFLAGS="-D_GNU_SOURCE"
-# Package build options
-build_options="gir"
-build_options_default="gir"
-
-post_patch() {
-	vsed -i -e "/DATADIRNAME=/s/=.*/=share/" configure
-}
-
-post_install() {
-	# Rename conflicting file
-	mv ${DESTDIR}/etc/profile.d/{vte,vte290}.sh
-}
-
-vte290-devel_package() {
-	depends="gtk+3-devel vte290>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-		if [ "$build_option_gir" ]; then
-			vmove usr/share/gir-1.0
-		fi
-		vmove usr/share/gtk-doc
-	}
-}
diff --git a/srcpkgs/vte290/update b/srcpkgs/vte290/update
deleted file mode 100644
index d7d8a504da78..000000000000
--- a/srcpkgs/vte290/update
+++ /dev/null
@@ -1,2 +0,0 @@
-pkgname=vte
-ignore="[!0].* 0.[!3]* 0.3[!6]*"

From f67223d8a7a6ab64507603ab64c98fb0e0b6a064 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Fri, 16 Apr 2021 20:42:58 +0200
Subject: [PATCH 1448/2024] pugixml: update to 1.11.4.

---
 srcpkgs/pugixml/patches/pkg-config.patch | 18 ------------------
 srcpkgs/pugixml/template                 |  6 +++---
 2 files changed, 3 insertions(+), 21 deletions(-)
 delete mode 100644 srcpkgs/pugixml/patches/pkg-config.patch

diff --git a/srcpkgs/pugixml/patches/pkg-config.patch b/srcpkgs/pugixml/patches/pkg-config.patch
deleted file mode 100644
index d021d58889f9..000000000000
--- a/srcpkgs/pugixml/patches/pkg-config.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- CMakeLists.txt.bak	2017-09-30 16:33:46.956774231 +0200
-+++ CMakeLists.txt	2017-09-30 16:34:08.857775066 +0200
-@@ -52,7 +52,7 @@
- 
- if(BUILD_PKGCONFIG)
- 	# Install library into its own directory under LIBDIR
--	set(INSTALL_SUFFIX /pugixml-${PUGIXML_VERSION_STRING})
-+	# set(INSTALL_SUFFIX /pugixml-${PUGIXML_VERSION_STRING})
- endif()
- 
- install(TARGETS pugixml EXPORT pugixml-config
-@@ -75,4 +75,4 @@
- 	add_executable(check ${TEST_SOURCES})
- 	target_link_libraries(check pugixml)
- 	add_custom_command(TARGET check POST_BUILD COMMAND check WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
--endif()
-\ No newline at end of file
-+endif()
diff --git a/srcpkgs/pugixml/template b/srcpkgs/pugixml/template
index 4e0d5c256f29..45d0d36a67b7 100644
--- a/srcpkgs/pugixml/template
+++ b/srcpkgs/pugixml/template
@@ -1,15 +1,15 @@
 # Template file for 'pugixml'
 pkgname=pugixml
-version=1.9
+version=1.11.4
 revision=1
 build_style=cmake
-configure_args="-DBUILD_SHARED_LIBS=On -DBUILD_PKGCONFIG=On"
+configure_args="-DBUILD_SHARED_LIBS=On"
 short_desc="Light-weight, simple and fast XML parser for C++ with XPath support"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="http://pugixml.org/"
 distfiles="http://github.com/zeux/pugixml/releases/download/v${version}/pugixml-${version}.tar.gz"
-checksum=d156d35b83f680e40fd6412c4455fdd03544339779134617b9b28d19e11fdba6
+checksum=8ddf57b65fb860416979a3f0640c2ad45ddddbbafa82508ef0a0af3ce7061716
 
 post_install() {
 	tail -22 readme.txt > LICENSE

From 092decdcfc9d68b2bb8dd7ca14239462c7b05634 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 17 Apr 2021 10:46:05 +0200
Subject: [PATCH 1449/2024] New package: ptex-2.3.2

---
 common/shlibs         |  1 +
 srcpkgs/ptex-devel    |  1 +
 srcpkgs/ptex/template | 29 +++++++++++++++++++++++++++++
 3 files changed, 31 insertions(+)
 create mode 120000 srcpkgs/ptex-devel
 create mode 100644 srcpkgs/ptex/template

diff --git a/common/shlibs b/common/shlibs
index 5f51c81f52b9..a0ded2466777 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2968,6 +2968,7 @@ libPocoRedis.so.64 poco-1.9.4_3
 libPocoEncodings.so.64 poco-1.9.4_3
 libPocoNetSSL.so.64 poco-1.9.4_3
 libPocoCrypto.so.64 poco-1.9.4_3
+libPtex.so ptex-2.3.2_1
 libopenblas.so.0 openblas-0.2.19_1
 librtaudio.so.6 rtaudio-5.1.0_1
 librtmidi.so.5 rtmidi-4.0.0_1
diff --git a/srcpkgs/ptex-devel b/srcpkgs/ptex-devel
new file mode 120000
index 000000000000..43a4f13c2a2a
--- /dev/null
+++ b/srcpkgs/ptex-devel
@@ -0,0 +1 @@
+ptex
\ No newline at end of file
diff --git a/srcpkgs/ptex/template b/srcpkgs/ptex/template
new file mode 100644
index 000000000000..f6a5347ccb44
--- /dev/null
+++ b/srcpkgs/ptex/template
@@ -0,0 +1,29 @@
+# Template file for 'ptex'
+pkgname=ptex
+version=2.3.2
+revision=1
+build_style=cmake
+configure_args="-DPTEX_VER=$version"
+hostmakedepends="pkg-config"
+makedepends="zlib-devel"
+short_desc="Per-Face Texture Mapping for Production Rendering"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="http://ptex.us/"
+distfiles="https://github.com/wdas/ptex/archive/refs/tags/v${version}.tar.gz"
+checksum=30aeb85b965ca542a8945b75285cd67d8e207d23dbb57fcfeaab587bb443402b
+
+post_install() {
+	sed '1,/\/\*/d;/\*\//,$d' src/ptex/PtexCache.h > LICENSE
+	vlicense LICENSE
+}
+
+ptex-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/share/cmake
+		vmove usr/include
+		vmove "usr/lib/*.a"
+	}
+}

From f086e50c83f07f166b5bc1d56e75c075975920f7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sat, 17 Apr 2021 11:52:02 +0200
Subject: [PATCH 1450/2024] New package: Field3D-1.7.3

---
 common/shlibs            |  1 +
 srcpkgs/Field3D-devel    |  1 +
 srcpkgs/Field3D/template | 21 +++++++++++++++++++++
 3 files changed, 23 insertions(+)
 create mode 120000 srcpkgs/Field3D-devel
 create mode 100644 srcpkgs/Field3D/template

diff --git a/common/shlibs b/common/shlibs
index a0ded2466777..41a310e34d49 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -412,6 +412,7 @@ libproxy.so.1 libproxy-0.4.6_1
 libmoar.so MoarVM-2015.11_1
 libFLAC.so.8 libflac-1.2.1_1
 libFLAC++.so.6 libflac-1.2.1_1
+libField3D.so.1.7 Field3D-1.7.3_1
 libMAC.so.6 libMAC-5.28_1
 libmad.so.0 libmad-0.15.1b_1
 libmatroska.so.7 libmatroska-1.6.0_1
diff --git a/srcpkgs/Field3D-devel b/srcpkgs/Field3D-devel
new file mode 120000
index 000000000000..7482d5683e82
--- /dev/null
+++ b/srcpkgs/Field3D-devel
@@ -0,0 +1 @@
+Field3D
\ No newline at end of file
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
new file mode 100644
index 000000000000..a9791dbfde40
--- /dev/null
+++ b/srcpkgs/Field3D/template
@@ -0,0 +1,21 @@
+# Template file for 'Field3D'
+pkgname=Field3D
+version=1.7.3
+revision=1
+build_style=cmake
+makedepends="boost-devel hdf5-devel ilmbase-devel"
+short_desc="Library for storing voxel data on disk and in memory"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/imageworks/Field3D/wiki/Field3D-Home"
+distfiles="https://github.com/imageworks/Field3D/archive/refs/tags/v${version}.tar.gz"
+checksum=b6168bc27abe0f5e9b8d01af7794b3268ae301ac72b753712df93125d51a0fd4
+
+Field3D-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} $makedepends"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+	}
+}

From 3299d190e1372be4947654fd7f5a21b46463c173 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Fri, 16 Apr 2021 21:18:16 +0200
Subject: [PATCH 1451/2024] openimageio: update to 2.2.13.1.

---
 common/shlibs                                 |   4 +-
 .../patches/find-openexr-cmake.patch          | 197 ------------------
 .../openimageio/patches/fix-tiff-4.2.0.patch  |  23 --
 srcpkgs/openimageio/template                  |  19 +-
 4 files changed, 13 insertions(+), 230 deletions(-)
 delete mode 100644 srcpkgs/openimageio/patches/find-openexr-cmake.patch
 delete mode 100644 srcpkgs/openimageio/patches/fix-tiff-4.2.0.patch

diff --git a/common/shlibs b/common/shlibs
index 41a310e34d49..d9dd3f1f3477 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2164,8 +2164,8 @@ libgom-1.0.so.0 gom-0.3.0_1
 libetpan.so.20 libetpan-1.9.3_4
 libxmp.so.4 libxmp-4.3.7_1
 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
-libOpenImageIO_Util.so.1.8 openimageio-1.8.12_1
-libOpenImageIO.so.1.8 openimageio-1.8.12_1
+libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1
+libOpenImageIO.so.2.2 openimageio-2.2.13.1_1
 libOpenColorIO.so.1 opencolorio-1.0.8_1
 libyaml-cpp.so.0.6 yaml-cpp-0.6.2_1
 libpaper.so.1 libpaper-1.1.24_1
diff --git a/srcpkgs/openimageio/patches/find-openexr-cmake.patch b/srcpkgs/openimageio/patches/find-openexr-cmake.patch
deleted file mode 100644
index c17c383371f8..000000000000
--- a/srcpkgs/openimageio/patches/find-openexr-cmake.patch
+++ /dev/null
@@ -1,197 +0,0 @@
---- src/cmake/modules/FindOpenEXR.cmake	2018-12-01 17:42:08.000000000 +0100
-+++ src/cmake/modules/FindOpenEXR.cmake	2019-12-02 21:37:56.477945777 +0100
-@@ -2,17 +2,12 @@
- #
- # This module will set
- #   OPENEXR_FOUND          true, if found
--#   OPENEXR_INCLUDE_DIR    directory where headers are found
-+#   OPENEXR_INCLUDES       directory where headers are found
- #   OPENEXR_LIBRARIES      libraries for OpenEXR + IlmBase
- #   ILMBASE_LIBRARIES      libraries just IlmBase
- #   OPENEXR_VERSION        OpenEXR version (accurate for >= 2.0.0,
- #                              otherwise will just guess 1.6.1)
- #
--# Special inputs:
--#   OPENEXR_CUSTOM_INCLUDE_DIR - custom location of headers
--#   OPENEXR_CUSTOM_LIB_DIR - custom location of libraries
--#   OPENEXR_CUSTOM_LIB_PREFIX - special snowflake library prefix
--#   OPENEXR_CUSTOM_LIB_SUFFIX - special snowflake library suffix
- #
- 
- # Other standard issue macros
-@@ -30,18 +25,25 @@
- # Attempt to find OpenEXR with pkgconfig
- find_package(PkgConfig)
- if (PKG_CONFIG_FOUND)
--    pkg_check_modules(_ILMBASE QUIET IlmBase)
--    pkg_check_modules(_OPENEXR QUIET OpenEXR>=2.0.0)
-+    if (NOT Ilmbase_ROOT AND NOT ILMBASE_ROOT
-+        AND NOT DEFINED ENV{Ilmbase_ROOT} AND NOT DEFINED ENV{ILMBASE_ROOT})
-+        pkg_check_modules(_ILMBASE QUIET IlmBase>=2.0.0)
-+    endif ()
-+    if (NOT OpenEXR_ROOT AND NOT OPENEXR_ROOT
-+        AND NOT DEFINED ENV{OpenEXR_ROOT} AND NOT DEFINED ENV{OPENEXR_ROOT})
-+        pkg_check_modules(_OPENEXR QUIET OpenEXR>=2.0.0)
-+    endif ()
- endif (PKG_CONFIG_FOUND)
- 
- # List of likely places to find the headers -- note priority override of
--# OPENEXR_CUSTOM_INCLUDE_DIR and ${OPENEXR_HOME}/include.
-+# ${OPENEXR_ROOT}/include.
- # ILMBASE is needed in case ilmbase an openexr are installed in separate
- # directories, like NixOS does
- set (GENERIC_INCLUDE_PATHS
--    ${OPENEXR_CUSTOM_INCLUDE_DIR}
--    ${OPENEXR_HOME}/include
--    ${ILMBASE_HOME}/include
-+    ${OPENEXR_ROOT}/include
-+    $ENV{OPENEXR_ROOT}/include
-+    ${ILMBASE_ROOT}/include
-+    $ENV{ILMBASE_ROOT}/include
-     ${_ILMBASE_INCLUDEDIR}
-     ${_OPENEXR_INCLUDEDIR}
-     /usr/local/include
-@@ -50,22 +52,19 @@
-     /sw/include
-     /opt/local/include )
- 
--# Find the include file locations. We call find_path twice -- first using
--# only the custom paths, then if that fails, try the default paths only.
--# This seems to be the most robust way I can find to not get confused when
--# both system and custom libraries are present.
-+# Find the include file locations.
- find_path (ILMBASE_INCLUDE_PATH OpenEXR/IlmBaseConfig.h
--           PATHS ${GENERIC_INCLUDE_PATHS} NO_DEFAULT_PATH)
--find_path (ILMBASE_INCLUDE_PATH OpenEXR/IlmBaseConfig.h)
-+           HINTS ${ILMBASE_INCLUDE_DIR} ${OPENEXR_INCLUDE_DIR}
-+                 ${GENERIC_INCLUDE_PATHS} )
- find_path (OPENEXR_INCLUDE_PATH OpenEXR/OpenEXRConfig.h
--           PATHS ${GENERIC_INCLUDE_PATHS} NO_DEFAULT_PATH)
--find_path (OPENEXR_INCLUDE_PATH OpenEXR/OpenEXRConfig.h)
-+           HINTS ${OPENEXR_INCLUDE_DIR}
-+                 ${GENERIC_INCLUDE_PATHS} )
- 
- # Try to figure out version number
- if (DEFINED _OPENEXR_VERSION AND NOT "${_OPENEXR_VERSION}" STREQUAL "")
-     set (OPENEXR_VERSION "${_OPENEXR_VERSION}")
--    string (REGEX REPLACE "([0-9]+)\\.[0-9]+" "\\1" OPENEXR_VERSION_MAJOR "${_OPENEXR_VERSION}")
--    string (REGEX REPLACE "[0-9]+\\.([0-9]+)" "\\1" OPENEXR_VERSION_MINOR "${_OPENEXR_VERSION}")
-+    string (REGEX REPLACE "([0-9]+)\\.[0-9\\.]+" "\\1" OPENEXR_VERSION_MAJOR "${_OPENEXR_VERSION}")
-+    string (REGEX REPLACE "[0-9]+\\.([0-9]+)(\\.[0-9]+)?" "\\1" OPENEXR_VERSION_MINOR "${_OPENEXR_VERSION}")
- elseif (EXISTS "${OPENEXR_INCLUDE_PATH}/OpenEXR/ImfMultiPartInputFile.h")
-     # Must be at least 2.0
-     file(STRINGS "${OPENEXR_INCLUDE_PATH}/OpenEXR/OpenEXRConfig.h" TMP REGEX "^#define OPENEXR_VERSION_STRING .*$")
-@@ -83,24 +82,10 @@
- 
- 
- # List of likely places to find the libraries -- note priority override of
--# OPENEXR_CUSTOM_LIB_DIR and ${OPENEXR_HOME}/lib.
--
--# If there's no OPENEXR_HOME or ILMBASE_HOME, then the path will point to
--# "/lib", which may not always be wanted/expected.
--if (OPENEXR_CUSTOM_LIB_DIR)
--  set (GENERIC_LIBRARY_PATHS ${GENERIC_LIBRARY_PATHS} ${OPENEXR_CUSTOM_LIB_DIR})
--endif()
--
--if (OPENEXR_HOME)
--  set (GENERIC_LIBRARY_PATHS ${GENERIC_LIBRARY_PATHS} ${OPENEXR_HOME})
--endif()
--
--if (ILMBASE_HOME)
--  set (GENERIC_LIBRARY_PATHS ${GENERIC_LIBRARY_PATHS} ${ILMBASE_HOME})
--endif()
--
-+# ${OPENEXR_ROOT}/lib.
- set (GENERIC_LIBRARY_PATHS
--    ${GENERIC_LIBRARY_PATHS}
-+    ${OPENEXR_ROOT}/lib
-+    ${ILMBASE_ROOT}/lib
-     ${OPENEXR_INCLUDE_PATH}/../lib
-     ${ILMBASE_INCLUDE_PATH}/../lib
-     ${_ILMBASE_LIBDIR}
-@@ -113,6 +98,8 @@
-     /opt/local/lib
-     $ENV{PROGRAM_FILES}/OpenEXR/lib/static )
- 
-+# message (STATUS "Generic lib paths: ${GENERIC_LIBRARY_PATHS}")
-+
- # Handle request for static libs by altering CMAKE_FIND_LIBRARY_SUFFIXES.
- # We will restore it at the end of this file.
- set (_openexr_orig_suffixes ${CMAKE_FIND_LIBRARY_SUFFIXES})
-@@ -124,42 +111,19 @@
-     endif ()
- endif ()
- 
--# Look for the libraries themselves, for all the components. Like with the
--# headers, we do two finds -- first for custom locations, then for default.
-+# Look for the libraries themselves, for all the components.
- # This is complicated because the OpenEXR libraries may or may not be
- # built with version numbers embedded.
- set (_openexr_components IlmThread IlmImf Imath Iex Half)
- foreach (COMPONENT ${_openexr_components})
-     string (TOUPPER ${COMPONENT} UPPERCOMPONENT)
-     # First try with the version embedded
--    set (FULL_COMPONENT_NAME ${OPENEXR_CUSTOM_LIB_PREFIX}${COMPONENT}-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR}${OPENEXR_CUSTOM_LIB_SUFFIX})
--    find_library (OPENEXR_${UPPERCOMPONENT}_LIBRARY ${FULL_COMPONENT_NAME}
--                  PATHS ${GENERIC_LIBRARY_PATHS} NO_DEFAULT_PATH)
--    # Again, with no directory restrictions
--    find_library (OPENEXR_${UPPERCOMPONENT}_LIBRARY ${FULL_COMPONENT_NAME})
--    # Try again without the version
--    set (FULL_COMPONENT_NAME ${OPENEXR_CUSTOM_LIB_PREFIX}${COMPONENT}${OPENEXR_CUSTOM_LIB_SUFFIX})
--    find_library (OPENEXR_${UPPERCOMPONENT}_LIBRARY ${FULL_COMPONENT_NAME}
--                  PATHS ${GENERIC_LIBRARY_PATHS} NO_DEFAULT_PATH)
--    # One more time, with no restrictions
--    find_library (OPENEXR_${UPPERCOMPONENT}_LIBRARY ${FULL_COMPONENT_NAME})
-+    find_library (OPENEXR_${UPPERCOMPONENT}_LIBRARY
-+                  NAMES ${COMPONENT}-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR}
-+                        ${COMPONENT}
-+                  HINTS ${OPENEXR_LIBRARY_DIR} $ENV{OPENEXR_LIBRARY_DIR}
-+                        ${GENERIC_LIBRARY_PATHS} )
- endforeach ()
--#Half usually has no suffix
--find_library (OPENEXR_HALF_LIBRARY ${OPENEXR_CUSTOM_LIB_PREFIX}Half
--              PATHS ${GENERIC_LIBRARY_PATHS} NO_DEFAULT_PATH)
--find_library (OPENEXR_HALF_LIBRARY ${OPENEXR_CUSTOM_LIB_PREFIX}Half)
--
--# Set the FOUND, INCLUDE_DIR, and LIBRARIES variables.
--if (ILMBASE_INCLUDE_PATH AND OPENEXR_INCLUDE_PATH AND
--      OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND
--      OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY)
--    set (OPENEXR_FOUND TRUE)
--    set (ILMBASE_FOUND TRUE)
--    set (ILMBASE_INCLUDE_DIR ${ILMBASE_INCLUDE_PATH} CACHE STRING "The include paths needed to use IlmBase")
--    set (OPENEXR_INCLUDE_DIR ${OPENEXR_INCLUDE_PATH} CACHE STRING "The include paths needed to use OpenEXR")
--    set (ILMBASE_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} ${OPENEXR_ILMTHREAD_LIBRARY} ${ILMBASE_PTHREADS} CACHE STRING "The libraries needed to use IlmBase")
--    set (OPENEXR_LIBRARIES ${OPENEXR_ILMIMF_LIBRARY} ${ILMBASE_LIBRARIES} ${ZLIB_LIBRARIES} CACHE STRING "The libraries needed to use OpenEXR")
--endif ()
- 
- find_package_handle_standard_args (OpenEXR
-     REQUIRED_VARS ILMBASE_INCLUDE_PATH OPENEXR_INCLUDE_PATH
-@@ -168,11 +132,17 @@
-     VERSION_VAR   OPENEXR_VERSION
-     )
- 
--MARK_AS_ADVANCED(
--    ILMBASE_INCLUDE_DIR
--    OPENEXR_INCLUDE_DIR
--    ILMBASE_LIBRARIES
--    OPENEXR_LIBRARIES
-+if (OPENEXR_FOUND)
-+    set (ILMBASE_FOUND TRUE)
-+    set (ILMBASE_INCLUDES ${ILMBASE_INCLUDE_PATH})
-+    set (OPENEXR_INCLUDES ${OPENEXR_INCLUDE_PATH})
-+    set (ILMBASE_INCLUDE_DIR ${ILMBASE_INCLUDE_PATH})
-+    set (OPENEXR_INCLUDE_DIR ${OPENEXR_INCLUDE_PATH})
-+    set (ILMBASE_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} ${OPENEXR_ILMTHREAD_LIBRARY} ${ILMBASE_PTHREADS} CACHE STRING "The libraries needed to use IlmBase")
-+    set (OPENEXR_LIBRARIES ${OPENEXR_ILMIMF_LIBRARY} ${ILMBASE_LIBRARIES} ${ZLIB_LIBRARIES} CACHE STRING "The libraries needed to use OpenEXR")
-+endif ()
-+
-+mark_as_advanced(
-     OPENEXR_ILMIMF_LIBRARY
-     OPENEXR_IMATH_LIBRARY
-     OPENEXR_IEX_LIBRARY
-@@ -181,3 +151,4 @@
- 
- # Restore the original CMAKE_FIND_LIBRARY_SUFFIXES
- set (CMAKE_FIND_LIBRARY_SUFFIXES ${_openexr_orig_suffixes})
-+
diff --git a/srcpkgs/openimageio/patches/fix-tiff-4.2.0.patch b/srcpkgs/openimageio/patches/fix-tiff-4.2.0.patch
deleted file mode 100644
index 20ba5792f7d1..000000000000
--- a/srcpkgs/openimageio/patches/fix-tiff-4.2.0.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/libOpenImageIO/exif.cpp	2018-12-01 17:42:08.000000000 +0100
-+++ src/libOpenImageIO/exif.cpp	2021-01-16 13:30:01.747255896 +0100
-@@ -212,7 +212,7 @@
- };
- 
- 
--
-+#if !defined(GPSTAG_VERSIONID)
- enum GPSTag {
-     GPSTAG_VERSIONID = 0, 
-     GPSTAG_LATITUDEREF = 1,  GPSTAG_LATITUDE = 2,
-@@ -237,6 +237,11 @@
-     GPSTAG_DIFFERENTIAL = 30,
-     GPSTAG_HPOSITIONINGERROR = 31
- };
-+#endif
-+#if !defined(GPSTAG_HPOSITIONINGERROR)
-+/* The tiff.h tag name differs from the one used here */
-+#define GPSTAG_HPOSITIONINGERROR GPSTAG_GPSHPOSITIONINGERROR
-+#endif
- 
- static const EXIF_tag_info gps_tag_table[] = {
-     { GPSTAG_VERSIONID,		"GPS:VersionID",	TIFF_BYTE, 4 }, 
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index bcab0e90b7d0..3f35a3a98bb7 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,22 +1,25 @@
 # Template file for 'openimageio'
 pkgname=openimageio
-version=1.8.17
-revision=3
+version=2.2.13.1
+revision=1
 wrksrc="oiio-Release-${version}"
 build_style=cmake
-configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=0
+configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
  -DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config git"
 makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
  libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
- ffmpeg-devel opencolorio-devel"
+ ffmpeg-devel opencolorio-devel ptex-devel libheif-devel openvdb-devel
+ Field3D-devel"
 short_desc="Library for reading and writing images"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="BSD"
+license="BSD-3-Clause"
 homepage="https://sites.google.com/site/openimageio/home"
 changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md"
 distfiles="https://github.com/OpenImageIO/oiio/archive/Release-${version}.tar.gz"
-checksum=a019086c05a6150d445a2240bab1723dff540dde5f5c327c36a97f0b5ae0e157
+checksum=7f810124e866ac14ad9c11b0ab528a6ed4c8e62a190cc44a77eed8159f57405c
+# Runs checks even for features we disabled.
+make_check=no
 
 CXXFLAGS="-faligned-new"
 case "$XBPS_TARGET_MACHINE" in
@@ -48,7 +51,7 @@ pre_build() {
 }
 
 post_install() {
-	vlicense LICENSE
+	vlicense LICENSE.md LICENSE
 }
 
 openimageio-devel_package() {

From 807d5043ed19c8280e04f3d78688a3c87cb015af Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Fri, 16 Apr 2021 20:31:28 +0200
Subject: [PATCH 1452/2024] blender: update to 2.92.0.

---
 .../{musl.patch => 0001-musl-fixes.patch}     | 78 ++++++++-----------
 .../patches/0002-fix-linking-issue.patch      | 25 ++++++
 srcpkgs/blender/patches/altivec-all.patch     | 32 --------
 ...patch => no-Werror-double-promotion.patch} | 12 ++-
 srcpkgs/blender/patches/python39.patch        | 25 ------
 srcpkgs/blender/template                      | 15 +++-
 6 files changed, 74 insertions(+), 113 deletions(-)
 rename srcpkgs/blender/patches/{musl.patch => 0001-musl-fixes.patch} (53%)
 create mode 100644 srcpkgs/blender/patches/0002-fix-linking-issue.patch
 delete mode 100644 srcpkgs/blender/patches/altivec-all.patch
 rename srcpkgs/blender/patches/{disable_werror.patch => no-Werror-double-promotion.patch} (51%)
 delete mode 100644 srcpkgs/blender/patches/python39.patch

diff --git a/srcpkgs/blender/patches/musl.patch b/srcpkgs/blender/patches/0001-musl-fixes.patch
similarity index 53%
rename from srcpkgs/blender/patches/musl.patch
rename to srcpkgs/blender/patches/0001-musl-fixes.patch
index 5cfded1586d0..0e64369b4379 100644
--- a/srcpkgs/blender/patches/musl.patch
+++ b/srcpkgs/blender/patches/0001-musl-fixes.patch
@@ -1,46 +1,22 @@
-From 8f2b2e92ffdec658d4eb999f41acf6c74a5b32ed Mon Sep 17 00:00:00 2001
-From: Leon Marz <lmarz@cs.uni-frankfurt.de>
-Date: Tue, 1 Sep 2020 09:09:50 +0200
-Subject: [PATCH 1/2] musl fixes
-
-[ Taken from https://git.alpinelinux.org/aports/plain/testing/blender/0001-musl-fixes.patch ]
+Imported from https://git.alpinelinux.org/aports/plain/testing/blender/0001-musl-fixes.patch?id=42cee48643cb6ccc1a110e66446aa74408ee0160
+adapted to not use __MUSL__ definition
 
-Original Patch by Nathanael Copa
+From e530dc5b32695c208aa46bfe460ac7d76159a6d3 Mon Sep 17 00:00:00 2001
+From: Leon Marz <lmarz@cs.uni-frankfurt.de>
+Date: Wed, 25 Nov 2020 10:10:41 +0100
+Subject: [PATCH 1/3] musl fixes
 
+Original patch by Nathanael Copa
 ---
- CMakeLists.txt                              | 13 +++++++++++++
- intern/guardedalloc/intern/mallocn_intern.h |  2 +-
- intern/libc_compat/libc_compat.c            |  2 --
- source/blender/blenlib/intern/system.c      |  4 +++-
- source/creator/creator_signals.c            |  2 +-
- 5 files changed, 18 insertions(+), 5 deletions(-)
+ intern/guardedalloc/intern/mallocn_intern.h | 2 +-
+ intern/libc_compat/libc_compat.c            | 2 --
+ source/blender/blenlib/intern/system.c      | 4 +++-
+ source/blender/gpu/GPU_vertex_buffer.h      | 1 -
+ source/creator/creator_signals.c            | 2 +-
+ 5 files changed, 5 insertions(+), 6 deletions(-)
 
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index cee8675..111e6e3 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -138,6 +138,19 @@ get_blender_version()
- #-----------------------------------------------------------------------------
- # Options
- 
-+# musl-libc related checks (missing execinfo.h and feenableexcept())
-+include(CheckIncludeFiles)
-+check_include_files(execinfo.h HAVE_EXECINFO_H)
-+if(HAVE_EXECINFO_H)
-+  add_definitions(-DHAVE_EXECINFO_H)
-+endif()
-+
-+include(CheckLibraryExists)
-+check_library_exists(m feenableexcept "fenv.h" HAVE_FEENABLEEXCEPT)
-+if(HAVE_FEENABLEEXCEPT)
-+  add_definitions(-DHAVE_FEENABLEEXCEPT)
-+endif()
-+
- # Blender internal features
- option(WITH_BLENDER "Build blender (disable to build only the blender player)" ON)
- mark_as_advanced(WITH_BLENDER)
 diff --git a/intern/guardedalloc/intern/mallocn_intern.h b/intern/guardedalloc/intern/mallocn_intern.h
-index 8fc3e43..ee443c4 100644
+index aa95615..f7e347d 100644
 --- a/intern/guardedalloc/intern/mallocn_intern.h
 +++ b/intern/guardedalloc/intern/mallocn_intern.h
 @@ -33,7 +33,7 @@
@@ -48,7 +24,7 @@ index 8fc3e43..ee443c4 100644
  #define USE_MALLOC_USABLE_SIZE /* internal, when we have malloc_usable_size() */
  
 -#if defined(__linux__) || (defined(__FreeBSD_kernel__) && !defined(__FreeBSD__)) || \
-+#if defined(__linux__) && defined(HAVE_EXECINFO_H) || (defined(__FreeBSD_kernel__) && !defined(__FreeBSD__)) || \
++#if (defined(__FreeBSD_kernel__) && !defined(__FreeBSD__)) || \
      defined(__GLIBC__)
  #  include <malloc.h>
  #  define HAVE_MALLOC_STATS
@@ -71,14 +47,14 @@ index 78e387e..d21c281 100644
 -#  endif /* __GLIBC_PREREQ */
  #endif   /* __linux__ */
 diff --git a/source/blender/blenlib/intern/system.c b/source/blender/blenlib/intern/system.c
-index 20edbb9..6e856cd 100644
+index 8e3d489..4d0789b 100644
 --- a/source/blender/blenlib/intern/system.c
 +++ b/source/blender/blenlib/intern/system.c
 @@ -35,7 +35,9 @@
  
  #  include "BLI_winstuff.h"
  #else
-+#if defined(HAVE_EXECINFO_H)
++#if defined(__GLIBC__)
  #  include <execinfo.h>
 +#endif
  #  include <unistd.h>
@@ -89,12 +65,24 @@ index 20edbb9..6e856cd 100644
    /* ------------- */
    /* Linux / Apple */
 -#  if defined(__linux__) || defined(__APPLE__)
-+#  if defined(__linux__) && defined(HAVE_EXECINFO_H) || defined(__APPLE__)
++#  if defined(__linux__) && defined(__GLIBC__) || defined(__APPLE__)
  
  #    define SIZE 100
    void *buffer[SIZE];
+diff --git a/source/blender/gpu/GPU_vertex_buffer.h b/source/blender/gpu/GPU_vertex_buffer.h
+index eeaebd3..93a77a2 100644
+--- a/source/blender/gpu/GPU_vertex_buffer.h
++++ b/source/blender/gpu/GPU_vertex_buffer.h
+@@ -118,7 +118,6 @@ GPU_INLINE void *GPU_vertbuf_raw_step(GPUVertBufRaw *a)
+ {
+   unsigned char *data = a->data;
+   a->data += a->stride;
+-  BLI_assert(data < a->_data_end);
+   return (void *)data;
+ }
+ 
 diff --git a/source/creator/creator_signals.c b/source/creator/creator_signals.c
-index ad0b7b2..01d5e37 100644
+index 29e12a9..d90da8f 100644
 --- a/source/creator/creator_signals.c
 +++ b/source/creator/creator_signals.c
 @@ -269,7 +269,7 @@ void main_signal_setup_fpe(void)
@@ -102,10 +90,10 @@ index ad0b7b2..01d5e37 100644
    signal(SIGFPE, sig_handle_fpe);
  
 -#    if defined(__linux__) && defined(__GNUC__)
-+#    if defined(__linux__) && defined(__GNUC__) && defined(HAVE_FEENABLEEXCEPT)
++#    if defined(__linux__) && defined(__GNUC__) && defined(__GLIBC__)
    feenableexcept(FE_DIVBYZERO | FE_INVALID | FE_OVERFLOW);
  #    endif /* defined(__linux__) && defined(__GNUC__) */
  #    if defined(OSX_SSE_FPE)
 -- 
-2.28.0
+2.30.1
 
diff --git a/srcpkgs/blender/patches/0002-fix-linking-issue.patch b/srcpkgs/blender/patches/0002-fix-linking-issue.patch
new file mode 100644
index 000000000000..28683714e126
--- /dev/null
+++ b/srcpkgs/blender/patches/0002-fix-linking-issue.patch
@@ -0,0 +1,25 @@
+Imported from https://git.alpinelinux.org/aports/plain/testing/blender/0002-fix-linking-issue.patch?id=42cee48643cb6ccc1a110e66446aa74408ee0160
+
+From 54f5929131f537b6cbb74b5a7da45858cef6020b Mon Sep 17 00:00:00 2001
+From: Leon Marz <lmarz@cs.uni-frankfurt.de>
+Date: Tue, 1 Sep 2020 09:11:18 +0200
+Subject: [PATCH 2/3] fix linking issue
+
+---
+ intern/ghost/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt
+index 1739659..d6b442b 100644
+--- a/intern/ghost/CMakeLists.txt
++++ b/intern/ghost/CMakeLists.txt
+@@ -484,5 +484,5 @@ if(WITH_XR_OPENXR)
+ endif()
+ 
+ add_definitions(${GL_DEFINITIONS})
+-
++list(APPEND LIB "-lX11" "-lXi" "-lXxf86vm" "-lXfixes" "-lXrender")
+ blender_add_lib(bf_intern_ghost "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
+-- 
+2.30.1
+
diff --git a/srcpkgs/blender/patches/altivec-all.patch b/srcpkgs/blender/patches/altivec-all.patch
deleted file mode 100644
index 115e1ea6fd03..000000000000
--- a/srcpkgs/blender/patches/altivec-all.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-This applies a better workaround for C++ type conflicts
-in AltiVec/C++, allowing it to build on BE ppc(64).
-
---- a/extern/clew/include/clew.h
-+++ b/extern/clew/include/clew.h
-@@ -370,15 +370,18 @@ typedef unsigned int cl_GLenum;
- 
- /* Define basic vector types */
- /* Workaround for ppc64el platform: conflicts with bool from C++. */
--#if defined( __VEC__ ) && !(defined(__PPC64__) && defined(__LITTLE_ENDIAN__))
-+#if defined(__VEC__)
-    #include <altivec.h>   /* may be omitted depending on compiler. AltiVec spec provides no way to detect whether the header is required. */
--   typedef vector unsigned char     __cl_uchar16;
--   typedef vector signed char       __cl_char16;
--   typedef vector unsigned short    __cl_ushort8;
--   typedef vector signed short      __cl_short8;
--   typedef vector unsigned int      __cl_uint4;
--   typedef vector signed int        __cl_int4;
--   typedef vector float             __cl_float4;
-+   #undef vector
-+   #undef bool
-+   #undef pixel
-+   typedef __vector unsigned char     __cl_uchar16;
-+   typedef __vector signed char       __cl_char16;
-+   typedef __vector unsigned short    __cl_ushort8;
-+   typedef __vector signed short      __cl_short8;
-+   typedef __vector unsigned int      __cl_uint4;
-+   typedef __vector signed int        __cl_int4;
-+   typedef __vector float             __cl_float4;
-    #define  __CL_UCHAR16__  1
-    #define  __CL_CHAR16__   1
-    #define  __CL_USHORT8__  1
diff --git a/srcpkgs/blender/patches/disable_werror.patch b/srcpkgs/blender/patches/no-Werror-double-promotion.patch
similarity index 51%
rename from srcpkgs/blender/patches/disable_werror.patch
rename to srcpkgs/blender/patches/no-Werror-double-promotion.patch
index 9fada907e1ce..2d17a6da1818 100644
--- a/srcpkgs/blender/patches/disable_werror.patch
+++ b/srcpkgs/blender/patches/no-Werror-double-promotion.patch
@@ -1,13 +1,11 @@
-diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt
-index f22688f..c32aad1 100644
---- a/intern/cycles/CMakeLists.txt
-+++ b/intern/cycles/CMakeLists.txt
-@@ -227,8 +227,6 @@ endif()
- 
+--- ./intern/cycles/CMakeLists.txt.orig	2021-04-16 20:47:50.466754473 +0200
++++ ./intern/cycles/CMakeLists.txt	2021-04-16 20:48:06.199903232 +0200
+@@ -336,7 +336,7 @@ endif()
  # Warnings
  if(CMAKE_COMPILER_IS_GNUCXX)
--  ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_cxxflag_float_conversion "-Werror=float-conversion")
+   ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_cxxflag_float_conversion "-Werror=float-conversion")
 -  ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_cxxflag_double_promotion "-Werror=double-promotion")
++  #ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_cxxflag_double_promotion "-Werror=double-promotion")
    ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_no_error_unused_macros "-Wno-error=unused-macros")
    unset(_has_cxxflag_float_conversion)
    unset(_has_cxxflag_double_promotion)
diff --git a/srcpkgs/blender/patches/python39.patch b/srcpkgs/blender/patches/python39.patch
deleted file mode 100644
index 1e14eb062035..000000000000
--- a/srcpkgs/blender/patches/python39.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-The deprecated PyEval_ReleaseLock() triggers a segfault with Python 3.9.0.
-See issue at https://developer.blender.org/T81688 and fix at
-https://developer.blender.org/rB5edba9b42f684bf8b99894bb6988e7f46180e12c
-
---- a/source/blender/python/generic/bpy_threads.c	2020-10-13 15:29:16.708347045 -0400
-+++ b/source/blender/python/generic/bpy_threads.c	2020-10-13 15:29:43.123345331 -0400
-@@ -29,14 +29,11 @@
- /* analogue of PyEval_SaveThread() */
- BPy_ThreadStatePtr BPY_thread_save(void)
- {
--  PyThreadState *tstate = PyThreadState_Swap(NULL);
--  /* note: tstate can be NULL when quitting Blender */
--
--  if (tstate && PyEval_ThreadsInitialized()) {
--    PyEval_ReleaseLock();
-+  /* The thread-state can be NULL when quitting Blender. */
-+  if (_PyThreadState_UncheckedGet()) {
-+    return (BPy_ThreadStatePtr)PyEval_SaveThread();
-   }
--
--  return (BPy_ThreadStatePtr)tstate;
-+  return NULL;
- }
- 
- /* analogue of PyEval_RestoreThread() */
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 01b3677ff4f6..5daa3ce0b4ac 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
 # Template file for 'blender'
 pkgname=blender
-version=2.90.1
-revision=2
+version=2.92.0
+revision=1
 archs="x86_64* ppc64*"
 build_style="cmake"
 pycompile_dirs="/usr/share/blender/${version%.*}/scripts"
@@ -18,16 +18,23 @@ makedepends="libgomp-devel libpng-devel tiff-devel python3-devel glu-devel
  libsamplerate-devel ffmpeg-devel fftw-devel boost-devel pcre-devel llvm
  libopenexr-devel libopenjpeg2-devel libXi-devel openimageio-devel
  opencolorio-devel opencollada-devel python3-numpy libXrender-devel
- OpenSubdiv-devel tbb-devel libxml2-devel openvdb-devel alembic-devel"
+ OpenSubdiv-devel tbb-devel libxml2-devel openvdb-devel alembic-devel
+ pugixml-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="3D graphics creation suite"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.blender.org"
 distfiles="http://download.blender.org/source/${pkgname}-${version}.tar.xz"
-checksum=e78dcc946c823ad1bd89bcc6938fc6b375540ec3eff58649586acf1f6a653d99
+checksum=e791cfc403292383577c3c8ce2cd34e5aa2cd8da0a7483041049a1609ddb4595
 python_version=3
+CXXFLAGS="-DNDEBUG"
+CFLAGS="$CXXFLAGS"
+LDFLAGS="-Wl,-z,stack-size=2097152"
 patch_args="-Np1"
+# Blender tests are executed against a system installation of blender. This
+# is currently not supported by xbps-src.
+make_check=no
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) ;;

From 42f923b623d0ad954f894ba6e43b3efb7d78d6d0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 20 Apr 2021 09:58:40 +0200
Subject: [PATCH 1453/2024] libodfgen: update to 0.1.8.

---
 srcpkgs/libodfgen/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/libodfgen/template b/srcpkgs/libodfgen/template
index 0f9c18e30f89..2455f64ddc8b 100644
--- a/srcpkgs/libodfgen/template
+++ b/srcpkgs/libodfgen/template
@@ -1,17 +1,17 @@
 # Template file for 'libodfgen'
 pkgname=libodfgen
-version=0.1.7
-revision=2
+version=0.1.8
+revision=1
 build_style=gnu-configure
 configure_args="--enable-debug"
-makedepends="boost-devel librevenge-devel"
 hostmakedepends="pkg-config"
+makedepends="boost-devel librevenge-devel libxml2-devel"
 short_desc="Library for generating documents in Open Document Format"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later, MPL-2.0"
 homepage="http://sourceforge.net/p/libwpd/libodfgen/"
 distfiles="${SOURCEFORGE_SITE}/libwpd/${pkgname}/${pkgname}-${version}/${pkgname}-${version}.tar.xz"
-checksum=323e491f956c8ca2abb12c998e350670930a32317bf9662b0615dd4b3922b831
+checksum=55200027fd46623b9bdddd38d275e7452d1b0ff8aeddcad6f9ae6dc25f610625
 
 libodfgen-devel_package() {
 	depends="libodfgen>=${version}_${revision} $makedepends"
@@ -22,4 +22,3 @@ libodfgen-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
-

From 53e2ea6898d34eaa4e6ae785476175637a3deecb Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Mon, 19 Apr 2021 12:36:23 +0200
Subject: [PATCH 1454/2024] k3b: update to 20.12.3.

---
 srcpkgs/k3b/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 25d781a56bd8..9bc0a6edf441 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,6 +1,6 @@
 # Template file for 'k3b'
 pkgname=k3b
-version=20.12.2
+version=20.12.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake gettext
@@ -15,4 +15,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/multimedia/org.kde.k3b"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=8fa4def0d8c4c62b6860ffe5ca0e67a121d94ef99823465e5b7a5a7345460f3f
+checksum=88e8d3410748e11c77755f5e7b577afb34d1c4d99e529dcc5ab9b663992c5b8c

From 33b8e703a90220128ca7cba505b12f95d8b8f42d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 20 Apr 2021 12:13:25 +0200
Subject: [PATCH 1455/2024] bpftrace: update to 0.12.1.

---
 srcpkgs/bpftrace/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bpftrace/template b/srcpkgs/bpftrace/template
index f8357249eec3..2576fb5a4556 100644
--- a/srcpkgs/bpftrace/template
+++ b/srcpkgs/bpftrace/template
@@ -1,6 +1,6 @@
 # Template file for 'bpftrace'
 pkgname=bpftrace
-version=0.12.0
+version=0.12.1
 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=8752c9eac8d9ab16d2227bb68f1d723ec83310895ab6f503ab6cfcf8b193acc0
+checksum=523c0353c9e508f23d50d3e2b65b09997d10750c3828f369e979759610b71caa
 
 post_install() {
 	# clashes with bcc-tools

From 9f59d4ea53d3080df2cd00871c417dcbe5c62460 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 20 Apr 2021 12:13:59 +0200
Subject: [PATCH 1456/2024] python3-argcomplete: update to 1.12.3.

---
 srcpkgs/python3-argcomplete/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-argcomplete/template b/srcpkgs/python3-argcomplete/template
index 4a56b0daba13..3fd7daf0f856 100644
--- a/srcpkgs/python3-argcomplete/template
+++ b/srcpkgs/python3-argcomplete/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-argcomplete'
 pkgname=python3-argcomplete
-version=1.12.2
+version=1.12.3
 revision=1
 wrksrc="argcomplete-${version}"
 build_style=python3-module
@@ -10,4 +10,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/kislyuk/argcomplete"
 distfiles="${PYPI_SITE}/a/argcomplete/argcomplete-${version}.tar.gz"
-checksum=de0e1282330940d52ea92a80fea2e4b9e0da1932aaa570f84d268939d1897b04
+checksum=2c7dbffd8c045ea534921e63b0be6fe65e88599990d8dc408ac8c542b72a5445

From 2b2ec462f7e3c225ebb3f9074b42b9a3851555b3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 20 Apr 2021 12:15:26 +0200
Subject: [PATCH 1457/2024] virt-what: update to 1.21.

---
 srcpkgs/virt-what/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/virt-what/template b/srcpkgs/virt-what/template
index ee3ad8b04b0b..6403a915bec3 100644
--- a/srcpkgs/virt-what/template
+++ b/srcpkgs/virt-what/template
@@ -1,6 +1,6 @@
 # Template file for 'virt-what'
 pkgname=virt-what
-version=1.20
+version=1.21
 revision=1
 build_style=gnu-configure
 short_desc="Detect when running in a virtual machine"
@@ -8,4 +8,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://people.redhat.com/~rjones/virt-what/"
 distfiles="https://people.redhat.com/~rjones/${pkgname}/files/${pkgname}-${version}.tar.gz"
-checksum=f913dcd29add5121e3ffc0f2d0f17e19ff3183e8ab8ca417a5b6be43787910e8
+checksum=12cb455334aa4cfd53ab78f27e2252e94d1f676dd093f48327ed94d8080d1f7b

From ef3d06d06dae6f49e7e0019914dc84f87eacacce Mon Sep 17 00:00:00 2001
From: Michael Taboada <michael@michaels.world>
Date: Tue, 20 Apr 2021 02:16:43 -0700
Subject: [PATCH 1458/2024] gst-plugins-ugly1: Fix not building 32bit package

---
 srcpkgs/gst-plugins-ugly1/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/gst-plugins-ugly1/template b/srcpkgs/gst-plugins-ugly1/template
index 9e403f826de0..09c5eeceabf3 100644
--- a/srcpkgs/gst-plugins-ugly1/template
+++ b/srcpkgs/gst-plugins-ugly1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-ugly1'
 pkgname=gst-plugins-ugly1
 version=1.18.4
-revision=1
+revision=2
 wrksrc="${pkgname/1/}-${version}"
 build_style=meson
 configure_args="-Damrnb=disabled -Damrwbdec=disabled -Dsidplay=disabled"
@@ -17,4 +17,3 @@ license="LGPL-2.1-or-later"
 homepage="https://gstreamer.freedesktop.org"
 distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz"
 checksum=218df0ce0d31e8ca9cdeb01a3b0c573172cc9c21bb3d41811c7820145623d13c
-lib32disabled=yes

From ab70eb0db976a0e8cca47439d66c9690ffc0851e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 20 Apr 2021 15:42:33 +0200
Subject: [PATCH 1459/2024] blender: add patch that misses

---
 srcpkgs/blender/patches/altivec-all.patch | 32 +++++++++++++++++++++++
 srcpkgs/blender/template                  |  2 +-
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/blender/patches/altivec-all.patch

diff --git a/srcpkgs/blender/patches/altivec-all.patch b/srcpkgs/blender/patches/altivec-all.patch
new file mode 100644
index 000000000000..115e1ea6fd03
--- /dev/null
+++ b/srcpkgs/blender/patches/altivec-all.patch
@@ -0,0 +1,32 @@
+This applies a better workaround for C++ type conflicts
+in AltiVec/C++, allowing it to build on BE ppc(64).
+
+--- a/extern/clew/include/clew.h
++++ b/extern/clew/include/clew.h
+@@ -370,15 +370,18 @@ typedef unsigned int cl_GLenum;
+ 
+ /* Define basic vector types */
+ /* Workaround for ppc64el platform: conflicts with bool from C++. */
+-#if defined( __VEC__ ) && !(defined(__PPC64__) && defined(__LITTLE_ENDIAN__))
++#if defined(__VEC__)
+    #include <altivec.h>   /* may be omitted depending on compiler. AltiVec spec provides no way to detect whether the header is required. */
+-   typedef vector unsigned char     __cl_uchar16;
+-   typedef vector signed char       __cl_char16;
+-   typedef vector unsigned short    __cl_ushort8;
+-   typedef vector signed short      __cl_short8;
+-   typedef vector unsigned int      __cl_uint4;
+-   typedef vector signed int        __cl_int4;
+-   typedef vector float             __cl_float4;
++   #undef vector
++   #undef bool
++   #undef pixel
++   typedef __vector unsigned char     __cl_uchar16;
++   typedef __vector signed char       __cl_char16;
++   typedef __vector unsigned short    __cl_ushort8;
++   typedef __vector signed short      __cl_short8;
++   typedef __vector unsigned int      __cl_uint4;
++   typedef __vector signed int        __cl_int4;
++   typedef __vector float             __cl_float4;
+    #define  __CL_UCHAR16__  1
+    #define  __CL_CHAR16__   1
+    #define  __CL_USHORT8__  1
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 5daa3ce0b4ac..e480e63b8aa0 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
 # Template file for 'blender'
 pkgname=blender
 version=2.92.0
-revision=1
+revision=2
 archs="x86_64* ppc64*"
 build_style="cmake"
 pycompile_dirs="/usr/share/blender/${version%.*}/scripts"

From 3258c49daaf14e4840fc19f95c9cf76d6b48a4d9 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 20 Apr 2021 09:12:48 -0500
Subject: [PATCH 1460/2024] nvidia390: update to 390.143.

---
 common/shlibs                            |   2 +-
 srcpkgs/nvidia390/files/linux-5.11.patch | 348 -----------------------
 srcpkgs/nvidia390/template               |   9 +-
 3 files changed, 5 insertions(+), 354 deletions(-)
 delete mode 100644 srcpkgs/nvidia390/files/linux-5.11.patch

diff --git a/common/shlibs b/common/shlibs
index d9dd3f1f3477..b1e6ecdedf7f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -133,7 +133,7 @@ libnvidia-gtk2.so.346.47 nvidia-gtklibs-346.47_1 ignore
 libnvidia-gtk3.so.346.47 nvidia-gtklibs-346.47_1 ignore
 libnvidia-glcore.so.390.87 nvidia390-libs-390.87_1 ignore
 libnvidia-glsi.so.346.72 nvidia-libs-346.72_1 ignore
-libnvidia-fatbinaryloader.so.390.141 nvidia390-libs-390.141_1 ignore
+libnvidia-fatbinaryloader.so.390.143 nvidia390-libs-390.143_1 ignore
 libnvidia-fatbinaryloader.so.430.40 nvidia-libs-430.40_1 ignore
 libglapi.so.0 libglapi-7.11_1
 libgbm.so.1 libgbm-9.0_1
diff --git a/srcpkgs/nvidia390/files/linux-5.11.patch b/srcpkgs/nvidia390/files/linux-5.11.patch
deleted file mode 100644
index f08c8fcad1ef..000000000000
--- a/srcpkgs/nvidia390/files/linux-5.11.patch
+++ /dev/null
@@ -1,348 +0,0 @@
-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 223015cd21cd..04ada0841189 100644
--- a/srcpkgs/nvidia390/template
+++ b/srcpkgs/nvidia390/template
@@ -3,8 +3,8 @@
 _desc="NVIDIA drivers (GeForce 400, 500 series)"
 
 pkgname=nvidia390
-version=390.141
-revision=3
+version=390.143
+revision=1
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
 homepage="https://www.nvidia.com"
@@ -22,11 +22,11 @@ conflicts="xserver-abi-video>24_1"
 if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
 	_pkg="NVIDIA-Linux-x86-${version}"
 	distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86/${version}/${_pkg}.run"
-	checksum=8dfbc8ce77d2f49780105dd7e3058bbf8e663e9b17495507b7544ece34ffaf43
+	checksum=01e96b7534dea3fdfe65d5cad229e264307c80952479942d368466db9cfe6d06
 else
 	_pkg="NVIDIA-Linux-x86_64-${version}-no-compat32"
 	distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
-	checksum=d7d763aa52574b554dd3d8cbb93a6a63572a9c2bfd3bc3873ec5338c067f70ba
+	checksum=6b823444c764ca065904adbc5b040e506f47e27713d83795f664361309c5f0a5
 fi
 
 subpackages="nvidia390-gtklibs nvidia390-dkms nvidia390-opencl nvidia390-libs"
@@ -37,7 +37,6 @@ do_extract() {
 	./${_pkg}.run --extract-only
 	rm -f ${_pkg}.run
 	cd ${_pkg}
-	patch -Np1 < ${FILESDIR}/linux-5.11.patch
 }
 
 pre_install() {

From a71b70d68c5d3805d3793cf358783b23291fef0d Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 20 Apr 2021 09:29:51 -0500
Subject: [PATCH 1461/2024] wimlib: update to 1.13.4.

---
 srcpkgs/wimlib/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wimlib/template b/srcpkgs/wimlib/template
index 24c66d8adb8f..9af4fc140172 100644
--- a/srcpkgs/wimlib/template
+++ b/srcpkgs/wimlib/template
@@ -1,6 +1,6 @@
 # Template file for 'wimlib'
 pkgname=wimlib
-version=1.13.3
+version=1.13.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,8 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://wimlib.net/"
 distfiles="${homepage}/downloads/wimlib-${version}.tar.gz"
-checksum=8a0741d07d9314735b040cea6168f6daf1ac1c72d350d703f286b118135dfa7e
+checksum=4b87dd0ad9cc1a58cee5721afebb98011dab549e72f2b55533f315f08b2ede12
+make_check=extended
 
 wimlib-devel_package() {
 	short_desc+=" - development files"

From 6e533341a801b56627db852cc2e67fedb11edb52 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Tue, 20 Apr 2021 08:42:04 -0700
Subject: [PATCH 1462/2024] sakura: update to 3.8.1.

---
 srcpkgs/sakura/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sakura/template b/srcpkgs/sakura/template
index 096bc37d9bc7..a774cb6ee4d1 100644
--- a/srcpkgs/sakura/template
+++ b/srcpkgs/sakura/template
@@ -1,6 +1,6 @@
 # Template file for 'sakura'
 pkgname=sakura
-version=3.8.0
+version=3.8.1
 revision=1
 build_style=cmake
 hostmakedepends="perl pkg-config gettext"
@@ -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=0c414b368cb8f4263d3a899cd2b96e8caf839d916f3ee806e9f50d098fc2fa0f
+checksum=40bc43fdb2950160d361d4ab690196d39da22fb634b756cec942991ff9ee9cdc
 patch_args="-Np1"

From 922257536494ab39278fac72a4834c85be767915 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 16 Apr 2021 12:11:56 -0500
Subject: [PATCH 1463/2024] opensurge: update to 0.5.2.1.

---
 srcpkgs/opensurge/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opensurge/template b/srcpkgs/opensurge/template
index 1e8d42c4fa82..f39fb0028075 100644
--- a/srcpkgs/opensurge/template
+++ b/srcpkgs/opensurge/template
@@ -1,6 +1,6 @@
 # Template file for 'opensurge'
 pkgname=opensurge
-version=0.5.2
+version=0.5.2.1
 revision=1
 build_style=cmake
 hostmakedepends="surgescript pkg-config"
@@ -10,7 +10,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://opensurge2d.org/"
 distfiles="https://github.com/alemart/opensurge/archive/v${version}.tar.gz"
-checksum=838b8ba506e45c800091d8ba7bb830d024907934fba35bf369d92fe13feaa3de
+checksum=27764a82d97b54026c90044fbc31ea4a61f7836568020b869e63376322a155af
 replaces="opensurge-data>=0"
 
 pre_configure() {

From 360a8f2e3489dbbb74f9f8934ce1e0a6e610fb35 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Tue, 20 Apr 2021 13:26:30 +0200
Subject: [PATCH 1464/2024] sshguard: update to 2.4.2.

Closes: #30375 [via git-merge-pr]
---
 srcpkgs/sshguard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sshguard/template b/srcpkgs/sshguard/template
index 7fa96dbcaa9e..d1cbdf1da580 100644
--- a/srcpkgs/sshguard/template
+++ b/srcpkgs/sshguard/template
@@ -1,6 +1,6 @@
 # Template file for 'sshguard'
 pkgname=sshguard
-version=2.4.1
+version=2.4.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="flex"
@@ -9,7 +9,7 @@ maintainer="Lodvær <lodvaer@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.sshguard.net/"
 distfiles="${SOURCEFORGE_SITE}/sshguard/sshguard-${version}.tar.gz"
-checksum=875d02e6e67dced614790ed5e36aef1160edea940f353a79306cbb1852af3c67
+checksum=2770b776e5ea70a9bedfec4fd84d57400afa927f0f7522870d2dcbbe1ace37e8
 
 make_dirs="/var/db/sshguard 0755 root root"
 conf_files="/etc/sshguard.conf"

From 13d23b8214c04a6993897a8053406d098ae2ea20 Mon Sep 17 00:00:00 2001
From: Imran Khan <imrankhan@teknik.io>
Date: Tue, 20 Apr 2021 21:07:54 +0600
Subject: [PATCH 1465/2024] crun: update to 0.19.1.

Closes: #30389 [via git-merge-pr]
---
 srcpkgs/crun/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/crun/template b/srcpkgs/crun/template
index 1f364f7fb58d..1aa3027388ec 100644
--- a/srcpkgs/crun/template
+++ b/srcpkgs/crun/template
@@ -1,6 +1,6 @@
 # Template file for 'crun'
 pkgname=crun
-version=0.19
+version=0.19.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-systemd"
@@ -11,7 +11,7 @@ maintainer="Imran Khan <imrankhan@teknik.io>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/containers/crun"
 distfiles="https://github.com/containers/crun/releases/download/${version}/crun-${version}.tar.gz"
-checksum=8065b73ae37ccfb960915fa10051e2bf27850d1c2c69ffeb9eec17c6f198d1c9
+checksum=7b190ff934355e69636e24c12864326a6ebccdbb12af1f14bead217118eb19cb
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" argp-standalone"

From 42bdfbd4d06af4e9537b59c93d55780ca7b7b94f Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 21 Apr 2021 00:05:31 +0200
Subject: [PATCH 1466/2024] New package: libwpe-1.10.0

---
 common/shlibs           |  1 +
 srcpkgs/libwpe/template | 31 +++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 srcpkgs/libwpe/template

diff --git a/common/shlibs b/common/shlibs
index b1e6ecdedf7f..f27f21d04eda 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2994,6 +2994,7 @@ libyaz_icu.so.5 yaz-5.23.1_1
 libyaz.so.5 yaz-5.23.1_1
 libyaz_server.so.5 yaz-5.23.1_1
 libgcab-1.0.so.0 gcab-0.7_1
+libwpe-1.0.so.1 libwpe-1.10.0_1
 libliveMedia.so.81 live555-2020.08.11_2
 libgroupsock.so.8 live555-2020.08.11_2
 libUsageEnvironment.so.3 live555-2020.08.11_2
diff --git a/srcpkgs/libwpe/template b/srcpkgs/libwpe/template
new file mode 100644
index 000000000000..e09c714fbfe5
--- /dev/null
+++ b/srcpkgs/libwpe/template
@@ -0,0 +1,31 @@
+# Template file for 'libwpe'
+pkgname=libwpe
+version=1.10.0
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config"
+makedepends="MesaLib-devel libxkbcommon-devel"
+short_desc="General-purpose library for WPE WebKit"
+maintainer="q66 <daniel@octaforge.org>"
+license="BSD-2-Clause"
+homepage="https://wpewebkit.org"
+distfiles="https://wpewebkit.org/releases/${pkgname}-${version}.tar.xz"
+checksum=2415e270d45e3595ed4052bc105f733744dc2d3677e12ff4a831e5029841084d
+
+do_check() {
+	: # no tests
+}
+
+post_install() {
+	vlicense COPYING
+}
+
+libwpe-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} libxkbcommon-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From 8e420e08d552e03c3ed48f0cbc743513d307e900 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 21 Apr 2021 00:43:20 +0200
Subject: [PATCH 1467/2024] libwpe: add missing symlink that i accidentally did
 not commit

---
 srcpkgs/libwpe-devel | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 srcpkgs/libwpe-devel

diff --git a/srcpkgs/libwpe-devel b/srcpkgs/libwpe-devel
new file mode 120000
index 000000000000..a6d6943eaef3
--- /dev/null
+++ b/srcpkgs/libwpe-devel
@@ -0,0 +1 @@
+libwpe
\ No newline at end of file

From 47334084c7d59a98fa16b937118ace497c89e360 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 21 Apr 2021 00:17:30 +0200
Subject: [PATCH 1468/2024] New package: wpebackend-fdo-1.8.3

---
 common/shlibs                   |  1 +
 srcpkgs/wpebackend-fdo-devel    |  1 +
 srcpkgs/wpebackend-fdo/template | 27 +++++++++++++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/wpebackend-fdo-devel
 create mode 100644 srcpkgs/wpebackend-fdo/template

diff --git a/common/shlibs b/common/shlibs
index f27f21d04eda..848ea46232bb 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2995,6 +2995,7 @@ libyaz.so.5 yaz-5.23.1_1
 libyaz_server.so.5 yaz-5.23.1_1
 libgcab-1.0.so.0 gcab-0.7_1
 libwpe-1.0.so.1 libwpe-1.10.0_1
+libWPEBackend-fdo-1.0.so.1 wpebackend-fdo-1.8.3_1
 libliveMedia.so.81 live555-2020.08.11_2
 libgroupsock.so.8 live555-2020.08.11_2
 libUsageEnvironment.so.3 live555-2020.08.11_2
diff --git a/srcpkgs/wpebackend-fdo-devel b/srcpkgs/wpebackend-fdo-devel
new file mode 120000
index 000000000000..6587510430e2
--- /dev/null
+++ b/srcpkgs/wpebackend-fdo-devel
@@ -0,0 +1 @@
+wpebackend-fdo
\ No newline at end of file
diff --git a/srcpkgs/wpebackend-fdo/template b/srcpkgs/wpebackend-fdo/template
new file mode 100644
index 000000000000..ab99f91c96e4
--- /dev/null
+++ b/srcpkgs/wpebackend-fdo/template
@@ -0,0 +1,27 @@
+# Template file for 'wpebackend-fdo'
+pkgname=wpebackend-fdo
+version=1.8.3
+revision=1
+build_style=meson
+hostmakedepends="pkg-config"
+makedepends="glib-devel libepoxy-devel libwpe-devel wayland-devel"
+short_desc="FreeDesktop.org backend for WPE"
+maintainer="q66 <daniel@octaforge.org>"
+license="BSD-2-Clause"
+homepage="https://wpewebkit.org"
+distfiles="https://wpewebkit.org/releases/${pkgname}-${version}.tar.xz"
+checksum=3d0b4282a1bd9e0664d7a20abe14e982f3285296ac62de56cae2a404b9d28b9e
+
+post_install() {
+	vlicense COPYING
+}
+
+wpebackend-fdo-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	# the .so file belongs in the main package as it's dlopened
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}

From 22d7303e923ef34edf24911b1534ac3eb2ca6c6c Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 21 Apr 2021 00:53:59 +0200
Subject: [PATCH 1469/2024] wpebackend-fdo: need wayland-devel on host

---
 srcpkgs/wpebackend-fdo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wpebackend-fdo/template b/srcpkgs/wpebackend-fdo/template
index ab99f91c96e4..e0588805cbc9 100644
--- a/srcpkgs/wpebackend-fdo/template
+++ b/srcpkgs/wpebackend-fdo/template
@@ -3,7 +3,7 @@ pkgname=wpebackend-fdo
 version=1.8.3
 revision=1
 build_style=meson
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config wayland-devel"
 makedepends="glib-devel libepoxy-devel libwpe-devel wayland-devel"
 short_desc="FreeDesktop.org backend for WPE"
 maintainer="q66 <daniel@octaforge.org>"

From 8b090970b1876b44701e364b58ede4e45a5a27ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 20 Apr 2021 20:11:13 -0300
Subject: [PATCH 1470/2024] mariadb: fix configure with cmake>=3.20.1.

While here, also move patching for musl to post_patch.
---
 srcpkgs/mariadb/patches/cmake.patch | 15 +++++++++++++++
 srcpkgs/mariadb/template            |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/mariadb/patches/cmake.patch

diff --git a/srcpkgs/mariadb/patches/cmake.patch b/srcpkgs/mariadb/patches/cmake.patch
new file mode 100644
index 000000000000..27b4a507e23c
--- /dev/null
+++ b/srcpkgs/mariadb/patches/cmake.patch
@@ -0,0 +1,15 @@
+caused configure error after update to cmake 3.20.1
+
+diff --git libmariadb/cmake/ConnectorName.cmake libmariadb/cmake/ConnectorName.cmake
+index b7bbbad..357b8ac 100644
+--- libmariadb/cmake/ConnectorName.cmake
++++ libmariadb/cmake/ConnectorName.cmake
+@@ -22,7 +22,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
+     SET(MACHINE_NAME "x64")
+   ELSE()
+     SET(MACHINE_NAME "32")
+-  END()
++  ENDIF()
+ ENDIF()
+ 
+ SET(product_name "mysql-connector-c-${CPACK_PACKAGE_VERSION}-${PLATFORM_NAME}${CONCAT_SIGN}${MACHINE_NAME}")
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 8cbc1357da6f..e6b8a8202770 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -35,7 +35,7 @@ system_accounts="mysql"
 mysql_homedir="/var/lib/mysql"
 make_dirs="/var/lib/mysql 0700 mysql mysql"
 
-pre_configure() {
+post_patch() {
 	case "$XBPS_TARGET_MACHINE" in
 		*-musl)
 			patch -p0 -i ${FILESDIR}/musl-have-stacktrace.patch

From 0cf9149a9e683f5adf4a75a85558f24fb429002f Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 21 Apr 2021 00:26:30 +0200
Subject: [PATCH 1471/2024] webkit2gtk: enable WPE renderer, use large thread
 stacks on musl

---
 ...riptcore.patch => musl-thread-stack.patch} | 92 ++++++++++---------
 srcpkgs/webkit2gtk/template                   | 26 +++---
 2 files changed, 59 insertions(+), 59 deletions(-)
 rename srcpkgs/webkit2gtk/patches/{fix-musl-javascriptcore.patch => musl-thread-stack.patch} (55%)

diff --git a/srcpkgs/webkit2gtk/patches/fix-musl-javascriptcore.patch b/srcpkgs/webkit2gtk/patches/musl-thread-stack.patch
similarity index 55%
rename from srcpkgs/webkit2gtk/patches/fix-musl-javascriptcore.patch
rename to srcpkgs/webkit2gtk/patches/musl-thread-stack.patch
index 16b4189c96c0..a0acbde956e5 100644
--- a/srcpkgs/webkit2gtk/patches/fix-musl-javascriptcore.patch
+++ b/srcpkgs/webkit2gtk/patches/musl-thread-stack.patch
@@ -1,11 +1,7 @@
-Source: @q66, @pullmoll
-Original upstream: Alpine Linux
-Reason: fixing machine context access for musl libc; reduce stack/heap usage for jsc; fix some overly restrictive __GLIBC__ checks
+Source: https://github.com/WebKit/WebKit/commit/6884d13 (tweaked values)
 
-Updated for latest webkit2gtk.
-
--diff --git Source/JavaScriptCore/runtime/MachineContext.h Source/JavaScriptCore/runtime/MachineContext.h
-index ead9cdf..09dc28a 100644
+diff --git Source/JavaScriptCore/runtime/MachineContext.h Source/JavaScriptCore/runtime/MachineContext.h
+index ead9cdf..86b36ca 100644
 --- Source/JavaScriptCore/runtime/MachineContext.h
 +++ Source/JavaScriptCore/runtime/MachineContext.h
 @@ -196,7 +196,7 @@ static inline void*& stackPointerImpl(mcontext_t& machineContext)
@@ -13,7 +9,7 @@ index ead9cdf..09dc28a 100644
  #endif
  
 -#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
-+#elif OS(FUCHSIA) || defined(__linux__)
++#elif OS(FUCHSIA) || OS(LINUX)
  
  #if CPU(X86)
      return reinterpret_cast<void*&>((uintptr_t&) machineContext.gregs[REG_ESP]);
@@ -22,7 +18,7 @@ index ead9cdf..09dc28a 100644
  #endif
  
 -#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
-+#elif OS(FUCHSIA) || defined(__linux__)
++#elif OS(FUCHSIA) || OS(LINUX)
  
  // The following sequence depends on glibc's sys/ucontext.h.
  #if CPU(X86)
@@ -31,7 +27,7 @@ index ead9cdf..09dc28a 100644
  #endif
  
 -#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
-+#elif OS(FUCHSIA) || defined(__linux__)
++#elif OS(FUCHSIA) || OS(LINUX)
  
  // The following sequence depends on glibc's sys/ucontext.h.
  #if CPU(X86)
@@ -40,7 +36,7 @@ index ead9cdf..09dc28a 100644
  #endif
  
 -#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
-+#elif OS(FUCHSIA) || defined(__linux__)
++#elif OS(FUCHSIA) || OS(LINUX)
  
  // The following sequence depends on glibc's sys/ucontext.h.
  #if CPU(X86)
@@ -49,32 +45,34 @@ index ead9cdf..09dc28a 100644
  #endif
  
 -#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
-+#elif OS(FUCHSIA) || defined(__linux__)
++#elif OS(FUCHSIA) || OS(LINUX)
  
  // 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
+index bc1cedb..f4a86a5 100644
 --- Source/JavaScriptCore/runtime/OptionsList.h
 +++ Source/JavaScriptCore/runtime/OptionsList.h
-@@ -39,6 +39,16 @@ namespace JSC {
- 
- JS_EXPORT_PRIVATE bool canUseJITCage();
+@@ -71,6 +71,18 @@ JS_EXPORT_PRIVATE bool canUseJITCage();
+ // On instantiation of the first VM instance, the Options will be write protected
+ // and cannot be modified thereafter.
  
-+#if defined(__GLIBC__)
++#if OS(LINUX) && !defined(__BIONIC__) && !defined(__GLIBC__)
++// non-glibc/non-android options on linux ( musl )
++constexpr unsigned jscMaxPerThreadStack = 2 * MB;
++constexpr unsigned jscSoftReservedZoneSize = 64 * KB;
++constexpr unsigned jscReservedZoneSize = 32 * KB;
++#else
++// default
 +constexpr unsigned jscMaxPerThreadStack = 5 * MB;
 +constexpr unsigned jscSoftReservedZoneSize = 128 * KB;
 +constexpr unsigned jscReservedZoneSize = 64 * KB;
-+#else
-+constexpr unsigned jscMaxPerThreadStack = 80 * KB;
-+constexpr unsigned jscSoftReservedZoneSize = 32 * KB;
-+constexpr unsigned jscReservedZoneSize = 16 * KB;
 +#endif
 +
- // How do JSC VM options work?
- // ===========================
- // The FOR_EACH_JSC_OPTION() macro below defines a list of all JSC options in use,
-@@ -86,9 +96,9 @@ JS_EXPORT_PRIVATE bool canUseJITCage();
+ #define FOR_EACH_JSC_OPTION(v)                                          \
+     v(Bool, useKernTCSM, defaultTCSMValue(), Normal, "Note: this needs to go before other options since they depend on this value.") \
+     v(Bool, validateOptions, false, Normal, "crashes if mis-typed JSC options were passed to the VM") \
+@@ -86,9 +98,9 @@ JS_EXPORT_PRIVATE bool canUseJITCage();
      \
      v(Bool, reportMustSucceedExecutableAllocations, false, Normal, nullptr) \
      \
@@ -87,25 +85,29 @@ index bc1cedb..f161f1c 100644
      \
      v(Bool, crashOnDisallowedVMEntry, ASSERT_ENABLED, Normal, "Forces a crash if we attempt to enter the VM when disallowed") \
      v(Bool, crashIfCantAllocateJITMemory, false, Normal, nullptr) \
-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;
- #if YYERROR_VERBOSE
+diff --git Source/WTF/wtf/PlatformHave.h Source/WTF/wtf/PlatformHave.h
+index 41afbb4..ab5263c 100644
+--- Source/WTF/wtf/PlatformHave.h
++++ Source/WTF/wtf/PlatformHave.h
+@@ -206,7 +206,7 @@
+ #define HAVE_HOSTED_CORE_ANIMATION 1
+ #endif
  
- # ifndef yystrlen
--#  if defined __GLIBC__ && defined _STRING_H
-+#  if defined __linux__ && defined _STRING_H
- #   define yystrlen strlen
- #  else
- /* Return the length of YYSTR.  */
-@@ -989,7 +989,7 @@ yystrlen (yystr)
- # endif
+-#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__GLIBC__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
++#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || OS(LINUX)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
+ #define HAVE_MACHINE_CONTEXT 1
+ #endif
  
- # ifndef yystpcpy
--#  if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
-+#  if defined __linux__ && defined _STRING_H && defined _GNU_SOURCE
- #   define yystpcpy stpcpy
- #  else
- /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
+diff --git Source/WTF/wtf/Threading.cpp Source/WTF/wtf/Threading.cpp
+index 99d09c0..723a8f4 100644
+--- Source/WTF/wtf/Threading.cpp
++++ Source/WTF/wtf/Threading.cpp
+@@ -52,6 +52,8 @@ static Optional<size_t> stackSize(ThreadType threadType)
+ #elif OS(DARWIN) && ASAN_ENABLED
+     if (threadType == ThreadType::Compiler)
+         return 1 * MB; // ASan needs more stack space (especially on Debug builds).
++#elif OS(LINUX) && !defined(__BIONIC__) && !defined(__GLIBC__) // MUSL default thread stack size.
++        return 2 * MB;
+ #else
+     UNUSED_PARAM(threadType);
+ #endif
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 8dd10c32be9a..5a2621b6c93a 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -2,23 +2,15 @@
 # ping q66 before touching this
 pkgname=webkit2gtk
 version=2.32.0
-revision=1
+revision=2
 wrksrc="webkitgtk-${version}"
 build_style=cmake
 build_helper="gir"
 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
- -DENABLE_GTKDOC=OFF -DUSE_GSTREAMER_GL=OFF -DUSE_WPE_RENDERER=OFF
+ -DUSE_SYSTEMD=OFF -DUSE_WOFF2=ON
+ -DENABLE_GTKDOC=OFF -DUSE_GSTREAMER_GL=OFF -DUSE_WPE_RENDERER=ON
  -DENABLE_MINIBROWSER=$(vopt_if minibrowser ON OFF)
  -DENABLE_JIT=$(vopt_if jit ON OFF)
  -DENABLE_C_LOOP=$(vopt_if jit OFF ON)
@@ -37,7 +29,8 @@ 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 libmanette-devel $(vopt_if x11 libXt-devel)
+ qt5-devel libmanette-devel libwpe-devel wpebackend-fdo-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>"
@@ -54,8 +47,13 @@ desc_option_jit="JavaScript JIT (Only some architectures)"
 desc_option_sampling_profiler="Sampling profiler support (JIT + glibc only)"
 desc_option_minibrowser="Build the minibrowser"
 
-# on musl this is not defined and webkit uses it, so define it
-export CFLAGS="-D__WORDSIZE=${XBPS_TARGET_WORDSIZE}"
+export CFLAGS="-DNDEBUG"
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	# this is not defined on musl and is occasionally used
+	export CFLAGS+=" -D__WORDSIZE=${XBPS_TARGET_WORDSIZE}"
+fi
+
 export CXXFLAGS="$CFLAGS"
 
 # WebKitCCache.cmake set this variable

From 782cc40a8b06fe4696fa23fafc56c433b1f9616c 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 20:05:16 +0700
Subject: [PATCH 1472/2024] New package: xcb-imdkit-1.0.3

---
 common/shlibs               |  1 +
 srcpkgs/xcb-imdkit-devel    |  1 +
 srcpkgs/xcb-imdkit/template | 29 +++++++++++++++++++++++++++++
 3 files changed, 31 insertions(+)
 create mode 120000 srcpkgs/xcb-imdkit-devel
 create mode 100644 srcpkgs/xcb-imdkit/template

diff --git a/common/shlibs b/common/shlibs
index 848ea46232bb..1f26086650d4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -256,6 +256,7 @@ libxcb-xkb.so.1 libxcb-1.10_1
 libxcb-xinput.so.0 libxcb-1.10_1
 libxcb-dri3.so.0 libxcb-1.10_1
 libxcb-present.so.0 libxcb-1.10_1
+libxcb-imdkit.so.1 xcb-imdkit-1.0.2_1
 libXdmcp.so.6 libXdmcp-1.0.2_1
 libpolkit-gobject-1.so.0 polkit-0.99_1
 libpolkit-agent-1.so.0 polkit-0.99_1
diff --git a/srcpkgs/xcb-imdkit-devel b/srcpkgs/xcb-imdkit-devel
new file mode 120000
index 000000000000..0044a6a371b3
--- /dev/null
+++ b/srcpkgs/xcb-imdkit-devel
@@ -0,0 +1 @@
+xcb-imdkit
\ No newline at end of file
diff --git a/srcpkgs/xcb-imdkit/template b/srcpkgs/xcb-imdkit/template
new file mode 100644
index 000000000000..49de4a769f17
--- /dev/null
+++ b/srcpkgs/xcb-imdkit/template
@@ -0,0 +1,29 @@
+# Template file for 'xcb-imdkit'
+pkgname=xcb-imdkit
+version=1.0.3
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config extra-cmake-modules"
+makedepends="xcb-util-keysyms-devel xcb-util-devel uthash"
+short_desc="Implementation of xim protocol in xcb"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="LGPL-2.1-only"
+homepage="https://github.com/fcitx/xcb-imdkit"
+distfiles="https://download.fcitx-im.org/fcitx5/xcb-imdkit/xcb-imdkit-${version}.tar.xz"
+checksum=09c2626ea29fbd6a8c650144ca126b7bdd6365258b7c39508028bfdca6dca8e8
+
+post_install() {
+	sed -i '/prefix=/!s,/usr,${exec_prefix},' \
+		"${DESTDIR}/usr/lib/pkgconfig"/*.pc
+}
+
+xcb-imdkit-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From 84269aa60db48923b4a1ed34872b741abc2df25e 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 22:12:45 +0700
Subject: [PATCH 1473/2024] New package: fcitx5-5.0.7

---
 common/shlibs                                 |   3 +
 srcpkgs/fcitx5-icons                          |   1 +
 .../patches/cross-config-template.patch       |  45 ++++
 srcpkgs/fcitx5/patches/no-which.patch         | 194 ++++++++++++++++++
 srcpkgs/fcitx5/template                       |  69 +++++++
 srcpkgs/libfcitx5                             |   1 +
 srcpkgs/libfcitx5-devel                       |   1 +
 7 files changed, 314 insertions(+)
 create mode 120000 srcpkgs/fcitx5-icons
 create mode 100644 srcpkgs/fcitx5/patches/cross-config-template.patch
 create mode 100644 srcpkgs/fcitx5/patches/no-which.patch
 create mode 100644 srcpkgs/fcitx5/template
 create mode 120000 srcpkgs/libfcitx5
 create mode 120000 srcpkgs/libfcitx5-devel

diff --git a/common/shlibs b/common/shlibs
index 1f26086650d4..9214a9d6d138 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2116,6 +2116,9 @@ libfcitx-config.so.4 libfcitx-4.2.8_1
 libFcitxQt5DBusAddons.so.1 libfcitx-qt5-1.2.1_1
 libFcitxQt5WidgetsAddons.so.1 libfcitx-qt5-1.2.1_1
 libfcitx-qt5.so.0 libfcitx-qt5-0.1.3_1
+libFcitx5Utils.so.2 libfcitx5-5.0.5_1
+libFcitx5Core.so.7 libfcitx5-5.0.5_1
+libFcitx5Config.so.6 libfcitx5-5.0.5_1
 libdruntime-ldc-debug-shared.so.94 ldc-runtime-1.24.0_1
 libdruntime-ldc-shared.so.94 ldc-runtime-1.24.0_1
 libphobos2-ldc-shared.so.94 ldc-runtime-1.24.0_1
diff --git a/srcpkgs/fcitx5-icons b/srcpkgs/fcitx5-icons
new file mode 120000
index 000000000000..99ac64afc615
--- /dev/null
+++ b/srcpkgs/fcitx5-icons
@@ -0,0 +1 @@
+fcitx5
\ No newline at end of file
diff --git a/srcpkgs/fcitx5/patches/cross-config-template.patch b/srcpkgs/fcitx5/patches/cross-config-template.patch
new file mode 100644
index 000000000000..69a988f3c877
--- /dev/null
+++ b/srcpkgs/fcitx5/patches/cross-config-template.patch
@@ -0,0 +1,45 @@
+Index: fcitx5-5.0.6/src/lib/fcitx-utils/Fcitx5ModuleTemplate.cmake.in
+===================================================================
+--- fcitx5-5.0.6.orig/src/lib/fcitx-utils/Fcitx5ModuleTemplate.cmake.in
++++ fcitx5-5.0.6/src/lib/fcitx-utils/Fcitx5ModuleTemplate.cmake.in
+@@ -2,6 +2,16 @@ if (TARGET Fcitx5::Module::@FEM_EXPORTNA
+     return()
+ endif()
+ 
++# Compute the installation prefix relative to this file.
++get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
++get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
++get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
++get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
++if(_IMPORT_PREFIX STREQUAL "/")
++  set(_IMPORT_PREFIX "")
++endif()
++
+ add_library(@FEM_TARGET@-interface INTERFACE)
+ add_library(Fcitx5::Module::@FEM_EXPORTNAME@ ALIAS @FEM_TARGET@-interface)
+-set_target_properties(@FEM_TARGET@-interface PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "@_MODULE_HEADER_DIR@")
++set_target_properties(@FEM_TARGET@-interface PROPERTIES
++	INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/../@_MODULE_HEADER_DIR@")
+Index: fcitx5-5.0.6/src/lib/fcitx-utils/Fcitx5UtilsConfig.cmake.in
+===================================================================
+--- fcitx5-5.0.6.orig/src/lib/fcitx-utils/Fcitx5UtilsConfig.cmake.in
++++ fcitx5-5.0.6/src/lib/fcitx-utils/Fcitx5UtilsConfig.cmake.in
+@@ -3,8 +3,17 @@
+ include("${CMAKE_CURRENT_LIST_DIR}/Fcitx5UtilsTargets.cmake")
+ include("${CMAKE_CURRENT_LIST_DIR}/Fcitx5Macros.cmake")
+ 
++# Compute the installation prefix relative to this file.
++get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
++get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
++get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
++get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
++if(_IMPORT_PREFIX STREQUAL "/")
++  set(_IMPORT_PREFIX "")
++endif()
++
+ set(FCITX_SYS_INSTALL_PREFIX "@FCITX_INSTALL_PREFIX@")
+-set(FCITX_INSTALL_CMAKECONFIG_DIR "@FCITX_INSTALL_CMAKECONFIG_DIR@")
++set(FCITX_INSTALL_CMAKECONFIG_DIR "${_IMPORT_PREFIX}/../@FCITX_INSTALL_CMAKECONFIG_DIR@")
+ 
+ set(_default_FCITX_INSTALL_USE_FCITX_SYS_PATHS Off)
+ if (NOT DEFINED FCITX_INSTALL_USE_FCITX_SYS_PATHS)
diff --git a/srcpkgs/fcitx5/patches/no-which.patch b/srcpkgs/fcitx5/patches/no-which.patch
new file mode 100644
index 000000000000..ae553dd1535c
--- /dev/null
+++ b/srcpkgs/fcitx5/patches/no-which.patch
@@ -0,0 +1,194 @@
+Index: fcitx5-5.0.6/data/fcitx5-configtool.sh
+===================================================================
+--- fcitx5-5.0.6.orig/data/fcitx5-configtool.sh
++++ fcitx5-5.0.6/data/fcitx5-configtool.sh
+@@ -5,14 +5,14 @@
+ 
+ export TEXTDOMAIN=fcitx5
+ 
+-if which kdialog > /dev/null 2>&1; then
++if command -v kdialog > /dev/null 2>&1; then
+     message() {
+         kdialog --msgbox "$1"
+     }
+     error() {
+         kdialog --error "$1"
+     }
+-elif which zenity > /dev/null 2>&1; then
++elif command -v zenity > /dev/null 2>&1; then
+     message() {
+         zenity --info --text="$1"
+     }
+@@ -28,7 +28,7 @@ else
+     }
+ fi
+ 
+-if which gettext > /dev/null 2>&1; then
++if command -v gettext > /dev/null 2>&1; then
+     _() {
+         gettext "$@"
+     }
+@@ -101,7 +101,7 @@ detectDE() {
+     if [ x"$DE" = x"gnome" ]; then
+       # gnome-default-applications-properties is only available in GNOME 2.x
+       # but not in GNOME 3.x
+-      which gnome-default-applications-properties > /dev/null 2>&1  || DE="gnome3"
++      command -v gnome-default-applications-properties > /dev/null 2>&1  || DE="gnome3"
+     fi
+ }
+ 
+@@ -116,7 +116,7 @@ run_kde() {
+ }
+ 
+ run_qt() {
+-    if which fcitx5-config-qt > /dev/null 2>&1; then
++    if command -v fcitx5-config-qt > /dev/null 2>&1; then
+         exec fcitx5-config-qt "$1"
+     fi
+     return 1
+@@ -132,13 +132,13 @@ run_xdg() {
+             ;;
+     esac
+ 
+-    if command="$(which xdg-open 2>/dev/null)"; then
++    if command="$(command -v xdg-open 2>/dev/null)"; then
+         exec "$command" "$HOME/.config/fcitx5"
+     fi
+ }
+ 
+ _which_cmdline() {
+-    cmd="$(which "$1")" || return 1
++    cmd="$(command -v "$1")" || return 1
+     shift
+     echo "$cmd $*"
+ }
+Index: fcitx5-5.0.6/data/fcitx5-diagnose.sh
+===================================================================
+--- fcitx5-5.0.6.orig/data/fcitx5-diagnose.sh
++++ fcitx5-5.0.6/data/fcitx5-diagnose.sh
+@@ -123,7 +123,7 @@ __get_pretty_name() {
+     fi
+ }
+ 
+-fcitx_exe="$(which fcitx5 2> /dev/null)"
++fcitx_exe="$(command -v fcitx5 2> /dev/null)"
+ 
+ __conf_dir_init() {
+     # Don't do any fancy check here, it's the user's fault, which we should detect
+@@ -208,9 +208,9 @@ if type dbus-send &> /dev/null; then
+             "string:$1" 2> /dev/null) || return 1
+         echo -n "${pid##* }"
+     }
+-elif qdbus_exe=$(which qdbus 2> /dev/null) || \
+-        qdbus_exe=$(which qdbus-qt4 2> /dev/null) || \
+-        qdbus_exe=$(which qdbus-qt5 2> /dev/null); then
++elif qdbus_exe=$(command -v qdbus 2> /dev/null) || \
++        qdbus_exe=$(command -v qdbus-qt4 2> /dev/null) || \
++        qdbus_exe=$(command -v qdbus-qt5 2> /dev/null); then
+     dbus_exe=${qdbus_exe}
+     dbus_get_name_owner() {
+         "${qdbus_exe}" org.freedesktop.DBus /org/freedesktop/DBus \
+@@ -324,15 +324,15 @@ detectDE() {
+     if [ x"$DE" = x"gnome" ]; then
+         # gnome-default-applications-properties is only available in GNOME 2.x
+         # but not in GNOME 3.x
+-        which gnome-default-applications-properties > /dev/null 2>&1 || \
++        command -v gnome-default-applications-properties > /dev/null 2>&1 || \
+             DE="gnome3"
+-        which gnome-shell &> /dev/null && DE="gnome3"
++        command -v gnome-shell &> /dev/null && DE="gnome3"
+     fi
+ }
+ 
+ maybe_gnome3() {
+     [[ $DE = gnome3 ]] && return 0
+-    [[ $DE = generic ]] && which gnome-shell &> /dev/null && return 0
++    [[ $DE = generic ]] && command -v gnome-shell &> /dev/null && return 0
+     return 1
+ }
+ 
+@@ -341,7 +341,7 @@ detectDE
+ # user and uid
+ 
+ detect_user() {
+-    if which id &> /dev/null; then
++    if command -v id &> /dev/null; then
+         cur_user=$(id -un)
+         cur_uid=$(id -u)
+     else
+@@ -352,7 +352,7 @@ detect_user() {
+         else
+             cur_uid=""
+         fi
+-        if which whoami &> /dev/null; then
++        if command -v whoami &> /dev/null; then
+             cur_user=$(whoami)
+         elif [[ -d /proc/$$/ ]]; then
+             cur_user=$(stat -c %U /proc/$$/)
+@@ -374,7 +374,7 @@ _check_open_root() {
+     for f in /proc/1/environ /proc/1/mem /proc/kcore /proc/kmem; do
+         try_open "$f" && return 0
+     done
+-    if which readlink &> /dev/null; then
++    if command -v readlink &> /dev/null; then
+         for f in /proc/1/exe /proc/1/cwd /proc/1/root; do
+             readlink "$f" &> /dev/null && return 0
+         done
+@@ -966,7 +966,7 @@ _find_config_gtk() {
+         return 0
+     }
+     local config_gtk
+-    config_gtk="$(which "fcitx5-config-gtk" 2> /dev/null)" || return 1
++    config_gtk="$(command -v "fcitx5-config-gtk" 2> /dev/null)" || return 1
+     echo "${config_gtk}"
+     _config_tool_gtk_exe="${config_gtk}"
+ }
+@@ -993,7 +993,7 @@ _check_config_gtk() {
+     local version=$1
+     local config_gtk config_gtk_name
+     write_order_list_eval "$(_ 'Config GUI for gtk${1}:')" "${version}"
+-    if ! config_gtk="$(which "fcitx5-config-gtk${version}" 2> /dev/null)"; then
++    if ! config_gtk="$(command -v "fcitx5-config-gtk${version}" 2> /dev/null)"; then
+         if ! _check_config_gtk_version "${version}"; then
+             write_error_eval \
+                 "$(_ 'Config GUI for gtk${1} not found.')" "${version}"
+@@ -1014,7 +1014,7 @@ _check_config_qt() {
+     local config_qt config_qt_name
+     config_qt_name="fcitx5-config-qt"
+     write_order_list_eval "$(_ 'Config GUI for qt:')" "${version}"
+-    if ! config_qt="$(which "${config_qt_name}" 2> /dev/null)"; then
++    if ! config_qt="$(command -v "${config_qt_name}" 2> /dev/null)"; then
+         write_error "$(_ 'Config GUI for qt not found.')"
+         return 1
+     fi
+@@ -1027,7 +1027,7 @@ _check_config_kcm() {
+     local version=$1
+     local kcm_shell config_kcm
+     write_order_list "$(_ 'Config GUI for kde:')"
+-    if ! kcm_shell="$(which "kcmshell${version}" 2> /dev/null)"; then
++    if ! kcm_shell="$(command -v "kcmshell${version}" 2> /dev/null)"; then
+         write_error "$(print_not_found "kcmshell${version}")"
+         return 1
+     fi
+@@ -1043,7 +1043,7 @@ check_config_ui() {
+     local IFS=$'\n'
+     write_title 1 "$(_ 'Fcitx Configure UI:')"
+     write_order_list "$(_ 'Config Tool Wrapper:')"
+-    if ! fcitx_configtool="$(which fcitx5-configtool 2> /dev/null)"; then
++    if ! fcitx_configtool="$(command -v fcitx5-configtool 2> /dev/null)"; then
+         write_error_eval "$(_ 'Cannot find ${1} executable!')" fcitx5-configtool
+     else
+         write_eval "$(_ 'Found ${1} at ${2}.')" \
+Index: fcitx5-5.0.6/test/xvfb_wrapper.sh
+===================================================================
+--- fcitx5-5.0.6.orig/test/xvfb_wrapper.sh
++++ fcitx5-5.0.6/test/xvfb_wrapper.sh
+@@ -20,7 +20,7 @@ finish()
+ 
+ trap finish EXIT
+ 
+-if which xprop >/dev/null 2>&1; then
++if command -v xprop >/dev/null 2>&1; then
+     i=1
+     while [ "$i" -lt 5 ]; do
+         if xprop -root >/dev/null 2>&1; then
diff --git a/srcpkgs/fcitx5/template b/srcpkgs/fcitx5/template
new file mode 100644
index 000000000000..260c4bd8163b
--- /dev/null
+++ b/srcpkgs/fcitx5/template
@@ -0,0 +1,69 @@
+# Template file for 'fcitx5'
+pkgname=fcitx5
+version=5.0.7
+revision=1
+build_style=cmake
+build_helper=qemu
+configure_args="
+ -DCMAKE_INSTALL_LIBDATADIR=/usr/lib${XBPS_TARGET_WORDSIZE}
+ -DUSE_SYSTEMD=OFF"
+hostmakedepends="cldr-emoji-annotation pkg-config gettext doxygen
+ extra-cmake-modules xkeyboard-config wayland-devel"
+makedepends="fmt-devel expat-devel iso-codes enchant2-devel libxkbfile-devel
+ dbus-devel pango-devel glib-devel libevent-devel xcb-util-wm-devel
+ xcb-util-keysyms-devel xcb-util-devel xcb-imdkit-devel libxkbcommon-devel
+ wayland-devel wayland-protocols gdk-pixbuf-devel json-c-devel"
+depends="fcitx5-icons"
+short_desc="Flexible Context-aware Input Tool with eXtension - v5"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="LGPL-2.1-or-later"
+homepage="https://fcitx-im.org/wiki/Fcitx"
+_en_dict_ver=20121020
+distfiles="https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-${version}.tar.xz
+ https://download.fcitx-im.org/data/en_dict-${_en_dict_ver}.tar.gz"
+checksum="c66781c4f774cb82794004877d94f1e68deaf9fd6312c649b438fb479ffe4588
+ c44a5d7847925eea9e4d2d04748d442cd28dd9299a0b572ef7d91eac4f5a6ceb"
+patch_args=-Np1
+skip_extraction=en_dict-${_en_dict_ver}.tar.gz
+lib32disabled=yes
+
+# Warning: do NOT enable backtrace for musl, do NOT add libexecinfo-devel
+
+post_extract() {
+	local _distdir=${XBPS_SRCDISTDIR}/${pkgname}-${version}
+	cp ${_distdir}/en_dict-${_en_dict_ver}.tar.gz src/modules/spell/dict
+}
+
+post_install() {
+	sed -i '/prefix=/!s,/usr,${exec_prefix},' \
+		"${DESTDIR}/usr/lib/pkgconfig"/*.pc
+	sed -i '/INTERFACE_INCLUDE_DIRECTORIES/s,"/usr,"${_IMPORT_PREFIX},' \
+		"${DESTDIR}/usr/lib/cmake"/*/*Targets.cmake
+}
+
+fcitx5-icons_package() {
+	short_desc+=" - icons"
+	conflicts="fcitx<=4.2.9.8_3"
+	pkg_install() {
+		vmove usr/share/icons
+	}
+}
+
+libfcitx5_package() {
+	short_desc+=" - libraries"
+	lib32disabled=yes
+	pkg_install() {
+		vmove "usr/lib/*.so.*"
+	}
+}
+
+libfcitx5-devel_package() {
+	depends="libfcitx5>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/libfcitx5 b/srcpkgs/libfcitx5
new file mode 120000
index 000000000000..99ac64afc615
--- /dev/null
+++ b/srcpkgs/libfcitx5
@@ -0,0 +1 @@
+fcitx5
\ No newline at end of file
diff --git a/srcpkgs/libfcitx5-devel b/srcpkgs/libfcitx5-devel
new file mode 120000
index 000000000000..99ac64afc615
--- /dev/null
+++ b/srcpkgs/libfcitx5-devel
@@ -0,0 +1 @@
+fcitx5
\ No newline at end of file

From c556151e4ad1c70e64655a5228ca9d9cfeac5c30 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, 22 Mar 2021 00:21:37 +0700
Subject: [PATCH 1474/2024] New package: fcitx5-gtk-5.0.6

---
 common/shlibs               |  1 +
 srcpkgs/fcitx5-gtk+2        |  1 +
 srcpkgs/fcitx5-gtk+3        |  1 +
 srcpkgs/fcitx5-gtk-devel    |  1 +
 srcpkgs/fcitx5-gtk/template | 71 +++++++++++++++++++++++++++++++++++++
 srcpkgs/fcitx5-gtk4         |  1 +
 6 files changed, 76 insertions(+)
 create mode 120000 srcpkgs/fcitx5-gtk+2
 create mode 120000 srcpkgs/fcitx5-gtk+3
 create mode 120000 srcpkgs/fcitx5-gtk-devel
 create mode 100644 srcpkgs/fcitx5-gtk/template
 create mode 120000 srcpkgs/fcitx5-gtk4

diff --git a/common/shlibs b/common/shlibs
index 9214a9d6d138..b4efbfee340d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2119,6 +2119,7 @@ libfcitx-qt5.so.0 libfcitx-qt5-0.1.3_1
 libFcitx5Utils.so.2 libfcitx5-5.0.5_1
 libFcitx5Core.so.7 libfcitx5-5.0.5_1
 libFcitx5Config.so.6 libfcitx5-5.0.5_1
+libFcitx5GClient.so.2 fcitx5-gtk-5.0.4_1
 libdruntime-ldc-debug-shared.so.94 ldc-runtime-1.24.0_1
 libdruntime-ldc-shared.so.94 ldc-runtime-1.24.0_1
 libphobos2-ldc-shared.so.94 ldc-runtime-1.24.0_1
diff --git a/srcpkgs/fcitx5-gtk+2 b/srcpkgs/fcitx5-gtk+2
new file mode 120000
index 000000000000..de83ca580801
--- /dev/null
+++ b/srcpkgs/fcitx5-gtk+2
@@ -0,0 +1 @@
+fcitx5-gtk
\ No newline at end of file
diff --git a/srcpkgs/fcitx5-gtk+3 b/srcpkgs/fcitx5-gtk+3
new file mode 120000
index 000000000000..de83ca580801
--- /dev/null
+++ b/srcpkgs/fcitx5-gtk+3
@@ -0,0 +1 @@
+fcitx5-gtk
\ No newline at end of file
diff --git a/srcpkgs/fcitx5-gtk-devel b/srcpkgs/fcitx5-gtk-devel
new file mode 120000
index 000000000000..de83ca580801
--- /dev/null
+++ b/srcpkgs/fcitx5-gtk-devel
@@ -0,0 +1 @@
+fcitx5-gtk
\ No newline at end of file
diff --git a/srcpkgs/fcitx5-gtk/template b/srcpkgs/fcitx5-gtk/template
new file mode 100644
index 000000000000..07d19a9ce464
--- /dev/null
+++ b/srcpkgs/fcitx5-gtk/template
@@ -0,0 +1,71 @@
+# Template file for 'fcitx5-gtk'
+pkgname=fcitx5-gtk
+version=5.0.6
+revision=1
+build_style=cmake
+build_helper=gir
+configure_args="$(vopt_bool gir ENABLE_GIR)"
+hostmakedepends="cldr-emoji-annotation pkg-config gettext doxygen
+ extra-cmake-modules glib-devel"
+makedepends="libfcitx5-devel libglib-devel fmt-devel
+ gtk+-devel gtk+3-devel gtk4-devel"
+short_desc="Fcitx v5 - GTK common"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="LGPL-2.1-or-later"
+homepage="https://fcitx-im.org/wiki/Fcitx"
+distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-gtk/fcitx5-gtk-${version}.tar.xz"
+checksum=01e4a8c571a53af830a0e9e7436b4edb6a87a8f92efb0c423f1142ccae4e991f
+lib32disabled=yes
+
+build_options="gir"
+build_options_default="gir"
+
+post_configure() {
+	find build -name cmake_install.cmake -exec \
+		sed -i -e 's,"//\+usr,"/usr,' {} +
+}
+
+post_install() {
+	sed -i '/prefix=/!s,/usr,${exec_prefix},' \
+		"${DESTDIR}/usr/lib/pkgconfig"/*.pc
+	sed -i '/INTERFACE_INCLUDE_DIRECTORIES/s,/usr,${_IMPORT_PREFIX},g' \
+		"${DESTDIR}/usr/lib/cmake"/*/*Targets.cmake
+}
+
+fcitx5-gtk+2_package() {
+	short_desc="${short_desc/common/+2 IM Modules}"
+	lib32disabled=yes
+	pkg_install() {
+		vmove usr/lib/gtk-2.0
+	}
+}
+
+fcitx5-gtk+3_package() {
+	short_desc="${short_desc/common/+3 IM Modules}"
+	lib32disabled=yes
+	pkg_install() {
+		vmove usr/lib/gtk-3.0
+	}
+}
+
+fcitx5-gtk4_package() {
+	short_desc="${short_desc/common/4 IM Modules}"
+	lib32disabled=yes
+	pkg_install() {
+		vmove usr/lib/gtk-4.0
+	}
+}
+
+fcitx5-gtk-devel_package() {
+	short_desc+=" - development files"
+	depends="fcitx5-gtk>=${version}_${revision} libglib-devel"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0
+		fi
+	}
+}
diff --git a/srcpkgs/fcitx5-gtk4 b/srcpkgs/fcitx5-gtk4
new file mode 120000
index 000000000000..de83ca580801
--- /dev/null
+++ b/srcpkgs/fcitx5-gtk4
@@ -0,0 +1 @@
+fcitx5-gtk
\ No newline at end of file

From d4d40acff22efe5fb5e0499d686cc7f71ac28cc2 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, 22 Mar 2021 01:00:18 +0700
Subject: [PATCH 1475/2024] New package: fcitx5-qt5-5.0.5

---
 common/shlibs               |  2 ++
 srcpkgs/fcitx5-qt5-devel    |  1 +
 srcpkgs/fcitx5-qt5/template | 33 +++++++++++++++++++++++++++++++++
 srcpkgs/fcitx5-qt5/update   |  1 +
 4 files changed, 37 insertions(+)
 create mode 120000 srcpkgs/fcitx5-qt5-devel
 create mode 100644 srcpkgs/fcitx5-qt5/template
 create mode 100644 srcpkgs/fcitx5-qt5/update

diff --git a/common/shlibs b/common/shlibs
index b4efbfee340d..b2cca724df79 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2120,6 +2120,8 @@ libFcitx5Utils.so.2 libfcitx5-5.0.5_1
 libFcitx5Core.so.7 libfcitx5-5.0.5_1
 libFcitx5Config.so.6 libfcitx5-5.0.5_1
 libFcitx5GClient.so.2 fcitx5-gtk-5.0.4_1
+libFcitx5Qt5DBusAddons.so.1 fcitx5-qt5-5.0.3_1
+libFcitx5Qt5WidgetsAddons.so.2 fcitx5-qt5-5.0.3_1
 libdruntime-ldc-debug-shared.so.94 ldc-runtime-1.24.0_1
 libdruntime-ldc-shared.so.94 ldc-runtime-1.24.0_1
 libphobos2-ldc-shared.so.94 ldc-runtime-1.24.0_1
diff --git a/srcpkgs/fcitx5-qt5-devel b/srcpkgs/fcitx5-qt5-devel
new file mode 120000
index 000000000000..b06bf33725d5
--- /dev/null
+++ b/srcpkgs/fcitx5-qt5-devel
@@ -0,0 +1 @@
+fcitx5-qt5
\ No newline at end of file
diff --git a/srcpkgs/fcitx5-qt5/template b/srcpkgs/fcitx5-qt5/template
new file mode 100644
index 000000000000..ced97810285e
--- /dev/null
+++ b/srcpkgs/fcitx5-qt5/template
@@ -0,0 +1,33 @@
+# Template file for 'fcitx5-qt5'
+pkgname=fcitx5-qt5
+version=5.0.5
+revision=1
+wrksrc=fcitx5-qt-$version
+build_style=cmake
+configure_args="-DENABLE_QT4=OFF -DENABLE_QT5=ON -DENABLE_QT6=OFF"
+hostmakedepends="cldr-emoji-annotation pkg-config gettext doxygen
+ extra-cmake-modules qt5-qmake qt5-host-tools"
+makedepends="libfcitx5-devel fmt-devel qt5-devel libxkbcommon-devel"
+short_desc="Flexible Context-aware Input Tool with eXtension v5 - Qt5"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="LGPL-2.1-or-later, BSD-3-Clause"
+homepage="https://fcitx-im.org/wiki/Fcitx"
+distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-qt/fcitx5-qt-${version}.tar.xz"
+checksum=4b3b79abd2daae70255c098252e79928bb8d0ab966035b7e76378805b6cb5b6f
+lib32disabled=yes
+
+post_install() {
+	sed -e 's/<year.*owner>/2012-2021 CSSlayer <wengxt@gmail.com>/' \
+		LICENSES/BSD-3-Clause.txt >LICENSE
+	vlicense LICENSE
+}
+
+fcitx5-qt5-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} qt5-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/fcitx5-qt5/update b/srcpkgs/fcitx5-qt5/update
new file mode 100644
index 000000000000..92b65ebc90e4
--- /dev/null
+++ b/srcpkgs/fcitx5-qt5/update
@@ -0,0 +1 @@
+pkgname=fcitx5-qt

From 2e662d820274d3da1e9ec4da969fe78c66ff0c8c 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, 22 Mar 2021 09:18:21 +0700
Subject: [PATCH 1476/2024] New package: fcitx5-rime-5.0.5

---
 srcpkgs/fcitx5-rime-icons    |  1 +
 srcpkgs/fcitx5-rime/template | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 120000 srcpkgs/fcitx5-rime-icons
 create mode 100644 srcpkgs/fcitx5-rime/template

diff --git a/srcpkgs/fcitx5-rime-icons b/srcpkgs/fcitx5-rime-icons
new file mode 120000
index 000000000000..2de077b5f2e3
--- /dev/null
+++ b/srcpkgs/fcitx5-rime-icons
@@ -0,0 +1 @@
+fcitx5-rime
\ No newline at end of file
diff --git a/srcpkgs/fcitx5-rime/template b/srcpkgs/fcitx5-rime/template
new file mode 100644
index 000000000000..216df93b017e
--- /dev/null
+++ b/srcpkgs/fcitx5-rime/template
@@ -0,0 +1,24 @@
+# Template file for 'fcitx5-rime'
+pkgname=fcitx5-rime
+version=5.0.5
+revision=1
+build_style=cmake
+configure_args="-DRIME_DATA_DIR=/usr/share/rime-data"
+hostmakedepends="cldr-emoji-annotation pkg-config gettext doxygen
+ extra-cmake-modules"
+makedepends="libfcitx5-devel fmt-devel librime-devel"
+depends="brise fcitx5-rime-icons"
+short_desc="Fcitx v5 - RIME engine"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://fcitx-im.org/wiki/Fcitx"
+distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-rime/fcitx5-rime-${version}.tar.xz"
+checksum=7845893c572bfe0e3f19df91a8f25cfcc733990e6da7609850f89bc02907220a
+lib32disabled=yes
+
+fcitx5-rime-icons_package() {
+	short_desc+=" - icons"
+	pkg_install() {
+		vmove usr/share/icons
+	}
+}

From a9256bb14003515e2239c68c0634dcf9256c3f45 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, 22 Mar 2021 09:31:33 +0700
Subject: [PATCH 1477/2024] New package: fcitx5-lua-5.0.4

---
 srcpkgs/fcitx5-lua-devel    |  1 +
 srcpkgs/fcitx5-lua/template | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/fcitx5-lua-devel
 create mode 100644 srcpkgs/fcitx5-lua/template

diff --git a/srcpkgs/fcitx5-lua-devel b/srcpkgs/fcitx5-lua-devel
new file mode 120000
index 000000000000..afec5c01e1e0
--- /dev/null
+++ b/srcpkgs/fcitx5-lua-devel
@@ -0,0 +1 @@
+fcitx5-lua
\ No newline at end of file
diff --git a/srcpkgs/fcitx5-lua/template b/srcpkgs/fcitx5-lua/template
new file mode 100644
index 000000000000..30f51aa1c42e
--- /dev/null
+++ b/srcpkgs/fcitx5-lua/template
@@ -0,0 +1,33 @@
+# Template file for 'fcitx5-lua'
+pkgname=fcitx5-lua
+version=5.0.4
+revision=1
+build_style=cmake
+hostmakedepends="cldr-emoji-annotation pkg-config gettext doxygen
+ extra-cmake-modules"
+makedepends="libfcitx5-devel fmt-devel lua53-devel"
+depends="fcitx5"
+checkdepends="fcitx5"
+short_desc="Lua scripting support for fcitx5"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/fcitx/fcitx5-lua"
+distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-lua/fcitx5-lua-${version}.tar.xz"
+checksum=7c8899cb6f05074263e66b95a8717594f9d5c5c1e693bfe9cf4660bbba1f9336
+lib32disabled=yes
+
+pre_build() {
+	mkdir -p native
+	$CXX_FOR_BUILD $CXXFLAGS_FOR_BUILD $LDFLAGS_FOR_BUILD \
+		-o native/file2cstring src/file2cstring/file2cstring.cpp
+	PATH="${wrksrc}/native:$PATH"
+}
+
+fcitx5-lua-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+	}
+}

From 6f63b380132080dfe50ba1e34a1cdaa2472bded7 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, 22 Mar 2021 22:02:20 +0700
Subject: [PATCH 1478/2024] New package: fcitx5-configtool-5.0.4

---
 srcpkgs/fcitx5-configtool/template | 30 ++++++++++++++++++++++++++++++
 srcpkgs/fcitx5-migrator            |  1 +
 2 files changed, 31 insertions(+)
 create mode 100644 srcpkgs/fcitx5-configtool/template
 create mode 120000 srcpkgs/fcitx5-migrator

diff --git a/srcpkgs/fcitx5-configtool/template b/srcpkgs/fcitx5-configtool/template
new file mode 100644
index 000000000000..15507872e601
--- /dev/null
+++ b/srcpkgs/fcitx5-configtool/template
@@ -0,0 +1,30 @@
+# Template file for 'fcitx5-configtool'
+pkgname=fcitx5-configtool
+version=5.0.4
+revision=1
+build_style=cmake
+hostmakedepends="cldr-emoji-annotation pkg-config gettext doxygen
+ extra-cmake-modules glib-devel qt5-qmake qt5-host-tools xkeyboard-config
+ AppStream kcoreaddons"
+makedepends="libfcitx5-devel fcitx5-gtk-devel fcitx5-qt5-devel
+ libglib-devel qt5-devel qt5-x11extras-devel kitemviews-devel
+ qt5-quickcontrols2-devel qt5-declarative-devel kcoreaddons-devel
+ ki18n-devel kpackage-devel kdeclarative-devel kirigami2-devel
+ libxkbcommon-devel iso-codes libX11-devel libxkbfile-devel"
+short_desc="Fcitx v5 - config tool"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://fcitx-im.org/wiki/Fcitx"
+distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-configtool/fcitx5-configtool-${version}.tar.xz"
+checksum=1c835e236d013e84c88ff442332003fc69531191d4b3cbf54e85e29fc57d9d11
+lib32disabled=yes
+
+fcitx5-migrator_package() {
+	short_desc="${short_desc/config/migration}"
+	lib32disabled=yes
+	pkg_install() {
+		vmove usr/bin/fcitx5-migrator
+		vmove "usr/lib/libFcitx5Migrator.so*"
+		vmove usr/share/applications/org.fcitx.fcitx5-migrator.desktop
+	}
+}
diff --git a/srcpkgs/fcitx5-migrator b/srcpkgs/fcitx5-migrator
new file mode 120000
index 000000000000..e54fa5c62107
--- /dev/null
+++ b/srcpkgs/fcitx5-migrator
@@ -0,0 +1 @@
+fcitx5-configtool
\ No newline at end of file

From 9365cb6fa76ca1f4a9e810c11618cce86de2926b 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, 22 Mar 2021 22:25:14 +0700
Subject: [PATCH 1479/2024] New package: fcitx5-m17n-5.0.4

---
 srcpkgs/fcitx5-m17n/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/fcitx5-m17n/template

diff --git a/srcpkgs/fcitx5-m17n/template b/srcpkgs/fcitx5-m17n/template
new file mode 100644
index 000000000000..597d193e3e00
--- /dev/null
+++ b/srcpkgs/fcitx5-m17n/template
@@ -0,0 +1,16 @@
+# Template file for 'fcitx5-m17n'
+pkgname=fcitx5-m17n
+version=5.0.4
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config gettext doxygen extra-cmake-modules"
+makedepends="libfcitx5-devel fmt-devel m17n-lib-devel"
+depends="m17n-db fcitx5"
+checkdepends="$depends"
+short_desc="Fcitx v5 - m17n engine"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="LGPL-2.1-or-later"
+homepage="https://fcitx-im.org/wiki/Fcitx"
+distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-m17n/fcitx5-m17n-${version}.tar.xz"
+checksum=f687f3f398e5d4be34e3ec70962f009ad6b9eb9b1dc33f7c2a868aca6ba3c3c2
+lib32disabled=yes

From 50a8cfa1ce404051448356c01f8b0399287e31e4 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, 23 Mar 2021 18:02:57 +0700
Subject: [PATCH 1480/2024] New package: fcitx5-chewing-5.0.5

---
 srcpkgs/fcitx5-chewing-icons    |  1 +
 srcpkgs/fcitx5-chewing/template | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 120000 srcpkgs/fcitx5-chewing-icons
 create mode 100644 srcpkgs/fcitx5-chewing/template

diff --git a/srcpkgs/fcitx5-chewing-icons b/srcpkgs/fcitx5-chewing-icons
new file mode 120000
index 000000000000..88c258a7ebb9
--- /dev/null
+++ b/srcpkgs/fcitx5-chewing-icons
@@ -0,0 +1 @@
+fcitx5-chewing
\ No newline at end of file
diff --git a/srcpkgs/fcitx5-chewing/template b/srcpkgs/fcitx5-chewing/template
new file mode 100644
index 000000000000..83dadccc2b3a
--- /dev/null
+++ b/srcpkgs/fcitx5-chewing/template
@@ -0,0 +1,22 @@
+# Template file for 'fcitx5-chewing'
+pkgname=fcitx5-chewing
+version=5.0.5
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config gettext doxygen extra-cmake-modules"
+makedepends="libfcitx5-devel fmt-devel libchewing-devel"
+short_desc="Fcitx5 - chewing engine"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://fcitx-im.org/wiki/Fcitx"
+distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-chewing/fcitx5-chewing-${version}.tar.xz"
+checksum=9c2f208796198daa6c37d9918929f0301792c1611afbc14155ef4dd69d699163
+lib32disabled=yes
+
+fcitx5-chewing-icons_package() {
+	short_desc+=" - icons"
+	conflicts="fcitx-chewing<=0.2.3_1"
+	pkg_install() {
+		vmove usr/share/icons
+	}
+}

From 80b3f99bcc259315ff30c4d36217c225bcbc6d89 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, 23 Mar 2021 22:46:14 +0700
Subject: [PATCH 1481/2024] New package: libime-1.0.6

---
 common/shlibs            |  3 ++
 srcpkgs/libime-devel     |  1 +
 srcpkgs/libime-migration |  1 +
 srcpkgs/libime-utils     |  1 +
 srcpkgs/libime/template  | 64 ++++++++++++++++++++++++++++++++++++++++
 5 files changed, 70 insertions(+)
 create mode 120000 srcpkgs/libime-devel
 create mode 120000 srcpkgs/libime-migration
 create mode 120000 srcpkgs/libime-utils
 create mode 100644 srcpkgs/libime/template

diff --git a/common/shlibs b/common/shlibs
index b2cca724df79..5ad8100d0e4b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3105,6 +3105,9 @@ libi2c.so.0 i2c-tools-4.0_1
 libmarisa.so.0 marisa-0.2.5_1
 libopencc.so.1.1 opencc-1.1.1_1
 librime.so.1 librime-1.2.9_1
+libIMECore.so.0 libime-1.0.5_1
+libIMEPinyin.so.0 libime-1.0.5_1
+libIMETable.so.0 libime-1.0.5_1
 libairspy.so.0 libairspy-1.0.9_1
 libKF5KDcraw.so.5 libkdcraw5-17.04.3_1
 libKF5Kipi.so.32.0.0 libkipi5-17.04.3_1
diff --git a/srcpkgs/libime-devel b/srcpkgs/libime-devel
new file mode 120000
index 000000000000..0e6317ec164c
--- /dev/null
+++ b/srcpkgs/libime-devel
@@ -0,0 +1 @@
+libime
\ No newline at end of file
diff --git a/srcpkgs/libime-migration b/srcpkgs/libime-migration
new file mode 120000
index 000000000000..0e6317ec164c
--- /dev/null
+++ b/srcpkgs/libime-migration
@@ -0,0 +1 @@
+libime
\ No newline at end of file
diff --git a/srcpkgs/libime-utils b/srcpkgs/libime-utils
new file mode 120000
index 000000000000..0e6317ec164c
--- /dev/null
+++ b/srcpkgs/libime-utils
@@ -0,0 +1 @@
+libime
\ No newline at end of file
diff --git a/srcpkgs/libime/template b/srcpkgs/libime/template
new file mode 100644
index 000000000000..4935ab5ff67f
--- /dev/null
+++ b/srcpkgs/libime/template
@@ -0,0 +1,64 @@
+# Template file for 'libime'
+pkgname=libime
+version=1.0.6
+revision=1
+build_style=cmake
+build_helper=qemu
+hostmakedepends="pkg-config gettext extra-cmake-modules python3"
+makedepends="libfcitx5-devel boost-devel"
+short_desc="Library to support generic input method implementation"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="LGPL-2.1-or-later"
+homepage="https://fcitx-im.org/wiki/Fcitx"
+_lm_sc_version=20140820
+_dict_version=20210302
+distfiles="https://download.fcitx-im.org/fcitx5/libime/libime-${version}.tar.xz
+ https://download.fcitx-im.org/data/lm_sc.3gm.arpa-${_lm_sc_version}.tar.bz2
+ https://download.fcitx-im.org/data/dict.utf8-${_dict_version}.tar.xz
+ https://download.fcitx-im.org/data/table.tar.gz"
+checksum="f024e2602be83a79c733955166fd9f757e24f466cf96ce8d66c880c132d92dd6
+ 751bab7c55ea93a2cedfb0fbb7eb09f67d4da9c2c55496e5f31eb8580f1d1e2f
+ cd43f97749f38e65fc1f706b981a3c1991599770268932dbb11b2ab90c087646
+ 6196053c724125e3ae3d8bd6b2f9172d0c83b65b0d410d3cde63b7a8d6ab87b7"
+skip_extraction="
+ lm_sc.3gm.arpa-${_lm_sc_version}.tar.bz2
+ dict.utf8-${_dict_version}.tar.xz
+ table.tar.gz"
+
+post_extract() {
+	local _srcdistdir=${XBPS_SRCDISTDIR}/${pkgname}-${version}
+	local _file
+	for _file in ${skip_extraction}; do
+		cp ${_srcdistdir}/${_file} data
+	done
+}
+
+post_install() {
+	sed -i '/INTERFACE_INCLUDE_DIRECTORIES/s,"/usr,"${_IMPORT_PREFIX},' \
+		"${DESTDIR}/usr/lib/cmake"/*/*Targets.cmake
+}
+
+libime-migration_package() {
+	short_desc+=" - migration tools"
+	pkg_install() {
+		vmove "usr/bin/libime_migrate_*"
+	}
+}
+
+libime-utils_package() {
+	short_desc+=" - utilities"
+	pkg_install() {
+		vmove usr/bin
+	}
+}
+
+libime-devel_package() {
+	short_desc+=" - development files"
+	depends="boost-devel libime-utils>=${version}_${revision}
+	 libime>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+		vmove "usr/lib/*.so"
+	}
+}

From 41a01deb7a88d7255ed5237240e997f990ccb558 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 18:17:34 +0700
Subject: [PATCH 1482/2024] fcitx-chewing: use shared icons with fcitx5

---
 srcpkgs/fcitx-chewing/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/fcitx-chewing/template b/srcpkgs/fcitx-chewing/template
index 65c99624edfc..8f2c9c4ce432 100644
--- a/srcpkgs/fcitx-chewing/template
+++ b/srcpkgs/fcitx-chewing/template
@@ -1,13 +1,18 @@
 # Template file for 'fcitx-chewing'
 pkgname=fcitx-chewing
 version=0.2.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="fcitx-devel libchewing-devel"
+depends="fcitx5-chewing-icons"
 short_desc="Fcitx wrapper for Chewing IM engine"
 maintainer="Robert Stancil <robert.stancil@mavs.uta.edu>"
 license="GPL-2.0-only"
 homepage="https://www.fcitx-im.org/wiki/Chewing"
 distfiles="https://github.com/fcitx/fcitx-chewing/archive/${version}.tar.gz"
 checksum=ad20eb7b4911cdfb88224f4883d1778253e30180a84898dfcbf8ece36b1182fc
+
+post_install() {
+	rm -rf ${DESTDIR}/usr/share/icons
+}

From 44f10104562478440835cea18ce4ba61fea26a79 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 18:32:12 +0700
Subject: [PATCH 1483/2024] New package: fcitx5-chinese-addons-5.0.5

---
 srcpkgs/fcitx5-chinese-addons-devel           |  1 +
 srcpkgs/fcitx5-chinese-addons-icons           |  1 +
 .../fcitx5-chinese-addons-pinyin-dict-manager |  1 +
 srcpkgs/fcitx5-chinese-addons/template        | 58 +++++++++++++++++++
 4 files changed, 61 insertions(+)
 create mode 120000 srcpkgs/fcitx5-chinese-addons-devel
 create mode 120000 srcpkgs/fcitx5-chinese-addons-icons
 create mode 120000 srcpkgs/fcitx5-chinese-addons-pinyin-dict-manager
 create mode 100644 srcpkgs/fcitx5-chinese-addons/template

diff --git a/srcpkgs/fcitx5-chinese-addons-devel b/srcpkgs/fcitx5-chinese-addons-devel
new file mode 120000
index 000000000000..20d63bef8026
--- /dev/null
+++ b/srcpkgs/fcitx5-chinese-addons-devel
@@ -0,0 +1 @@
+fcitx5-chinese-addons
\ No newline at end of file
diff --git a/srcpkgs/fcitx5-chinese-addons-icons b/srcpkgs/fcitx5-chinese-addons-icons
new file mode 120000
index 000000000000..20d63bef8026
--- /dev/null
+++ b/srcpkgs/fcitx5-chinese-addons-icons
@@ -0,0 +1 @@
+fcitx5-chinese-addons
\ No newline at end of file
diff --git a/srcpkgs/fcitx5-chinese-addons-pinyin-dict-manager b/srcpkgs/fcitx5-chinese-addons-pinyin-dict-manager
new file mode 120000
index 000000000000..20d63bef8026
--- /dev/null
+++ b/srcpkgs/fcitx5-chinese-addons-pinyin-dict-manager
@@ -0,0 +1 @@
+fcitx5-chinese-addons
\ No newline at end of file
diff --git a/srcpkgs/fcitx5-chinese-addons/template b/srcpkgs/fcitx5-chinese-addons/template
new file mode 100644
index 000000000000..a37a025d7af0
--- /dev/null
+++ b/srcpkgs/fcitx5-chinese-addons/template
@@ -0,0 +1,58 @@
+# Template file for 'fcitx5-chinese-addons'
+pkgname=fcitx5-chinese-addons
+version=5.0.5
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config gettext doxygen extra-cmake-modules qt5-qmake
+ qt5-host-tools libime-utils"
+makedepends="libfcitx5-devel fmt-devel opencc-devel fcitx5-lua-devel
+ libcurl-devel qt5-webkit-devel boost-devel libime-devel fcitx5-qt5-devel"
+depends="fcitx5-chinese-addons-icons"
+short_desc="Fcitx5 - Chinese related addon"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="GPL-2.0-or-later, LGPL-2.1-or-later"
+homepage="https://fcitx-im.org/wiki/Fcitx"
+_pytable_version=20121124
+_pystroke_version=20121124
+distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-chinese-addons/fcitx5-chinese-addons-${version}.tar.xz
+ http://download.fcitx-im.org/data/py_table-${_pytable_version}.tar.gz
+ http://download.fcitx-im.org/data/py_stroke-${_pystroke_version}.tar.gz"
+checksum="7917c29643d0bfe489cda2f75201059b8e52cc3c06f86b3059ee0844b33a2048
+ 42146ac97de6c13d55f9e99ed873915f4c66739e9c11532a34556badf9792c04
+ 8eb128a9bfa43952e67cf2fcee1fd134c6f4cfd317bc2f6c38a615f5eb64e248"
+skip_extraction="
+ py_table-${_pytable_version}.tar.gz
+ py_stroke-${_pystroke_version}.tar.gz"
+lib32disabled=yes
+
+post_extract() {
+	local _srcdistdir=${XBPS_SRCDISTDIR}/${pkgname}-${version}
+	local _file
+	for _file in ${skip_extraction}; do
+		cp ${_srcdistdir}/$_file modules/pinyinhelper
+	done
+}
+
+fcitx5-chinese-addons-icons_package() {
+	short_desc+=" - icons"
+	pkg_install() {
+		vmove usr/share/icons
+	}
+}
+
+fcitx5-chinese-addons-pinyin-dict-manager_package() {
+	short_desc+=" - Pinyin Dictionaries Manager"
+	depends="fcitx5-chinese-addons>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/lib/fcitx5/qt5
+	}
+}
+
+fcitx5-chinese-addons-devel_package() {
+	short_desc+=" - development files"
+	depends="fcitx5-chinese-addons>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+	}
+}

From 21e397d421be91efe82ccd86b56b2c9062fdf1f6 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 18:21:50 +0700
Subject: [PATCH 1484/2024] fcitx: use shared icons with fcitx5

---
 srcpkgs/fcitx/template | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fcitx/template b/srcpkgs/fcitx/template
index 8163dee0ca5e..00675b1fedc0 100644
--- a/srcpkgs/fcitx/template
+++ b/srcpkgs/fcitx/template
@@ -1,7 +1,7 @@
 # Template file for 'fcitx'
 pkgname=fcitx
 version=4.2.9.8
-revision=3
+revision=4
 build_style=cmake
 build_helper=gir
 short_desc="Flexible Context-aware Input Tool with eXtension"
@@ -15,6 +15,7 @@ hostmakedepends="pkg-config doxygen extra-cmake-modules glib-devel"
 makedepends="iso-codes gettext-devel enchant-devel libxml2-devel
  json-c-devel opencc-devel
  libxkbfile-devel icu-devel dbus-devel gtk+-devel gtk+3-devel"
+depends="fcitx5-icons fcitx5-chinese-addons-icons"
 lib32disabled=yes
 configure_args="-DCMAKE_BUILD_TYPE=None
  -DSYSCONFDIR=/etc -DFORCE_OPENCC=OFF -DFORCE_PRESAGE=OFF
@@ -54,6 +55,14 @@ pre_build() {
 	LDFLAGS+=" -Wl,--rpath-link=$wrksrc/build/src/lib/fcitx-utils"
 }
 
+post_install() {
+	find $DESTDIR/usr/share/icons -depth \
+		-name 'fcitx-kbd.*' -prune -o \
+		-name 'fcitx-vk-active.*' -prune -o \
+		-name 'fcitx-vk-inactive.*' -prune -o \
+		-type f -delete
+}
+
 libfcitx_package() {
 	short_desc+=" - shared libraries"
 	pkg_install() {
@@ -68,7 +77,7 @@ libfcitx_package() {
 	}
 }
 fcitx-devel_package() {
-	depends="libfcitx-${version}_${revision} glib-devel"
+	depends="libfcitx>=${version}_${revision} glib-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin/fcitx4-config

From d031cea8581d4d83cb061dabbe5603a955bc01a1 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 19:41:51 +0700
Subject: [PATCH 1485/2024] New package: libime-jyutping-1.0.2

---
 common/shlibs                    |  1 +
 srcpkgs/libime-jyutping-devel    |  1 +
 srcpkgs/libime-jyutping-tools    |  1 +
 srcpkgs/libime-jyutping/template | 47 ++++++++++++++++++++++++++++++++
 4 files changed, 50 insertions(+)
 create mode 120000 srcpkgs/libime-jyutping-devel
 create mode 120000 srcpkgs/libime-jyutping-tools
 create mode 100644 srcpkgs/libime-jyutping/template

diff --git a/common/shlibs b/common/shlibs
index 5ad8100d0e4b..508ff0e7f0a8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3108,6 +3108,7 @@ librime.so.1 librime-1.2.9_1
 libIMECore.so.0 libime-1.0.5_1
 libIMEPinyin.so.0 libime-1.0.5_1
 libIMETable.so.0 libime-1.0.5_1
+libIMEJyutping.so.1 libime-jyutping-1.0.2_1
 libairspy.so.0 libairspy-1.0.9_1
 libKF5KDcraw.so.5 libkdcraw5-17.04.3_1
 libKF5Kipi.so.32.0.0 libkipi5-17.04.3_1
diff --git a/srcpkgs/libime-jyutping-devel b/srcpkgs/libime-jyutping-devel
new file mode 120000
index 000000000000..6f00a5aa5460
--- /dev/null
+++ b/srcpkgs/libime-jyutping-devel
@@ -0,0 +1 @@
+libime-jyutping
\ No newline at end of file
diff --git a/srcpkgs/libime-jyutping-tools b/srcpkgs/libime-jyutping-tools
new file mode 120000
index 000000000000..6f00a5aa5460
--- /dev/null
+++ b/srcpkgs/libime-jyutping-tools
@@ -0,0 +1 @@
+libime-jyutping
\ No newline at end of file
diff --git a/srcpkgs/libime-jyutping/template b/srcpkgs/libime-jyutping/template
new file mode 100644
index 000000000000..46a5ad944e88
--- /dev/null
+++ b/srcpkgs/libime-jyutping/template
@@ -0,0 +1,47 @@
+# Template file for 'libime-jyutping'
+pkgname=libime-jyutping
+version=1.0.2
+revision=1
+build_style=cmake
+build_helper=qemu
+hostmakedepends="pkg-config gettext extra-cmake-modules python3 libime-utils"
+makedepends="libfcitx5-devel boost-devel libime-devel
+ fcitx5-chinese-addons-devel fmt-devel"
+short_desc="Libraries for jyutping 粵拼 by libime"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="LGPL-2.1-or-later"
+homepage="https://fcitx-im.org/wiki/Fcitx"
+_dict_version=20180104
+_model_version=20180103
+distfiles="https://download.fcitx-im.org/fcitx5/libime-jyutping/libime-jyutping-${version}.tar.xz
+ https://download.fcitx-im.org/data/jyutping-dict-${_dict_version}.tar.xz
+ https://download.fcitx-im.org/data/jyutping-model-${_model_version}.tar.xz"
+checksum="8e948b4d1a1c1586c7e7c2b61e2d4d3d4e83996a791ef685388bed6f681433b3
+ e3a5b13edb8efa2f764245a3232f99ba7e7670e22b8cbe666a4fffa84b35f35b
+ 4f07229e2080f0ee30ce51b016409f260af82a58dd406a01ea5981b59ca87071"
+skip_extraction="jyutping-dict-${_dict_version}.tar.xz
+ jyutping-model-${_model_version}.tar.xz"
+
+post_extract() {
+	local _srcdistdir=${XBPS_SRCDISTDIR}/${pkgname}-${version}
+	local _file
+	for _file in ${skip_extraction}; do
+		cp ${_srcdistdir}/$_file data
+	done
+}
+
+libime-jyutping-tools_package() {
+	short_desc+=" - tools"
+	pkg_install() {
+		vmove usr/bin
+	}
+}
+
+libime-jyutping-devel_package() {
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+		vmove usr/lib/cmake
+	}
+}

From 75194ec43b8749fb5fc0b9b217cc030884244727 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 20:18:25 +0700
Subject: [PATCH 1486/2024] libpinyin: split libzhuyin

---
 common/shlibs                  |  1 +
 srcpkgs/libpinyin-common       |  1 +
 srcpkgs/libpinyin-common-devel |  1 +
 srcpkgs/libpinyin-utils        |  1 +
 srcpkgs/libpinyin/template     | 58 ++++++++++++++++++++++++++++++----
 srcpkgs/libzhuyin              |  1 +
 srcpkgs/libzhuyin-devel        |  1 +
 7 files changed, 57 insertions(+), 7 deletions(-)
 create mode 120000 srcpkgs/libpinyin-common
 create mode 120000 srcpkgs/libpinyin-common-devel
 create mode 120000 srcpkgs/libpinyin-utils
 create mode 120000 srcpkgs/libzhuyin
 create mode 120000 srcpkgs/libzhuyin-devel

diff --git a/common/shlibs b/common/shlibs
index 508ff0e7f0a8..39ea163292e6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3536,6 +3536,7 @@ 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
+libzhuyin.so.13 libzhuyin-2.6.0_3
 libuhd.so.4.0.0 uhd-4.0.0.0_1
 libeditline.so.1 editline-1.16.0_1
 libgnuradio-rds.so.1 gnuradio-rds-3.8.0_1
diff --git a/srcpkgs/libpinyin-common b/srcpkgs/libpinyin-common
new file mode 120000
index 000000000000..b9910dce3c19
--- /dev/null
+++ b/srcpkgs/libpinyin-common
@@ -0,0 +1 @@
+libpinyin
\ No newline at end of file
diff --git a/srcpkgs/libpinyin-common-devel b/srcpkgs/libpinyin-common-devel
new file mode 120000
index 000000000000..b9910dce3c19
--- /dev/null
+++ b/srcpkgs/libpinyin-common-devel
@@ -0,0 +1 @@
+libpinyin
\ No newline at end of file
diff --git a/srcpkgs/libpinyin-utils b/srcpkgs/libpinyin-utils
new file mode 120000
index 000000000000..b9910dce3c19
--- /dev/null
+++ b/srcpkgs/libpinyin-utils
@@ -0,0 +1 @@
+libpinyin
\ No newline at end of file
diff --git a/srcpkgs/libpinyin/template b/srcpkgs/libpinyin/template
index 7d141b6a086b..31811cac10f6 100644
--- a/srcpkgs/libpinyin/template
+++ b/srcpkgs/libpinyin/template
@@ -1,12 +1,13 @@
 # Template file for 'libpinyin'
 pkgname=libpinyin
 version=2.6.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-libzhuyin"
 hostmakedepends="intltool libtool pkg-config autoconf-archive autoconf automake"
 makedepends="db-devel libglib-devel"
-short_desc="Support library for PinYin and ZhuYin (Bopofomo)"
+depends="libpinyin-common>=${version}_${revision}"
+short_desc="Support library for PinYin"
 maintainer="Ben Sung Hsu <pobetiger+github@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/libpinyin/libpinyin"
@@ -26,13 +27,56 @@ pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
 }
 
+libpinyin-common_package() {
+	short_desc="Common files for libpinyin and libzhuyin"
+	pkg_install() {
+		vmove usr/lib/libpinyin
+	}
+}
+
+libzhuyin_package() {
+	short_desc="${short_desc/PinYin/ZhuYin}"
+	depends="libpinyin-common>=${version}_${revision}"
+	pkg_install() {
+		vmove "usr/lib/libzhuyin.so.*"
+	}
+}
+
+libpinyin-utils_package() {
+	short_desc="Support utilities for libpinyin and libzhuyin"
+	pkg_install() {
+		vmove usr/bin
+		vmove usr/share/man/man1
+	}
+}
+
+libpinyin-common-devel_package() {
+	short_desc="Common files for libpinyin and libzhuyin"
+	pkg_install() {
+		vmove "usr/include/libpinyin-2.6.0/novel*"
+	}
+}
+
 libpinyin-devel_package() {
-	depends="libglib-devel libpinyin-${version}_${revision}"
+	depends="libglib-devel libpinyin-${version}_${revision}
+	 libpinyin-common-devel-${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-		vmove "usr/lib/*.a"
+		vmove "usr/include/libpinyin-2.6.0/pinyin*"
+		vmove usr/lib/pkgconfig/libpinyin.pc
+		vmove "usr/lib/libpinyin.so"
+		vmove "usr/lib/libpinyin.a"
+	}
+}
+
+libzhuyin-devel_package() {
+	depends="libglib-devel libzhuyin-${version}_${revision}
+	 libpinyin-devel-${version}_${revision}"
+	short_desc="${short_desc/PinYin/ZhuYin} - development files"
+	pkg_install() {
+		vmove "usr/include/libpinyin-2.6.0/zhuyin*"
+		vmove usr/lib/pkgconfig/libzhuyin.pc
+		vmove usr/lib/libzhuyin.a
+		vmove usr/lib/libzhuyin.so
 	}
 }
diff --git a/srcpkgs/libzhuyin b/srcpkgs/libzhuyin
new file mode 120000
index 000000000000..b9910dce3c19
--- /dev/null
+++ b/srcpkgs/libzhuyin
@@ -0,0 +1 @@
+libpinyin
\ No newline at end of file
diff --git a/srcpkgs/libzhuyin-devel b/srcpkgs/libzhuyin-devel
new file mode 120000
index 000000000000..b9910dce3c19
--- /dev/null
+++ b/srcpkgs/libzhuyin-devel
@@ -0,0 +1 @@
+libpinyin
\ No newline at end of file

From 5c17ffdb2bc92a1ef1c23fd85b5ce9b97c9baaf4 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 22:34:18 +0700
Subject: [PATCH 1487/2024] New package: fcitx5-zhuyin-5.0.4

---
 srcpkgs/fcitx5-zhuyin/template | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 srcpkgs/fcitx5-zhuyin/template

diff --git a/srcpkgs/fcitx5-zhuyin/template b/srcpkgs/fcitx5-zhuyin/template
new file mode 100644
index 000000000000..4e55fb1bec5d
--- /dev/null
+++ b/srcpkgs/fcitx5-zhuyin/template
@@ -0,0 +1,24 @@
+# Template file for 'fcitx5-zhuyin'
+pkgname=fcitx5-zhuyin
+version=5.0.4
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config gettext doxygen extra-cmake-modules libzhuyin"
+makedepends="libfcitx5-devel fmt-devel opencc-devel fcitx5-lua-devel
+ libzhuyin-devel libpinyin-utils"
+short_desc="Fcitx5 - zhuyin IME"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://fcitx-im.org/wiki/Fcitx"
+_model_version=20161206
+distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-zhuyin/fcitx5-zhuyin-${version}.tar.xz
+ https://download.fcitx-im.org/data/model.text.${_model_version}.tar.gz"
+checksum="3b692408bcbd816fec84c7ad73ec4e4816b686a072eb9d671aaa8be079fc3728
+ 5c7024e5735389c471f54b867eda0d98c5a40a5e5e75333a9febac107508f704"
+skip_extraction="model.text.${_model_version}.tar.gz"
+lib32disabled=yes
+
+post_extract() {
+	local _srcdistdir=${XBPS_SRCDISTDIR}/${pkgname}-${version}
+	cp ${_srcdistdir}/$skip_extraction data
+}

From 9be851be8be70c91bd4f99c12baabd7c54695f6c 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 18:19:17 +0700
Subject: [PATCH 1488/2024] New package: fcitx5-table-extra-5.0.3

---
 srcpkgs/fcitx5-table-extra/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/fcitx5-table-extra/template

diff --git a/srcpkgs/fcitx5-table-extra/template b/srcpkgs/fcitx5-table-extra/template
new file mode 100644
index 000000000000..200b8eec5d5c
--- /dev/null
+++ b/srcpkgs/fcitx5-table-extra/template
@@ -0,0 +1,14 @@
+# Template file for 'fcitx5-table-extra'
+pkgname=fcitx5-table-extra
+version=5.0.3
+revision=1
+build_style=cmake
+hostmakedepends="gettext libime-utils extra-cmake-modules"
+makedepends="libfcitx5-devel libime-devel"
+depends="fcitx5"
+short_desc="Fcitx5 - Boshiamy, Zhengma, Cangjie, and Quick table"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="Public Domain"
+homepage="https://fcitx-im.org/wiki/Fcitx"
+distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-table-extra/fcitx5-table-extra-${version}.tar.xz"
+checksum=2cecbd235623cb803befb3550d5b520f972f5b3ea8044c27d3786e5d59e3fb5d

From 10a6a2d6db08105b76257f1d380b74f75910b355 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 18:31:31 +0700
Subject: [PATCH 1489/2024] New package: fcitx5-table-other-5.0.4

---
 srcpkgs/fcitx5-table-other/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/fcitx5-table-other/template

diff --git a/srcpkgs/fcitx5-table-other/template b/srcpkgs/fcitx5-table-other/template
new file mode 100644
index 000000000000..6ba05d834a23
--- /dev/null
+++ b/srcpkgs/fcitx5-table-other/template
@@ -0,0 +1,14 @@
+# Template file for 'fcitx5-table-other'
+pkgname=fcitx5-table-other
+version=5.0.4
+revision=1
+build_style=cmake
+hostmakedepends="gettext libime-utils extra-cmake-modules"
+makedepends="libfcitx5-devel libime-devel"
+depends="fcitx5"
+short_desc="Fcitx5 - non-Chinese table"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://fcitx-im.org/wiki/Fcitx"
+distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-table-other/fcitx5-table-other-${version}.tar.xz"
+checksum=a0f6747ad78cd5d113cdcb14d56d11579ba1b425741a532a6b904042be176b41

From 408742e6355483a0c2decaa488df0c42cff0e13f 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 18:39:14 +0700
Subject: [PATCH 1490/2024] New package: fcitx5-hangul-5.0.3

---
 srcpkgs/fcitx5-hangul-icons    |  1 +
 srcpkgs/fcitx5-hangul/template | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 120000 srcpkgs/fcitx5-hangul-icons
 create mode 100644 srcpkgs/fcitx5-hangul/template

diff --git a/srcpkgs/fcitx5-hangul-icons b/srcpkgs/fcitx5-hangul-icons
new file mode 120000
index 000000000000..aeca5d0f662c
--- /dev/null
+++ b/srcpkgs/fcitx5-hangul-icons
@@ -0,0 +1 @@
+fcitx5-hangul
\ No newline at end of file
diff --git a/srcpkgs/fcitx5-hangul/template b/srcpkgs/fcitx5-hangul/template
new file mode 100644
index 000000000000..0e8116ae535d
--- /dev/null
+++ b/srcpkgs/fcitx5-hangul/template
@@ -0,0 +1,23 @@
+# Template file for 'fcitx5-hangul'
+pkgname=fcitx5-hangul
+version=5.0.3
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config gettext extra-cmake-modules"
+makedepends="libhangul-devel libfcitx5-devel"
+depends="fcitx5-hangul-icons"
+short_desc="Fcitx5 - Hangul support"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://fcitx-im.org/wiki/Fcitx"
+distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-hangul/fcitx5-hangul-${version}.tar.xz"
+checksum=e02d3d59e22a60e65099eaa0e5e394481a770a401c83b9979f754678c100f1e6
+lib32disabled=yes
+
+fcitx5-hangul-icons_package() {
+	short_desc+=" - icons"
+	conflicts="fcitx-hangul<=0.3.1_1"
+	pkg_install() {
+		vmove usr/share/icons
+	}
+}

From cdda1f59be981f280e0e9f99d2378a5e022a9410 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 18:39:25 +0700
Subject: [PATCH 1491/2024] fcitx-hangul: use shared icons with fcitx5

---
 srcpkgs/fcitx-hangul/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/fcitx-hangul/template b/srcpkgs/fcitx-hangul/template
index 3c65ec6a5f4e..d1b50e2d6237 100644
--- a/srcpkgs/fcitx-hangul/template
+++ b/srcpkgs/fcitx-hangul/template
@@ -1,15 +1,20 @@
 # Template file for 'fcitx-hangul'
 pkgname=fcitx-hangul
 version=0.3.1
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="intltool pkg-config libfcitx"
 makedepends="libhangul-devel fcitx-devel"
-depends="fcitx>=4.2.9"
+depends="fcitx>=4.2.9 fcitx5-hangul-icons"
 short_desc="Hangul (Korean) support for fcitx"
-homepage="https://github.com/fcitx/fcitx-hangul"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
+homepage="https://github.com/fcitx/fcitx-hangul"
 distfiles="https://download.fcitx-im.org/fcitx-hangul/fcitx-hangul-${version}.tar.xz"
 checksum=6dd5fd5956924c85af92ebefaef1e113e38fa814355fbb0f07c26049c3014437
 
 CXXFLAGS='-D_GNU_SOURCE'
+
+post_install() {
+	rm -rf ${DESTDIR}/usr/share/icons
+}

From 30847c70a8c932c1fac6b66f9dd41ddc79e65911 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 18:42:50 +0700
Subject: [PATCH 1492/2024] New package: anthy-unicode-1.0.0.20201109

---
 common/shlibs                  |  3 +++
 srcpkgs/anthy-unicode-devel    |  1 +
 srcpkgs/anthy-unicode/template | 37 ++++++++++++++++++++++++++++++++++
 srcpkgs/libanthy-unicode       |  1 +
 4 files changed, 42 insertions(+)
 create mode 120000 srcpkgs/anthy-unicode-devel
 create mode 100644 srcpkgs/anthy-unicode/template
 create mode 120000 srcpkgs/libanthy-unicode

diff --git a/common/shlibs b/common/shlibs
index 39ea163292e6..966f665424f3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2330,6 +2330,9 @@ liboath.so.0 oath-toolkit-2.6.0_2
 libanthy.so.1 libanthy-0.4_1
 libanthydic.so.1 libanthy-0.4_1
 libanthyinput.so.0 libanthy-0.4_1
+libanthy-unicode.so.0 libanthy-unicode-1.0.0.20201109_1
+libanthydic-unicode.so.0 libanthy-unicode-1.0.0.20201109_1
+libanthyinput-unicode.so.0 libanthy-unicode-1.0.0.20201109_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-unicode-devel b/srcpkgs/anthy-unicode-devel
new file mode 120000
index 000000000000..db3b51372104
--- /dev/null
+++ b/srcpkgs/anthy-unicode-devel
@@ -0,0 +1 @@
+anthy-unicode
\ No newline at end of file
diff --git a/srcpkgs/anthy-unicode/template b/srcpkgs/anthy-unicode/template
new file mode 100644
index 000000000000..f7c4ae32a5bb
--- /dev/null
+++ b/srcpkgs/anthy-unicode/template
@@ -0,0 +1,37 @@
+# Template file for 'anthy-unicode'
+pkgname=anthy-unicode
+version=1.0.0.20201109
+revision=1
+build_style=gnu-configure
+configure_args="--disable-static"
+short_desc="Japanese character set input library for Unicode"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="LGPL-2.0-or-later, GPL-2.0-only, Public Domain"
+homepage="https://github.com/fujiwarat/anthy-unicode/wiki"
+distfiles="https://github.com/fujiwarat/anthy-unicode/releases/download/${version}/${pkgname}-${version}.tar.gz"
+checksum=7d595bd422222bd67d7944f0c29f7d739fe677e4b885de3d4f0dae417b674381
+nocross='execute lt-mkdepgraph'
+
+post_install() {
+	rm ${DESTDIR}/usr/lib/*.la
+}
+
+libanthy-unicode_package() {
+	short_desc+=" - libraries"
+	conf_files="/etc/anthy-unicode.conf"
+	pkg_install() {
+		vmove etc/anthy-unicode.conf
+		vmove "usr/lib/*.so.*"
+		vmove usr/share
+	}
+}
+
+anthy-unicode-devel_package() {
+	short_desc+=" - development files"
+	depends="libanthy-unicode-${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/libanthy-unicode b/srcpkgs/libanthy-unicode
new file mode 120000
index 000000000000..db3b51372104
--- /dev/null
+++ b/srcpkgs/libanthy-unicode
@@ -0,0 +1 @@
+anthy-unicode
\ No newline at end of file

From 11bedfd23f7984770201da024e34411c81e1df83 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 20:03:38 +0700
Subject: [PATCH 1493/2024] New package: fcitx5-anthy-5.0.5

---
 srcpkgs/fcitx5-anthy-icons                    |  1 +
 .../fcitx5-anthy/patches/fix-build-musl.patch | 18 +++++++++++++++
 srcpkgs/fcitx5-anthy/template                 | 23 +++++++++++++++++++
 3 files changed, 42 insertions(+)
 create mode 120000 srcpkgs/fcitx5-anthy-icons
 create mode 100644 srcpkgs/fcitx5-anthy/patches/fix-build-musl.patch
 create mode 100644 srcpkgs/fcitx5-anthy/template

diff --git a/srcpkgs/fcitx5-anthy-icons b/srcpkgs/fcitx5-anthy-icons
new file mode 120000
index 000000000000..6fee45a4d396
--- /dev/null
+++ b/srcpkgs/fcitx5-anthy-icons
@@ -0,0 +1 @@
+fcitx5-anthy
\ No newline at end of file
diff --git a/srcpkgs/fcitx5-anthy/patches/fix-build-musl.patch b/srcpkgs/fcitx5-anthy/patches/fix-build-musl.patch
new file mode 100644
index 000000000000..bc19b7c5c406
--- /dev/null
+++ b/srcpkgs/fcitx5-anthy/patches/fix-build-musl.patch
@@ -0,0 +1,18 @@
+Index: fcitx5-anthy-5.0.4/src/utils.h
+===================================================================
+--- fcitx5-anthy-5.0.4.orig/src/utils.h
++++ fcitx5-anthy-5.0.4/src/utils.h
+@@ -28,11 +28,11 @@ bool key_is_keypad(const fcitx::Key &key
+ std::string keypad_to_string(const fcitx::KeyEvent &key);
+ void launch_program(std::string command);
+ 
+-bool surrounding_get_safe_delta(uint from, uint to, int32_t *delta);
++bool surrounding_get_safe_delta(unsigned from, unsigned to, int32_t *delta);
+ 
+ bool surrounding_get_anchor_pos_from_selection(
+     const std::string &surrounding_text, const std::string &selected_text,
+-    uint cursor_pos, uint *anchor_pos);
++    unsigned cursor_pos, unsigned *anchor_pos);
+ 
+ inline char get_ascii_code(const fcitx::Key &key) {
+     auto chr = fcitx::Key::keySymToUnicode(key.sym());
diff --git a/srcpkgs/fcitx5-anthy/template b/srcpkgs/fcitx5-anthy/template
new file mode 100644
index 000000000000..d0f9ab1d735c
--- /dev/null
+++ b/srcpkgs/fcitx5-anthy/template
@@ -0,0 +1,23 @@
+# Template file for 'fcitx5-anthy'
+pkgname=fcitx5-anthy
+version=5.0.5
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config gettext extra-cmake-modules"
+makedepends="anthy-unicode-devel libfcitx5-devel"
+depends="fcitx5"
+short_desc="Fcitx5 - Anthy engine"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://fcitx-im.org/wiki/Fcitx"
+distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-anthy/fcitx5-anthy-${version}.tar.xz"
+checksum=22364003e737cbe4ea6eaa83d9d274a8df8e38dea61d8f4576560ee7d5eaf44d
+patch_args=-Np1
+
+fcitx5-anthy-icons_package() {
+	short_desc+=" - icons"
+	conflicts="fcitx-anthy<=0.2.3_2"
+	pkg_install() {
+		vmove usr/share/icons
+	}
+}

From a01ab1f660e6a921c338f847506d4ef0210c0140 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 20:03:31 +0700
Subject: [PATCH 1494/2024] fcitx-anthy: update to 0.2.4.

---
 srcpkgs/fcitx-anthy/template | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/fcitx-anthy/template b/srcpkgs/fcitx-anthy/template
index d03499e83c3e..02150ea5ca5d 100644
--- a/srcpkgs/fcitx-anthy/template
+++ b/srcpkgs/fcitx-anthy/template
@@ -1,15 +1,20 @@
 # Template file for 'fcitx-anthy'
 pkgname=fcitx-anthy
-version=0.2.3
-revision=2
+version=0.2.4
+revision=1
 build_style=cmake
+hostmakedepends="pkg-config"
 makedepends="anthy-devel fcitx-devel"
-depends="fcitx>=4.2.9"
+depends="fcitx>=4.2.9 fcitx5-anthy-icons"
 short_desc="Fcitx wrapper for Anthy IM engine"
 maintainer="Matthias von Faber <mvf@gmx.eu>"
 license="GPL-2.0-or-later"
 homepage="https://fcitx-im.org/"
 distfiles="https://github.com/fcitx/fcitx-anthy/archive/${version}.tar.gz"
-checksum=31826a49a7ff743f830e1279527301abce9e669bc176934c76775999299421a8
+checksum=dcb561138508757f37da8a85bdf296368b592649b15ab76e8706db47cc25402a
 
 CXXFLAGS='-D_GNU_SOURCE'
+
+post_install() {
+	rm -rf ${DESTDIR}/usr/share/icons
+}

From 8d8403a62199210496a53f8ff5cc157cef6f6b4c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 21 Apr 2021 11:45:43 +0200
Subject: [PATCH 1495/2024] python3-pyinfra: update to 1.3.11.

---
 srcpkgs/python3-pyinfra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pyinfra/template b/srcpkgs/python3-pyinfra/template
index 4365f04a3880..e14fcad29d7b 100644
--- a/srcpkgs/python3-pyinfra/template
+++ b/srcpkgs/python3-pyinfra/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyinfra'
 pkgname=python3-pyinfra
-version=1.3.10
+version=1.3.11
 revision=1
 wrksrc="pyinfra-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://pyinfra.com/"
 distfiles="https://github.com/Fizzadar/pyinfra/archive/v${version}.tar.gz"
-checksum=2369ba8298c31882b36475376732e4e978f866eff7b018cbe5357084e32450a7
+checksum=415977585103aa42bfb1aeb9f627bd19d270d5deb4cb4a516b1d5cc445631388
 
 post_extract() {
 	vsed -i -e '/configparser/d' setup.py  # is in Python 3.8

From abc7eba5e387f861a679cccc32b9d23fd21a84d6 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, 17 Apr 2021 19:22:17 +0700
Subject: [PATCH 1496/2024] tmux: update to 3.2.

---
 srcpkgs/tmux/patches/reallocarray.patch | 25 +++++++++++++++++++++++++
 srcpkgs/tmux/template                   | 13 +++++++++----
 2 files changed, 34 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/tmux/patches/reallocarray.patch

diff --git a/srcpkgs/tmux/patches/reallocarray.patch b/srcpkgs/tmux/patches/reallocarray.patch
new file mode 100644
index 000000000000..ca96defd3083
--- /dev/null
+++ b/srcpkgs/tmux/patches/reallocarray.patch
@@ -0,0 +1,25 @@
+Index: tmux-3.2/configure.ac
+===================================================================
+--- tmux-3.2.orig/configure.ac
++++ tmux-3.2/configure.ac
+@@ -158,18 +158,12 @@ AC_FUNC_STRNLEN
+ # system. When compiled it always returns NULL and crashes the program. To
+ # detect this we need a more complicated test.
+ AC_MSG_CHECKING([for working reallocarray])
+-AC_RUN_IFELSE([AC_LANG_PROGRAM(
+-		[#include <stdlib.h>],
+-		[return (reallocarray(NULL, 1, 1) == NULL);]
+-	)],
++AC_CHECK_FUNC(reallocarray,
+ 	AC_MSG_RESULT(yes),
+ 	[AC_LIBOBJ(reallocarray) AC_MSG_RESULT([no])]
+ )
+ AC_MSG_CHECKING([for working recallocarray])
+-AC_RUN_IFELSE([AC_LANG_PROGRAM(
+-		[#include <stdlib.h>],
+-		[return (recallocarray(NULL, 1, 1, 1) == NULL);]
+-	)],
++AC_CHECK_FUNC(recallocarray,
+ 	AC_MSG_RESULT(yes),
+ 	[AC_LIBOBJ(recallocarray) AC_MSG_RESULT([no])]
+ )
diff --git a/srcpkgs/tmux/template b/srcpkgs/tmux/template
index df8e84bb4abb..b0f2178d49ec 100644
--- a/srcpkgs/tmux/template
+++ b/srcpkgs/tmux/template
@@ -1,9 +1,9 @@
 # Template file for 'tmux'
 pkgname=tmux
-version=3.1c
-revision=2
+version=3.2
+revision=1
 build_style=gnu-configure
-hostmakedepends="byacc"
+hostmakedepends="byacc automake pkg-config"
 makedepends="libevent-devel ncurses-devel"
 depends="ncurses-base"
 short_desc="Terminal Multiplexer"
@@ -12,7 +12,12 @@ license="ISC"
 homepage="https://tmux.github.io"
 changelog="https://raw.githubusercontent.com/tmux/tmux/master/CHANGES"
 distfiles="https://github.com/tmux/tmux/releases/download/${version}/tmux-${version}.tar.gz"
-checksum=918f7220447bef33a1902d4faff05317afd9db4ae1c9971bef5c787ac6c88386
+checksum=664d345338c11cbe429d7ff939b92a5191e231a7c1ef42f381cebacb1e08a399
+patch_args=-Np1
+
+pre_configure() {
+	autoreconf -fi
+}
 
 post_install() {
 	vlicense COPYING

From 69e98d24c641b22fc5f9b2b9dd0cb125771e5916 Mon Sep 17 00:00:00 2001
From: Gadzhi Kharkharov <me@kkga.me>
Date: Tue, 20 Apr 2021 19:18:50 +0300
Subject: [PATCH 1497/2024] kitty: update to 0.20.1.

Close: #30393
---
 ...ui_text-use-uint8_t-instead-of-u_int.patch | 28 +++++++++++++++++++
 srcpkgs/kitty/template                        |  4 +--
 2 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/kitty/patches/0001-freetype_render_ui_text-use-uint8_t-instead-of-u_int.patch

diff --git a/srcpkgs/kitty/patches/0001-freetype_render_ui_text-use-uint8_t-instead-of-u_int.patch b/srcpkgs/kitty/patches/0001-freetype_render_ui_text-use-uint8_t-instead-of-u_int.patch
new file mode 100644
index 000000000000..7771e8857cb9
--- /dev/null
+++ b/srcpkgs/kitty/patches/0001-freetype_render_ui_text-use-uint8_t-instead-of-u_int.patch
@@ -0,0 +1,28 @@
+From 1b760b6c5393b2137410f539d068a84bae1c31ff 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, 21 Apr 2021 19:23:43 +0700
+Subject: [PATCH] freetype_render_ui_text: use uint8_t instead of u_int8_t
+
+uint8_t is a standard type, while u_int8_t isn't. And we're assigning to
+an uint8_t anyway.
+---
+ kitty/freetype_render_ui_text.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/kitty/freetype_render_ui_text.c b/kitty/freetype_render_ui_text.c
+index 8c8743b8..f22284f4 100644
+--- a/kitty/freetype_render_ui_text.c
++++ b/kitty/freetype_render_ui_text.c
+@@ -504,7 +504,7 @@ render_line(PyObject *self UNUSED, PyObject *args, PyObject *kw) {
+     if (!PyArg_ParseTupleAndKeywords(args, kw, "|sIIzppkkffI", (char**)kwlist, &text, &width, &height, &family, &bold, &italic, &fg, &bg, &x_offset, &y_offset, &right_margin)) return NULL;
+     PyObject *ans = PyBytes_FromStringAndSize(NULL, (Py_ssize_t)width * height * 4);
+     if (!ans) return NULL;
+-    uint8_t *buffer = (u_int8_t*) PyBytes_AS_STRING(ans);
++    uint8_t *buffer = (uint8_t*) PyBytes_AS_STRING(ans);
+     RenderCtx *ctx = (RenderCtx*)create_freetype_render_context(family, bold, italic);
+     if (!ctx) return NULL;
+     if (!render_single_line((FreeTypeRenderCtx)ctx, text, 3 * height / 4, 0, 0xffffffff, buffer, width, height, x_offset, y_offset, right_margin)) {
+-- 
+2.31.1.500.gbc6bbdd36b
+
diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index 0b1d93b39114..5a8dcc8b4fb8 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,6 +1,6 @@
 # Template file for 'kitty'
 pkgname=kitty
-version=0.19.3
+version=0.20.1
 revision=1
 pycompile_dirs="usr/lib/kitty"
 hostmakedepends="pkg-config python3 wayland-devel wayland-protocols"
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://sw.kovidgoyal.net/kitty/"
 changelog="https://sw.kovidgoyal.net/kitty/changelog.html"
 distfiles="https://github.com/kovidgoyal/kitty/releases/download/v${version}/kitty-${version}.tar.xz"
-checksum=16d843356b0697db2b71754b4afd8d43166a0f0561e606107f6a4b9519624e4f
+checksum=43596a1c5645fe476e96e748bb3b44afd680d84b4af409cd36b33de19b31933d
 patch_args="-Np1"
 python_version=3
 LDFLAGS+=" -Wl,-z,stack-size=2097152"

From 8b3eafb8606b79d58af2cd2ed257071a96e3631d Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 21 Apr 2021 08:23:08 -0500
Subject: [PATCH 1498/2024] libxlsxwriter: update to 1.0.3.

---
 srcpkgs/libxlsxwriter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libxlsxwriter/template b/srcpkgs/libxlsxwriter/template
index 64f63ec17788..9aba68731ef3 100644
--- a/srcpkgs/libxlsxwriter/template
+++ b/srcpkgs/libxlsxwriter/template
@@ -1,6 +1,6 @@
 # Template file for 'libxlsxwriter'
 pkgname=libxlsxwriter
-version=1.0.2
+version=1.0.3
 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=94a99e5d3121a9591bbbe966c581d0c30bf30e4e5be762b6e3066c25fd066092
+checksum=ff373664af1fc3821f934a05275d668f3f0e20663fddebeaa89fcb9a9d52b80d
 
 pre_configure() {
 	sed -i "/^add_library/a set_target_properties(\${PROJECT_NAME}	\

From 1d80677c8ad0e264ecac1fb5c72dfdb35fd72ead Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 21 Apr 2021 15:37:45 +0200
Subject: [PATCH 1499/2024] linux5.10: update to 5.10.32.

---
 srcpkgs/linux5.10/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index b6ff312d238c..3e9bffd46915 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.31
+version=5.10.32
 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=54eef1a4d29a2582281375e028ac73c2c5d90dfa21500fa8c3b00e529a2b510d
+checksum=644f8e326e4cb8eac65f0874774c09ccf91cbe0b55eb8438c1e8711d3d07d7ba
 python_version=3
 patch_args="-Np1"
 

From 445a11777aaeef1a8021100829acab75950977c8 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 21 Apr 2021 17:48:44 +0200
Subject: [PATCH 1500/2024] virt-viewer: update to 10.0.

---
 srcpkgs/virt-viewer/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/virt-viewer/template b/srcpkgs/virt-viewer/template
index 87e8e69c0322..c7227bfc8cb5 100644
--- a/srcpkgs/virt-viewer/template
+++ b/srcpkgs/virt-viewer/template
@@ -1,14 +1,14 @@
 # Template file for 'virt-viewer'
 pkgname=virt-viewer
-version=9.0
+version=10.0
 revision=1
-build_style=gnu-configure
-configure_args="--disable-update-mimedb"
+build_style=meson
 hostmakedepends="glib-devel intltool pkg-config"
 makedepends="gtk-vnc-devel libvirt-glib-devel spice-gtk-devel vte3-devel"
 short_desc="Tool for displaying the graphical console of a virtual machine"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://virt-manager.org/"
-distfiles="http://virt-manager.org/download/sources/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=91b43383a0bd4cf3173269e674d65fd205f7c34bc5a8cb4fb3640deb7f1d4825
+changelog="https://gitlab.com/virt-viewer/virt-viewer/-/raw/master/NEWS"
+distfiles="http://virt-manager.org/download/sources/${pkgname}/${pkgname}-${version}.tar.xz"
+checksum=d23bc0a06e4027c37b8386cfd0286ef37bd738977153740ab1b6b331192389c5

From 489260fee4096d63c7d496edbb08a6810d46c5f8 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 21 Apr 2021 17:55:24 +0200
Subject: [PATCH 1501/2024] poke: update to 1.2.

---
 srcpkgs/poke/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/poke/template b/srcpkgs/poke/template
index 19d0e01b41df..37aadeeb51ec 100644
--- a/srcpkgs/poke/template
+++ b/srcpkgs/poke/template
@@ -1,6 +1,6 @@
 # Template file for 'poke'
 pkgname=poke
-version=1.1
+version=1.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,8 +10,9 @@ short_desc="Extensible editor for structured binary data"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.jemarch.net/poke.html"
+changelog="http://www.jemarch.net/poke-${version}-relnotes.html"
 distfiles="${GNU_SITE}/poke/poke-${version}.tar.gz"
-checksum=cd68df63c741b4160b12cbea02f27c47158279466e3443930d2535a452c06ad6
+checksum=f61cf8da5b64c01a1359373725aad1ca257f35c1c9269e4d50dd0664183ddf62
 
 poke-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 4d9fdc3d47807e666ac612715ec3f8247a92e560 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 21 Apr 2021 17:59:01 +0200
Subject: [PATCH 1502/2024] openradtool: update to 0.12.7.

---
 srcpkgs/openradtool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openradtool/template b/srcpkgs/openradtool/template
index a04b3e7ec1a7..3ded299505d0 100644
--- a/srcpkgs/openradtool/template
+++ b/srcpkgs/openradtool/template
@@ -1,6 +1,6 @@
 # Template file for 'openradtool'
 pkgname=openradtool
-version=0.12.6
+version=0.12.7
 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=fec033245ad9371292f92eb87fce77e3e1d6b67ca131dcd181d36dc8df201023
+checksum=366657ecd0b417ba1293a946ec05f7372d561aac7d2566504809608fdf5f6baa
 
 post_install() {
 	sed -n '2,16p' main.c >LICENSE

From fd8b7e7377fceee306f326e13a11d0c7f43a1591 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Wed, 21 Apr 2021 17:22:33 +0200
Subject: [PATCH 1503/2024] croc: update to 9.1.0.

---
 srcpkgs/croc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template
index 47e8934f081a..41a1fae5b322 100644
--- a/srcpkgs/croc/template
+++ b/srcpkgs/croc/template
@@ -1,6 +1,6 @@
 # Template file for 'croc'
 pkgname=croc
-version=8.6.12
+version=9.1.0
 revision=1
 build_style=go
 go_import_path=github.com/schollz/croc/v${version%%.*}
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"
 homepage="https://github.com/schollz/croc"
 distfiles="https://github.com/schollz/croc/archive/v${version}.tar.gz"
-checksum=8596a70226437178cd87f271d6ad275d6ba391917b1a09c429bc9dc65f446ed4
+checksum=7a126933258f197edde16adfa2bfb6623021b6007bc9803cd7128830048fff90
 
 post_install() {
 	vlicense LICENSE

From 1e43287df261b4e1a992018560bc558dbc368b3d Mon Sep 17 00:00:00 2001
From: Isaac Freund <ifreund@ifreund.xyz>
Date: Wed, 21 Apr 2021 13:20:15 +0200
Subject: [PATCH 1504/2024] fuzzel: update to 1.5.3.

---
 srcpkgs/fuzzel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fuzzel/template b/srcpkgs/fuzzel/template
index 84ea6b87c339..879bead182bc 100644
--- a/srcpkgs/fuzzel/template
+++ b/srcpkgs/fuzzel/template
@@ -1,6 +1,6 @@
 # Template file for 'fuzzel'
 pkgname=fuzzel
-version=1.5.1
+version=1.5.3
 revision=1
 wrksrc="$pkgname"
 build_style=meson
@@ -12,7 +12,7 @@ maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fuzzel"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=8a7394a32664638c91e865d63cf5d5a34d8caf4594854ed4867afae1a6f38eb7
+checksum=55ae113d278196241dc699fb6fc558ff20d7b6323048b53dbf343fd3b2be8a49
 
 post_install() {
 	rm "${PKGDESTDIR}/usr/share/doc/${pkgname}/LICENSE"

From 403fc0f1e963af14b5491097f3b59226dd12b88b Mon Sep 17 00:00:00 2001
From: Yuriy Chumak <yuriy.chumak@mail.com>
Date: Wed, 21 Apr 2021 10:02:17 +0300
Subject: [PATCH 1505/2024] ol: update to 2.2.

---
 srcpkgs/ol/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ol/template b/srcpkgs/ol/template
index 1b158b6953b4..82a12e4db0ad 100644
--- a/srcpkgs/ol/template
+++ b/srcpkgs/ol/template
@@ -1,6 +1,6 @@
 # Template file for 'ol'
 pkgname=ol
-version=2.1.1
+version=2.2
 revision=1
 build_style=gnu-makefile
 hostmakedepends="xxd"
@@ -9,7 +9,7 @@ maintainer="rc-05 <rc23@email.it>"
 license="LGPL-3.0-or-later, MIT"
 homepage="https://yuriy-chumak.github.io/ol/"
 distfiles="https://github.com/yuriy-chumak/ol/archive/${version}.tar.gz"
-checksum=ac3fa5e1d7f0fb5ad236c293915000ecfaaadbf1fb0812cbe60609112993b718
+checksum=a16447849508bf39c24611b35277399531e4ceedb5ee5d4e31828d569fca8e04
 
 CFLAGS="-lm"
 

From 04d2ae2badeeec1ac058aab5a325235f9fef907b Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Wed, 21 Apr 2021 11:08:52 +0200
Subject: [PATCH 1506/2024] volta: update to 1.0.4

---
 srcpkgs/volta/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/volta/template b/srcpkgs/volta/template
index 7f82c979afaa..7d176b47ade4 100644
--- a/srcpkgs/volta/template
+++ b/srcpkgs/volta/template
@@ -1,7 +1,7 @@
 # Template file for 'volta'
 pkgname=volta
-version=1.0.3
-revision=2
+version=1.0.4
+revision=1
 archs="x86_64" # Due to volta pulling pre-built binaries later. Evil.
 build_style="cargo"
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ maintainer="Alex Lohr <alex.lohr@logmein.com>"
 license="BSD-2-Clause"
 homepage="https://volta.sh/"
 distfiles="https://github.com/volta-cli/volta/archive/v${version}.tar.gz"
-checksum=19edec309676d5d345e0686cc3ea2cd0a5815f01a12e88e5b7c63a7ce961c6d1
+checksum=e61cdb81e7cd776b1285b34dd715e246de5072c1a50f65b2394b6b605f044f4c
 
 post_install() {
 	vlicense LICENSE

From c8afd133b156004736e2648e5d822ff043c927f1 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Wed, 21 Apr 2021 10:04:42 +0200
Subject: [PATCH 1507/2024] google-chrome: update to 90.0.4430.85

---
 srcpkgs/google-chrome/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template
index fce43ada5c6d..9705611f5cb1 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,5 +1,5 @@
 # Template file for 'google-chrome'
-_chromeVersion=90.0.4430.72
+_chromeVersion=90.0.4430.85
 _chromeRevision=1
 _channel=stable
 
@@ -22,7 +22,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=43f141970ab61d9c5a993dcf094625d9a7a1d24212a3c2443e7092b40c3a354c
+checksum=39de976ede3d759fd696e59bd7ac3447093ab67b65972a41caa557edbee12952
 
 do_extract() {
 	mkdir -p ${DESTDIR}

From af47de98acdfa5fff9df398f607802f224ce7ef2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 19 Apr 2021 11:37:21 +0200
Subject: [PATCH 1508/2024] openssh: update to 8.6p1.

---
 srcpkgs/openssh/patches/libressl.patch | 26 --------------------------
 srcpkgs/openssh/template               |  4 ++--
 2 files changed, 2 insertions(+), 28 deletions(-)
 delete mode 100644 srcpkgs/openssh/patches/libressl.patch

diff --git a/srcpkgs/openssh/patches/libressl.patch b/srcpkgs/openssh/patches/libressl.patch
deleted file mode 100644
index a114d7bb31dd..000000000000
--- a/srcpkgs/openssh/patches/libressl.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- openbsd-compat/openbsd-compat.h.orig
-+++ openbsd-compat/openbsd-compat.h
-@@ -201,22 +201,18 @@
- int getpeereid(int , uid_t *, gid_t *);
- #endif
- 
-+unsigned int arc4random(void);
- #ifdef HAVE_ARC4RANDOM
- # ifndef HAVE_ARC4RANDOM_STIR
- #  define arc4random_stir()
- # endif
- #else
--unsigned int arc4random(void);
- void arc4random_stir(void);
- #endif /* !HAVE_ARC4RANDOM */
- 
--#ifndef HAVE_ARC4RANDOM_BUF
- void arc4random_buf(void *, size_t);
--#endif
- 
--#ifndef HAVE_ARC4RANDOM_UNIFORM
- u_int32_t arc4random_uniform(u_int32_t);
--#endif
- 
- #ifndef HAVE_ASPRINTF
- int asprintf(char **, const char *, ...);
diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 49b949304096..95c8b31073b3 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,6 +1,6 @@
 # Template file for 'openssh'
 pkgname=openssh
-version=8.5p1
+version=8.6p1
 revision=1
 build_style=gnu-configure
 configure_args="--datadir=/usr/share/openssh
@@ -23,7 +23,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause, ISC"
 homepage="https://www.openssh.com"
 distfiles="https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${version}.tar.gz"
-checksum=f52f3f41d429aa9918e38cf200af225ccdd8e66f052da572870c89737646ec25
+checksum=c3e6e4da1621762c850d03b47eed1e48dff4cc9608ddeb547202a234df8ed7ae
 conf_files="/etc/ssh/moduli /etc/ssh/ssh_config /etc/ssh/sshd_config /etc/pam.d/sshd"
 make_dirs="/var/chroot/ssh 0755 root root"
 

From 6dd3e10fc32026adb8bbf3fbfcfa02dc2bd6481a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 19 Apr 2021 11:39:31 +0200
Subject: [PATCH 1509/2024] gnome-ssh-askpass: update to 8.6p1.

---
 srcpkgs/gnome-ssh-askpass/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-ssh-askpass/template b/srcpkgs/gnome-ssh-askpass/template
index 43764cc51520..b12f91338bf8 100644
--- a/srcpkgs/gnome-ssh-askpass/template
+++ b/srcpkgs/gnome-ssh-askpass/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-ssh-askpass'
 pkgname=gnome-ssh-askpass
-version=8.5p1
+version=8.6p1
 revision=1
 wrksrc="openssh-${version}"
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause, BSD-2-Clause"
 homepage="http://www.openssh.org"
 distfiles="https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${version}.tar.gz"
-checksum=f52f3f41d429aa9918e38cf200af225ccdd8e66f052da572870c89737646ec25
+checksum=c3e6e4da1621762c850d03b47eed1e48dff4cc9608ddeb547202a234df8ed7ae
 
 alternatives="
  ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/gnome-ssh-askpass

From e6ff20c95774cf9bc7401b9f0d2c24cf70eb76c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Wed, 21 Apr 2021 07:09:59 +0200
Subject: [PATCH 1510/2024] nushell: update to 0.30.0.

---
 srcpkgs/nushell/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nushell/template b/srcpkgs/nushell/template
index 49a1ea9527ff..a3bca1ba4452 100644
--- a/srcpkgs/nushell/template
+++ b/srcpkgs/nushell/template
@@ -1,6 +1,6 @@
 # Template file for 'nushell'
 pkgname=nushell
-version=0.29.0
+version=0.30.0
 revision=1
 build_style=cargo
 configure_args="--features=extra"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://www.nushell.sh/"
 changelog="https://www.nushell.sh/blog/"
 distfiles="https://github.com/nushell/nushell/archive/${version}.tar.gz"
-checksum=1572c5e48c7b460e1693eb4dd153902cfff9b5069abd05297b79563e6ffbf9f1
+checksum=a36cd3d93c69aab83c874fe0c8b653ce9fe188da9f527d3bb28492ba213e579a
 register_shell="/usr/bin/nu"
 # all tests fail with argument --target
 make_check=no

From 4ecb895805c1132409092ffadfcdc1dd7a162ae9 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Sun, 18 Apr 2021 19:55:56 +0200
Subject: [PATCH 1511/2024] revive: update to 1.0.6.

---
 srcpkgs/revive/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/revive/template b/srcpkgs/revive/template
index faffa9f252da..95f294945fe5 100644
--- a/srcpkgs/revive/template
+++ b/srcpkgs/revive/template
@@ -1,15 +1,16 @@
 # Template file for 'revive'
 pkgname=revive
-version=1.0.5
+version=1.0.6
 revision=1
 build_style=go
+go_ldflags="-X main.version=$version -X main.builtBy=xbps"
 go_import_path="github.com/mgechev/revive"
 short_desc="Drop-in replacement for golint"
 maintainer="Paper <paper@tilde.institute>"
 license="MIT"
 homepage="https://revive.run/"
 distfiles="https://github.com/mgechev/revive/archive/v$version.tar.gz"
-checksum=9569e25a889dc546bead5ee8616002799ae13fd50860f51388ad2e3d3e55ceaa
+checksum=6b504886cf3577329beb7a593b8037601350eed011d64da269ad476f6bfdb35b
 
 do_check() {
 	go test -v ./...

From f980dcdaa17fd648c7791fb122715f239b505e0e Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Sun, 18 Apr 2021 19:55:53 +0200
Subject: [PATCH 1512/2024] libhandy1: update to 1.2.1, build docs

---
 srcpkgs/libhandy1/template | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/libhandy1/template b/srcpkgs/libhandy1/template
index 1d8f409f5ff3..c8298f8f629c 100644
--- a/srcpkgs/libhandy1/template
+++ b/srcpkgs/libhandy1/template
@@ -1,14 +1,14 @@
 # Template file for 'libhandy1'
 pkgname=libhandy1
-version=1.2.0
+version=1.2.1
 revision=1
 wrksrc="libhandy-${version}"
 build_style=meson
 build_helper="gir"
-configure_args="-Dexamples=true -Dtests=true
+configure_args="-Dexamples=true -Dtests=true $(vopt_bool gtk_doc gtk_doc)
  $(vopt_bool gir vapi) -Dglade_catalog=$(vopt_if glade enabled disabled)
  -Dintrospection=$(vopt_if gir enabled disabled)"
-hostmakedepends="glib-devel pkg-config $(vopt_if gir vala-devel)"
+hostmakedepends="glib-devel pkg-config $(vopt_if gtk_doc gtk-doc) $(vopt_if gir vala-devel)"
 makedepends="gtk+3-devel libglib-devel $(vopt_if glade glade3-devel)"
 checkdepends="xvfb-run"
 short_desc="GTK+3 building blocks for modern adaptive applications"
@@ -16,12 +16,16 @@ maintainer="Paper <paper@tilde.institute>"
 license="LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libhandy/"
 distfiles="${GNOME_SITE}/libhandy/${version%.*}/libhandy-${version}.tar.xz"
-checksum=39f590ae20910e76fe1c0607b2ebe589750f45610d6aeec5c30e2ee602a20b25
+checksum=411b4c6a4d5f9ed5e46594b4abb04c54af294e3242cf364942029f5e0b6f510b
 
-build_options="gir glade"
+build_options="gir glade gtk_doc"
 desc_option_glade="Generate glade modules and catalog files"
 build_options_default="gir glade"
 
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default+=" gtk_doc"
+fi
+
 do_check() {
 	xvfb-run ninja -C build test
 }
@@ -41,6 +45,9 @@ libhandy1-devel_package() {
 			vmove usr/share/gir-1.0
 			vmove usr/share/vala
 		fi
+		if [ "$build_option_gtk_doc" ]; then
+			vmove usr/share/gtk-doc
+		fi
 	}
 }
 

From c69a7b51f679600be916f72b04106d3b232c3d2e Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Wed, 21 Apr 2021 00:52:47 +0300
Subject: [PATCH 1513/2024] github-cli: update to 1.9.2

---
 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 4367b10b5733..e693c09d01d5 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.9.1
+version=1.9.2
 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=5fd35b156a0528ad4e8b68c7058fccf340cca08b0cabd36d872ab855476fb02e
+checksum=a1d5a326c9311f8d208a0e5b5ba47023c3982494063e34ea10da916f9b8ba5c3
 
 pre_build() {
 	local _date

From e44d323054f7af881d771270d0f0470a4dd3bbbb Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Sun, 18 Apr 2021 19:56:02 +0200
Subject: [PATCH 1514/2024] lagrange: update to 1.3.3.

---
 srcpkgs/lagrange/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
index 8cd5cf544086..cb74a353bfe0 100644
--- a/srcpkgs/lagrange/template
+++ b/srcpkgs/lagrange/template
@@ -1,6 +1,6 @@
 # Template file for 'lagrange'
 pkgname=lagrange
-version=1.3.0
+version=1.3.3
 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=5737ae2d16779e8a0f1cb27b18a22ebba7dffb5e11f1d189c27441bed11b08e0
+checksum=c471c8bbf57aa242c5d23be727f846b87bca42b1eab977862deb9b5f9172eaa5
 
 post_install() {
 	vlicense LICENSE.md

From 87ab139201b26970d8045797cf9e54a4557285ca Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 20 Apr 2021 23:16:51 +0300
Subject: [PATCH 1515/2024] notcurses: update to 2.2.8.

---
 .../patches/restore-lost-symbol.patch         | 66 -------------------
 srcpkgs/notcurses/template                    |  6 +-
 2 files changed, 3 insertions(+), 69 deletions(-)
 delete mode 100644 srcpkgs/notcurses/patches/restore-lost-symbol.patch

diff --git a/srcpkgs/notcurses/patches/restore-lost-symbol.patch b/srcpkgs/notcurses/patches/restore-lost-symbol.patch
deleted file mode 100644
index b938a35ed30e..000000000000
--- a/srcpkgs/notcurses/patches/restore-lost-symbol.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From da2a897544b9d239515b85ed31c8db4d90d23883 Mon Sep 17 00:00:00 2001
-From: nick black <dankamongmen@gmail.com>
-Date: Wed, 14 Apr 2021 10:04:28 -0400
-Subject: [PATCH] fix unintended cell abi breakage #1532
-
-cell_release() and cell_duplicate() were deprecated in 2.2.6,
-but replaced with static inlines. this breaks the abi, forcing
-recompiles from client programs. restore them as exported
-functions.
----
- include/notcurses/notcurses.h | 10 ++--------
- src/lib/render.c              |  9 +++++++++
- 2 files changed, 11 insertions(+), 8 deletions(-)
-
-diff --git a/include/notcurses/notcurses.h b/include/notcurses/notcurses.h
-index aece8cb6d..9d98ea19f 100644
---- a/include/notcurses/notcurses.h
-+++ b/include/notcurses/notcurses.h
-@@ -677,18 +677,12 @@ cell_prime(struct ncplane* n, nccell* c, const char* gcluster,
- // failure, and 0 on success.
- API int nccell_duplicate(struct ncplane* n, nccell* targ, const nccell* c);
- 
--__attribute__ ((deprecated)) static inline int
--cell_duplicate(struct ncplane* n, nccell* targ, const nccell* c){
--  return nccell_duplicate(n, targ, c);
--}
-+__attribute__ ((deprecated)) API int cell_duplicate(struct ncplane* n, nccell* targ, const nccell* c);
- 
- // Release resources held by the nccell 'c'.
- API void nccell_release(struct ncplane* n, nccell* c);
- 
--__attribute__ ((deprecated)) static inline void
--cell_release(struct ncplane* n, nccell* c){
--  nccell_release(n, c);
--}
-+__attribute__ ((deprecated)) API void cell_release(struct ncplane* n, nccell* c);
- 
- #define NCSTYLE_MASK      0x03ffu
- #define NCSTYLE_STANDOUT  0x0080u
-diff --git a/src/lib/render.c b/src/lib/render.c
-index ad95cd878..e1334416f 100644
---- a/src/lib/render.c
-+++ b/src/lib/render.c
-@@ -175,6 +175,11 @@ void nccell_release(ncplane* n, nccell* c){
-   pool_release(&n->pool, c);
- }
- 
-+// FIXME deprecated, goes away in abi3
-+void cell_release(ncplane* n, nccell* c){
-+  nccell_release(n, c);
-+}
-+
- // Duplicate one cell onto another when they share a plane. Convenience wrapper.
- int nccell_duplicate(ncplane* n, nccell* targ, const nccell* c){
-   if(cell_duplicate_far(&n->pool, targ, n, c) < 0){
-@@ -184,6 +189,10 @@ int nccell_duplicate(ncplane* n, nccell* targ, const nccell* c){
-   return 0;
- }
- 
-+int cell_duplicate(struct ncplane* n, nccell* targ, const nccell* c){
-+  return nccell_duplicate(n, targ, c);
-+}
-+
- // Emit fchannel with RGB changed to contrast effectively against bchannel.
- static uint32_t
- highcontrast(uint32_t bchannel){
diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index f2bc3e9ae1bd..eaa93ff2c60f 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,7 +1,7 @@
 # Template file for 'notcurses'
 pkgname=notcurses
-version=2.2.6
-revision=2
+version=2.2.8
+revision=1
 build_style=cmake
 configure_args="-DUSE_STATIC=ON $(vopt_bool man USE_PANDOC)"
 hostmakedepends="pkg-config $(vopt_if man 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=0507e507f9843a494aa66f31e419add5fbdbceb8fbc9345f3e6d4b55ed8a89d9
+checksum=dc744f6a11bf8ca81dc8a73f56c4d9021cf4d56ef89a9a658974dff7984df376
 patch_args=-Np1
 
 build_options="man"

From aba6dd6bdbf3b2f432146aabfacb5f915098e828 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Wed, 21 Apr 2021 08:07:28 -0700
Subject: [PATCH 1516/2024] badwolf: update to 1.1.0.

---
 srcpkgs/badwolf/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/badwolf/template b/srcpkgs/badwolf/template
index 287f02f45b49..83fb0325e9d2 100644
--- a/srcpkgs/badwolf/template
+++ b/srcpkgs/badwolf/template
@@ -1,6 +1,6 @@
 # Template file for 'badwolf'
 pkgname=badwolf
-version=1.0.3
+version=1.1.0
 revision=1
 build_style=gnu-makefile
 make_check_target=test
@@ -10,8 +10,9 @@ short_desc="Minimalist and privacy-oriented WebKitGTK+ browser"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="BSD-3-Clause"
 homepage="https://hacktivis.me/projects/badwolf"
+changelog="https://hacktivis.me/releases/badwolf-${version}.txt"
 distfiles="https://hacktivis.me/releases/badwolf-${version}.tar.gz"
-checksum=db275d3d42c4f58e662f04c7c85c5763b70396ea7f750e3f0dd0510ea162fe6d
+checksum=57410d2be36ad40c92ce5c73ee87277dd2697f573d5ad112e5bcae73ae7f227d
 
 post_install() {
 	vlicense COPYING

From 930de47a0a0108a16c751323f6a06d050d653db6 Mon Sep 17 00:00:00 2001
From: Isaac Freund <ifreund@ifreund.xyz>
Date: Wed, 21 Apr 2021 22:08:49 +0200
Subject: [PATCH 1517/2024] libxkbcommon: update to 1.2.1.

---
 srcpkgs/libxkbcommon/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libxkbcommon/template b/srcpkgs/libxkbcommon/template
index aa45eb16360b..9e2fa45bb474 100644
--- a/srcpkgs/libxkbcommon/template
+++ b/srcpkgs/libxkbcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'libxkbcommon'
 pkgname=libxkbcommon
-version=1.0.3
+version=1.2.1
 revision=1
 wrksrc="${pkgname}-${pkgname#lib}-${version}"
 build_style=meson
@@ -10,11 +10,11 @@ hostmakedepends="pkg-config bison wayland-protocols wayland-devel"
 makedepends="xkeyboard-config libxcb-devel wayland-devel wayland-protocols"
 depends="xkeyboard-config"
 short_desc="Library to handle keyboard descriptions"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://xkbcommon.org/"
 distfiles="https://github.com/xkbcommon/libxkbcommon/archive/xkbcommon-${version}.tar.gz"
-checksum=5d10a57ab65daad7d975926166770eca1d2c899131ab96c23845df1c42da5c31
+checksum=50684541c11686203650f6ac8fe9b4b0343158fb7c54fbb0c86147f1ff5a5dbc
 
 post_install() {
 	vlicense LICENSE

From 53021c1627aa7c72ac9216291149c9d576d719b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 21 Apr 2021 18:36:24 -0300
Subject: [PATCH 1518/2024] pulseaudio: remove INSTALL and move INSTALL.msg.

INSTALL script installed a /usr/lib32 symlink to /usr/lib on x86
machines (added in 5bb3a0cf7bd39c5de60cf272bb1fe069a001af7f), which has
been unnecessary for a long time, given that base-files contains the
symlink already. It was also the wrong solution: libdir being special
cased to /usr/lib32 on i686 (to provide the multilib repo) should have
led to the symlink being part of some base package, not a workaround in
a specific package.

Furthermore, ever since 488edb2a9ce9bb81a137c5932b9ddbe3d4fd6d44, the
package follows Void's policy of always using /usr/lib$wordsize as
libdir, instead of /usr/lib, and most things dealing with library paths
shouldn't be package specific.

---

Since we are here:

INSTALL.msg doesn't need to be printed every time the package is
updated, so move to README.voidlinux.

Don't use -f in rm commands.
---
 srcpkgs/pulseaudio/INSTALL                                 | 7 -------
 srcpkgs/pulseaudio/{INSTALL.msg => files/README.voidlinux} | 0
 srcpkgs/pulseaudio/template                                | 5 +++--
 3 files changed, 3 insertions(+), 9 deletions(-)
 delete mode 100644 srcpkgs/pulseaudio/INSTALL
 rename srcpkgs/pulseaudio/{INSTALL.msg => files/README.voidlinux} (100%)

diff --git a/srcpkgs/pulseaudio/INSTALL b/srcpkgs/pulseaudio/INSTALL
deleted file mode 100644
index b4647d5e6713..000000000000
--- a/srcpkgs/pulseaudio/INSTALL
+++ /dev/null
@@ -1,7 +0,0 @@
-case "${ACTION}" in
-post)
-	if [ "$ARCH" = "i686" ]; then
-		ln -sf lib usr/lib32
-	fi
-	;;
-esac
diff --git a/srcpkgs/pulseaudio/INSTALL.msg b/srcpkgs/pulseaudio/files/README.voidlinux
similarity index 100%
rename from srcpkgs/pulseaudio/INSTALL.msg
rename to srcpkgs/pulseaudio/files/README.voidlinux
diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index 01ddc8ed7322..554e241e73ab 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -1,7 +1,7 @@
 # Template file for 'pulseaudio'
 pkgname=pulseaudio
 version=14.2
-revision=2
+revision=3
 build_style=meson
 # XXX: new version should be able to enable systemd functionality using elogind
 configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
@@ -47,8 +47,9 @@ pre_configure() {
 }
 
 post_install() {
-	rm -f ${DESTDIR}/etc/dbus-1/system.d/pulseaudio-system.conf
+	rm ${DESTDIR}/etc/dbus-1/system.d/pulseaudio-system.conf
 	vsv pulseaudio
+	vdoc $FILESDIR/README.voidlinux
 }
 
 libpulseaudio_package() {

From 9587c6a24c72fc228232c2b22d2344e5bf514954 Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Mon, 12 Apr 2021 08:46:26 +0200
Subject: [PATCH 1519/2024] nextcloud-client: update to 3.2.0

---
 ...ariadic-macro-warning-only-for-clang.patch | 36 +++++++++++++++++++
 .../patches/test-check_vio.patch              | 15 --------
 srcpkgs/nextcloud-client/template             |  9 +++--
 3 files changed, 40 insertions(+), 20 deletions(-)
 create mode 100644 srcpkgs/nextcloud-client/patches/fix-clang-variadic-macro-warning-only-for-clang.patch
 delete mode 100644 srcpkgs/nextcloud-client/patches/test-check_vio.patch

diff --git a/srcpkgs/nextcloud-client/patches/fix-clang-variadic-macro-warning-only-for-clang.patch b/srcpkgs/nextcloud-client/patches/fix-clang-variadic-macro-warning-only-for-clang.patch
new file mode 100644
index 000000000000..58d434318684
--- /dev/null
+++ b/srcpkgs/nextcloud-client/patches/fix-clang-variadic-macro-warning-only-for-clang.patch
@@ -0,0 +1,36 @@
+source: https://github.com/nextcloud/desktop/pull/3132
+
+From 52951820b2c094bcff0ec1a36c3c89d1c08c9618 Mon Sep 17 00:00:00 2001
+From: yopito <pierre.bourgin@free.fr>
+Date: Wed, 14 Apr 2021 22:07:19 +0200
+Subject: [PATCH] clang's variadic macro warnings: only for clang
+
+following settings of cmake/modules/Warnings.cmake
+---
+ src/CMakeLists.txt | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git src/CMakeLists.txt src/CMakeLists.txt
+index f29349582..6f3145331 100644
+--- src/CMakeLists.txt
++++ src/CMakeLists.txt
+@@ -30,10 +30,12 @@ if(NOT MSVC)
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_FORTIFY_SOURCE=2")
+   endif()
+ 
+-  # Calling Qt's qCWarning(category, ...) with no params for "..." is a GNU
+-  # extension (C++11 §16.3/4 forbids them). Silence clang's warnings.
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-gnu-zero-variadic-macro-arguments")
+-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-gnu-zero-variadic-macro-arguments")
++  if (CMAKE_CXX_COMPILER MATCHES "Clang")
++    # Calling Qt's qCWarning(category, ...) with no params for "..." is a GNU
++    # extension (C++11 §16.3/4 forbids them). Silence clang's warnings.
++    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-gnu-zero-variadic-macro-arguments")
++    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-gnu-zero-variadic-macro-arguments")
++  endif()
+ endif()
+ 
+ if(WIN32)
+-- 
+2.31.1
+
diff --git a/srcpkgs/nextcloud-client/patches/test-check_vio.patch b/srcpkgs/nextcloud-client/patches/test-check_vio.patch
deleted file mode 100644
index 82d78843b966..000000000000
--- a/srcpkgs/nextcloud-client/patches/test-check_vio.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-fails if runned from within a github actions, so disable it.
-NB: works fine on regular personnal xbps-src usage.
-
---- test/csync/vio_tests/check_vio.cpp.ORIG	2020-12-22 10:54:32.000000000 +0100
-+++ test/csync/vio_tests/check_vio.cpp	2020-12-26 15:16:07.118993372 +0100
-@@ -122,9 +122,6 @@
-     rc = _tmkdir(dir, (S_IWUSR|S_IXUSR));
-     assert_int_equal(rc, 0);
- 
--    dh = csync_vio_opendir(csync, CSYNC_TEST_DIR);
--    assert_null(dh);
--    assert_int_equal(errno, EACCES);
- 
-     _tchmod(dir, MKDIR_MASK);
-     c_free_locale_string(dir);
diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template
index 2382d7d337f9..cd130c14be8d 100644
--- a/srcpkgs/nextcloud-client/template
+++ b/srcpkgs/nextcloud-client/template
@@ -1,10 +1,10 @@
 # Template file for 'nextcloud-client'
 pkgname=nextcloud-client
-version=3.1.2
-revision=2
+version=3.2.0
+revision=1
 wrksrc="desktop-${version}"
 build_style=cmake
-configure_args="-Wno-dev -DNO_SHIBBOLETH=True"
+configure_args="-Wno-dev"
 hostmakedepends="pkg-config"
 makedepends="qt5-tools-devel qt5-declarative-devel qt5-webchannel-devel
  qt5-location-devel qtkeychain-qt5-devel sqlite-devel libcloudproviders-devel
@@ -19,7 +19,7 @@ maintainer="yopito <pierre.bourgin@free.fr>"
 license="GPL-2.0-or-later"
 homepage="https://nextcloud.com/clients/"
 distfiles="https://github.com/nextcloud/desktop/archive/v${version}.tar.gz"
-checksum=2fb2c18f479be2a04cf999f037def705c4be0087816af727038f0c71cb2c6189
+checksum=da1195b31fec0970121c1567f3cdaf3b9083d46727277116a98e5cd27f57aa60
 
 build_options="dolphin"
 desc_option_dolphin="Build KDE dolphin support"
@@ -77,6 +77,5 @@ nextcloud-client-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/libnextcloudsync.so
-		vmove "usr/lib/nextcloud/*.so"
 	}
 }

From e97d81d7e1f8db936318c074e8fd637f4d91c100 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 21 Apr 2021 19:43:44 -0300
Subject: [PATCH 1520/2024] linux5.11: update to 5.11.16.

---
 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 763098e49578..aa98468325f5 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.15
+version=5.11.16
 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
- c6e3d81d5c3e70a2fcc2dd2e622761d3b12b36fdc7d168d47831ac215eed142b"
+ 5c3f42864b2c28393289560376c686a2d75bc8bdac6a9d7f2d00c7bd1441264e"
 skip_extraction="patch-${version}.xz"
 python_version=3
 patch_args="-Np1"

From aad1ae4aba64c76e83de5e00a5fbabc9f185d3b3 Mon Sep 17 00:00:00 2001
From: Imran Khan <imrankhan@teknik.io>
Date: Tue, 20 Apr 2021 20:01:37 +0600
Subject: [PATCH 1521/2024] fselect: update to 0.7.4.

---
 srcpkgs/fselect/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fselect/template b/srcpkgs/fselect/template
index a1f78875f89c..9bc1fe21865b 100644
--- a/srcpkgs/fselect/template
+++ b/srcpkgs/fselect/template
@@ -1,6 +1,6 @@
 # Template file for 'fselect'
 pkgname=fselect
-version=0.7.2
+version=0.7.4
 revision=1
 build_style=cargo
 short_desc="Find files with SQL-like queries"
@@ -8,7 +8,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="Apache-2.0, MIT"
 homepage="https://github.com/jhspetersson/fselect"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=8b2cbf8aff709ffcab49ed59330655669ab185a524e89a101141d80cc025063b
+checksum=c3bf4096419ae8ff5390b6f0d064cfd2917169d41841071c61e6f265ebf11d7a
 
 post_install() {
 	vlicense LICENSE-MIT

From c74a4da3899c8f0c5ac33ce49c2c00b0de10226b Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Tue, 20 Apr 2021 16:17:29 +0300
Subject: [PATCH 1522/2024] hugo: update to 0.82.1

---
 srcpkgs/hugo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index 531c1e3d6098..ee37134f2681 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,6 +1,6 @@
 # Template file for 'hugo'
 pkgname=hugo
-version=0.82.0
+version=0.82.1
 revision=1
 build_style=go
 go_import_path="github.com/gohugoio/hugo"
@@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://gohugo.io"
 distfiles="https://github.com/gohugoio/hugo/archive/v${version}.tar.gz"
-checksum=f156c31034f013b11ff19aec09ab4d47fd8689befaa6f58222b48ed970722b4b
+checksum=3190ae848fdb1a04339c233faab5934c422d85cf85ea3b0c0b5a842239c84e75
 
 build_options="pygments extended"
 desc_option_pygments="Alternative syntax highlighter"

From b62319250a4183065cb09c5f9b0060697f540785 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Wed, 21 Apr 2021 16:22:19 -0700
Subject: [PATCH 1523/2024] mesa: update to 21.0.3.

---
 srcpkgs/mesa/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 0dbe36205d7e..18384766c74a 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,6 +1,6 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=21.0.2
+version=21.0.3
 revision=1
 wrksrc="mesa-${version}"
 build_style=meson
@@ -23,7 +23,7 @@ license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
 changelog="https://docs.mesa3d.org/relnotes/${version}.html"
 distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=46c1dc5bb54a372dee43ec3c067229c299187d5bdadf1402756bbf66a6df5b88
+checksum=565c6f4bd2d5747b919454fc1d439963024fc78ca56fd05158c3b2cde2f6912b
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" -Duse-elf-tls=false"

From 06c550074ec5ae08e5dffefd4b32be8af254fc55 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 22 Apr 2021 03:45:39 +0200
Subject: [PATCH 1524/2024] libwpe: switch to build_style=meson

---
 srcpkgs/libwpe/template | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/libwpe/template b/srcpkgs/libwpe/template
index e09c714fbfe5..99e1859ca63c 100644
--- a/srcpkgs/libwpe/template
+++ b/srcpkgs/libwpe/template
@@ -1,8 +1,8 @@
 # Template file for 'libwpe'
 pkgname=libwpe
 version=1.10.0
-revision=1
-build_style=cmake
+revision=2
+build_style=meson
 hostmakedepends="pkg-config"
 makedepends="MesaLib-devel libxkbcommon-devel"
 short_desc="General-purpose library for WPE WebKit"
@@ -12,10 +12,6 @@ homepage="https://wpewebkit.org"
 distfiles="https://wpewebkit.org/releases/${pkgname}-${version}.tar.xz"
 checksum=2415e270d45e3595ed4052bc105f733744dc2d3677e12ff4a831e5029841084d
 
-do_check() {
-	: # no tests
-}
-
 post_install() {
 	vlicense COPYING
 }

From ed33c0ecaee8ea3043c0f13982a0788abd5c3d98 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, 16 Apr 2021 21:24:59 +0700
Subject: [PATCH 1525/2024] nss: update to 3.64.

Closes https://github.com/void-linux/void-packages/pull/30264
---
 srcpkgs/nss/template | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index 5c766a79dd85..fde4f42ded05 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -3,7 +3,7 @@
 _nsprver=4.29
 
 pkgname=nss
-version=3.63
+version=3.64
 revision=1
 hostmakedepends="perl"
 makedepends="nspr-devel sqlite-devel zlib-devel"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MPL-2.0"
 homepage="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
 distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz"
-checksum=182d2fef629102ae9423aabf2c192242b565cf5098e82c5a26cf70c5e4ea2221
+checksum=d3175427172e9c3a6f1ebc74452cb791590f28191c6a1a443dbc0d87c9df1126
 
 export NS_USE_GCC=1
 export LIBRUNPATH=
@@ -44,10 +44,13 @@ do_build() {
 		*) export NSS_DISABLE_AVX2=1 ;;
 	esac
 
-	# it's actually VSX, so disable on all BE ppc
 	case "$XBPS_TARGET_MACHINE" in
 		ppc64le*) ;;
-		ppc*) export NSS_DISABLE_ALTIVEC=1 ;;
+		ppc64*) export NSS_DISABLE_CRYPTO_VSX=1 ;;
+		ppc*)
+			export NSS_DISABLE_CRYPTO_VSX=1
+			export NSS_DISABLE_ALTIVEC=1
+			;;
 	esac
 
 	cd nss

From 61840b2ee4ad4cdcd98331445bbdfdb7c46c9b9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Thu, 22 Apr 2021 02:44:15 -0300
Subject: [PATCH 1526/2024] mesa: revbump to build multilib packages properly.

Something went wrong with the last run in builders:

=> Registering new packages to /host/binpkgs/multilib (x86_64)
index: failed to read props.plist metadata for `/host/binpkgs/multilib/libglapi-32bit-21.0.3_1.x86_64.xbps', skipping!
index: failed to read props.plist metadata for `/host/binpkgs/multilib/libgbm-32bit-21.0.3_1.x86_64.xbps', skipping!
index: failed to read props.plist metadata for `/host/binpkgs/multilib/libOSMesa-32bit-21.0.3_1.x86_64.xbps', skipping!  index: failed to read props.plist metadata for `/host/binpkgs/multilib/mesa-vulkan-radeon-32bit-21.0.3_1.x86_64.xbps', skipping!
index: failed to read props.plist metadata for `/host/binpkgs/multilib/mesa-ati-dri-32bit-21.0.3_1.x86_64.xbps', skipping!
index: failed to read props.plist metadata for `/host/binpkgs/multilib/mesa-vulkan-intel-32bit-21.0.3_1.x86_64.xbps', skipping!
index: failed to read props.plist metadata for `/host/binpkgs/multilib/mesa-intel-dri-32bit-21.0.3_1.x86_64.xbps', skipping!
index: failed to read props.plist metadata for `/host/binpkgs/multilib/mesa-nouveau-dri-32bit-21.0.3_1.x86_64.xbps', skipping!
index: failed to read props.plist metadata for `/host/binpkgs/multilib/libxatracker-32bit-21.0.3_1.x86_64.xbps', skipping!
index: added `MesaLib-devel-32bit-21.0.3_1' (x86_64).
index: added `mesa-32bit-21.0.3_1' (x86_64).
index: added `mesa-XvMC-32bit-21.0.3_1' (x86_64).
index: added `mesa-dri-32bit-21.0.3_1' (x86_64).
index: added `mesa-opencl-32bit-21.0.3_1' (x86_64).
index: added `mesa-vaapi-32bit-21.0.3_1' (x86_64).
index: added `mesa-vdpau-32bit-21.0.3_1' (x86_64).
index: added `mesa-vmwgfx-dri-32bit-21.0.3_1' (x86_64).
index: added `mesa-vulkan-overlay-layer-32bit-21.0.3_1' (x86_64).

Since this didn't happen during local testing or on CI, a revbump should
hopefully be enough.
---
 srcpkgs/mesa/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 18384766c74a..267419298baa 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,7 +1,7 @@
 # Template file for 'mesa'
 pkgname=mesa
 version=21.0.3
-revision=1
+revision=2
 wrksrc="mesa-${version}"
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled

From 23e62e87c5fd7867b0217fdd7ccc41ae6061ea5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Thu, 22 Apr 2021 12:51:27 -0300
Subject: [PATCH 1527/2024] .mailmap: add entry for
 howtologinquickwiththirtyninecharacters

Original entry "broke" column view for software like tig, so use the
username and email from other contributions from same user.
---
 .mailmap | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.mailmap b/.mailmap
index 8a874ff3a399..b0305c467b92 100644
--- a/.mailmap
+++ b/.mailmap
@@ -53,3 +53,5 @@ Daniel Kolesa <daniel@octaforge.org> q66 <daniel@octaforge.org>
 teldra <teldra@rotce.de> Teldra <teldra@rotce.de>
 teldra <teldra@rotce.de> xor <aur@rotce.de>
 Andrew J. Hesford <ajh@sideband.org> Andrew J. Hesford <ahesford@gleason.com>
+
+howtologinquickwiththirtyninecharacters <howtologinquickwiththirtyninecharacters@users.noreply.github.com> It looks like the profile name is limited to 256 characters, just like most error messages here it says 255 characters but we know better, do we? As usual, let's try to fill it with meaningless words about nothing at all. Maybe I can reach its limit. End <61999526+howtologinquickwiththirtyninecharacters@users.noreply.github.com>

From dc37966b3a4d3f2acc206932d9ff6d2aa6de9e60 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 22 Apr 2021 17:36:51 +0200
Subject: [PATCH 1528/2024] stress-ng: update to 0.12.07.

---
 srcpkgs/stress-ng/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/stress-ng/template b/srcpkgs/stress-ng/template
index 15199b9aecf9..c278479af58b 100644
--- a/srcpkgs/stress-ng/template
+++ b/srcpkgs/stress-ng/template
@@ -1,6 +1,6 @@
 # Template file for 'stress-ng'
 pkgname=stress-ng
-version=0.12.06
+version=0.12.07
 revision=1
 build_style=gnu-makefile
 make_use_env=1
@@ -9,4 +9,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://kernel.ubuntu.com/~cking/stress-ng/"
 distfiles="http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${pkgname}-${version}.tar.xz"
-checksum=75eb340266b1bbae944d8f9281af978bd5bc2c8085df97a098d5500d6f177296
+checksum=cf73e3a4c7d95afa46aa27fb9283a8a988f3971de4ce6ffe9f651ca341731ead

From 04fd3558e4b0db906d4f91226ee522689b0584b8 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Wed, 21 Apr 2021 21:30:44 +0200
Subject: [PATCH 1529/2024] firefox: update to 88.0.

---
 srcpkgs/firefox/patches/disable-minidump.patch |  2 +-
 srcpkgs/firefox/template                       | 10 ++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/firefox/patches/disable-minidump.patch b/srcpkgs/firefox/patches/disable-minidump.patch
index 55f67c5d39b7..5c440076474b 100644
--- a/srcpkgs/firefox/patches/disable-minidump.patch
+++ b/srcpkgs/firefox/patches/disable-minidump.patch
@@ -17,7 +17,7 @@ index 4076a60577..945f26f638 100644
  # failure's backtrace feature might break our builds, see bug 1608157.
  failure = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
  failure_derive = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
--minidump_writer_linux = { git = "https://github.com/msirringhaus/minidump_writer_linux.git", rev = "9191af36343846b2c7ada65b9602b481b717c4d8" }
+-minidump_writer_linux = { git = "https://github.com/msirringhaus/minidump_writer_linux.git", rev = "01c7a0da8d34059f7dae8ab9e7512529ff16347a" }
  
  [patch.crates-io.cranelift-codegen]
  git = "https://github.com/mozilla-spidermonkey/wasmtime"
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index a8ba08719eb4..fdc688c6089e 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
 #
 pkgname=firefox
-version=87.0
+version=88.0
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
@@ -11,7 +11,7 @@ maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=ce98be0522f971b6950f22c738c4b2caf19cf7f48ab2ae2e6d46694af7fd58ab
+checksum=6b50dbfb393f843e4401e23965a1d8f7fd44b5a7628d95138294094094eee297
 
 lib32disabled=yes
 
@@ -64,10 +64,6 @@ post_extract() {
 		;;
 	esac
 
-	# Google API key (see http://www.chromium.org/developers/how-tos/api-keys)
-	# Note: This is for Void Linux use ONLY.
-	echo -n "AIzaSyCIFdBA7eQP43R6kXRwTq7j6Mvj1ITze90" > google-api-key
-
 	# Mozilla API keys (see https://location.services.mozilla.com/api)
 	# Note: This is for Void Linux use ONLY.
 	echo -n "cd894504-7a2a-4263-abff-ff73ee89ffca" > mozilla-api-key
@@ -166,8 +162,6 @@ do_build() {
 	export AS=$CC
 
 	cat <<! >>.mozconfig
-ac_add_options --with-google-location-service-api-keyfile="${wrksrc}/google-api-key"
-ac_add_options --with-google-safebrowsing-api-keyfile="${wrksrc}/google-api-key"
 ac_add_options --with-mozilla-api-keyfile="${wrksrc}/mozilla-api-key"
 ac_add_options $(vopt_enable alsa)
 ac_add_options $(vopt_enable jack)

From 2904da2d9becc1897361ff3da418312be4e032df Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Wed, 21 Apr 2021 21:31:04 +0200
Subject: [PATCH 1530/2024] firefox-i18n: update to 88.0.

---
 srcpkgs/firefox-i18n/template | 194 +++++++++++++++++-----------------
 1 file changed, 97 insertions(+), 97 deletions(-)

diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index 8d9361cc775a..a73c83f152ec 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=87.0
+version=88.0
 revision=1
 build_style=meta
 short_desc="Firefox language packs"
@@ -140,99 +140,99 @@ _pkgtmpl() {
 	}
 }
 
-checksum="d1e2d105de95506ac492db9227c9bbbcda5a4e7bfd4fcdc5e9e00581022409e4
- 01351f2e6cc1b29d708b3c28fdca5a1eed281cebf74ec20047ad391d2dab50f6
- c6687681eaea5f67ecd32e0fb472eba0bc309d70dd29f804bc4b9554b6382ea7
- 1832c1cd9d1f5ce9275f606177ee0b360f22021982e119034bb5e010dc6504a9
- b0cb337a77b787cf098bdec66f3ab39b1bc1020357d022e4e1206b73ce78390e
- 51ce59eb5fe02a4900f1d9a58f7fb452b7b28dcb8fcf8f4336cc1ab5a641c03f
- d3cae593077f7117017bb18ff43d1d5f2ea085c883d8d1d5c1cc86637ad54ffd
- cde7feb0cd0cc97d2bc158e31c7fe51e802eda14198e74ad79c66f04e6d6442a
- 7430babdb570d4c164ec52fdacc365587251980d36173105a789c3306f48c357
- f42637799eede7d54d26edc27ee764db6a27b14d8cd0dc831a156c764a5d5161
- 891a057e0b89dfaef33049c4b89ba2f022b993e1b20574a875fba136a7705089
- 42bf7a18097db270f0d3c39ad4e36f639eadaf8da4d12b727d89d11fe5023bcd
- 5cdc24dd5717215719b080cfbfb315311c713a88f99d05a20e137e42a076197b
- 2552db539ff62848e8ab00470d04326cced80931fb9ff85f4d1fe42dbf037259
- 36d841e3bf1bf796ecb35b002fe7ad8df1fa7f6afc6ad1495aa5aa23384ac5c6
- c599bce4cfba87803772d42beec9dfca82c5526bbb84ffca0d43619ba6b1850b
- 26fde9b15e4f86a69db0293c00e091dd3be7dd625d145b0398912ea781845a9e
- 8352abf54e5b2c4df588d649060ebca2e4981495ed5750c5594b19583df49a02
- b86448909258199ea18718ba955ed8b77c0b0f5de27b3d693aaa04e1aa8fa7a6
- 8eb8d30143ee79a2004fcfb480c612e265165072319a6d29fb9e8450e8bc0c81
- fe3f3fb58b2df9183069fa15b6655af1ddbfba84d1ee73f92d50131f321a5e29
- dbe6ea63212798aeb1417b4e6cf2dcc30db5e8c959075a7a0f1cdbf83b525dfe
- e8f93991aca36a7eb3ce8bf8a398ce53df9f65e0349dc1e11e74d7409a060744
- b5099e0caad7826be0f9b47d09438b54e22394475663a9ae3a3e1654ef58b434
- a9b122c66d07330fac0b14c5baba29459454244c49acf71324c77ae62b3cb9c2
- cf4947982416075e54b475c5be5d5ea88e34e0613dc7edbffa392f47b546f806
- 1195bbfbea0018b92467183deaedf0746451ebe6d2daef4aa7a06abe5a1f3e73
- 4fdc0caa3a0bb610133bcf2ba4c7733e44d7b4a020871565b58d7d728db27423
- 3ffbeb5af967630ce17999e501ad9ef14c7b3ffa50815e0057b1a82d11645cba
- 91097777de3a4574566911c03d025f2580a487d7bd577b2ce410b6e01590247f
- 2353f0cbb0ca615e09696a310267fd8f2143ef6ce9fa538a57391c92bcab5a8a
- c9cc8018d00df57061049aa162756d5d63e6426c568da23c9e98d3626c75273e
- 8c7bffac08f163700b0b04037fbc3e94d25e4b10569dbca67303b01ae099b95a
- 1c3fd925c05df5df0e6c31eee73f8f994226da3fb51048e06b455d91252a3d69
- 75803f71e173075adee196d17c7ad8f6fb9583ce5dbe2c95fa5507f0bd06f2e8
- d55a4f76300bf6c65271c009a22d2014c860c7498c77efce0e5b25e863ee56ee
- 2c71ba0c37d6b4009105131720f8654b49a596c0b5a82cb946090ab08d3b4633
- a38707ce837b2951426541eacbdb8d54fe1fb571aa688e17ae37fe68eda1558a
- 50e864c2092ef011ef9468cc942e5558ada194d2cdffebe08aafee1cf828cc72
- da0518cfd6b7c17fd648c30b48eae6f8fa6d25c94974a779e248e74eaf663a54
- c052b291eab3c8886f9e6004a6fbac1cd72cba47386dad1ee9c35a4c2f6028ae
- 5e754ae4bd1e62dc7fbfd86b17224b4e53e07839b459c1c9eedc01ae7d0eea4c
- 074e6b9500005a2e784c3be9ac02cbb174c3eb6d3a3806142f9552f58fe83f48
- 889ade43266b67293eb4944daf2d8cf5ad4cef9df68b831628552a83e4ac725a
- 2b9b7236d30b987a82931a576e7b419ba9814b5b40933ab4bab1ca40402717ae
- 0aebebb6597b49a49a53d2193043801b3fba3bc2745065268a0d9ebd20d11a33
- d27030e36e8857ba7fca384df21079dcdb1e3cc4b753e69462e3f1cb171e4e4f
- 141c74d88cd41efd49cfd4f010c66cee03a355e1174c26399903f763b16e22f0
- 75ed089e5b417174a621d7100d7701fdf646c19019b006df43b62c45c11471f4
- c38f03d1b2e3ebc70571daba4a6eadb50d5f99a28de44a863d04ac8b005f9d4b
- 0cc12225c2aca9a4ef3603026f7b1977cb4234f49c3605fd42b814bd53753f23
- 6c387b966dc66152f886163d524e4b6e410a9a22a532be44884c4685edf9b749
- 9130b034b4f7f33e61fb3e318395a2a3807126a1d711adfb16a9966b2f5d902b
- ee2db2900e36ba1f823d38a8e39497215b0652b0e2184f1ea5942812e59def01
- adf75fc6ea23372e473aa8e5c91a6054d1c435c4029c2d5a7741c3894942aeda
- 7c25085b1c6654ca2ee928fb6b70e98606f06762c09a438c1e6d774030b3ea7b
- 24bf2101e4c27bcef803759ad32903b6b0389e4ff0db7ae4df62ed28ba18bec8
- e0b6ce49420ad06705cd186406f0e3a41799edf730d2241672d03ce77267e00f
- 9bda2429e3d92184eb70740e730ec361af021a48080fca1eaa3004e2e438022e
- 8a894503fbf68203911463def3adb3c3ac7853c8f4640ddc6dfa5695d5ba9522
- e4bad7f42efd58a9c3b8ee131f3e689460602a2862f06a5ad11652d3e3a1438c
- e38516ff3902c3f82e6a92d2cc7fe385cc912ed543c6c5957625a254633705fc
- 2f925f382d45f8d6d6d287a1444aab5136373214f88ca48e2c079393fa613fc1
- 15a472eb1cc5f7e72d2d205b6830c78ac61d3e9a85420ea9ba13bc8c3134d418
- bc824e2da09ff8da71dc0cac0a4da3547be3b0ad4635380438fcd371ef7caa3f
- 4f4d6cf74ffee459bfe5a842f29eee70c3c04409ed4deb0f34c957ce22d4906c
- 90837cb76ec549e90e16afc015bd0110622c9681f126377b71698cc29aa0d451
- d761b47ccd1d45546f4035e5c06d46ca511aa79bd2dd560cb65c27bdc533b261
- a0cb14552be607fb610e4196c0f0ff20c6fd9fb2225808b6fbfb4516f38e9a8f
- d445bba51216686a580793e6f47588833a9c2a8d88c8133c1cfa266fb70d1b6a
- 829621f483c2ee700c289159b6a6f9185b25f79a4f3d376c3a95bab9eb4bc771
- e65581605ef2940d2e300a09d388dcb3869e3333ba77ef9de5f5610106598e7d
- 6a4712d433ea85eca4e2cd32cfc467a8717f8280610e155ba481d99f16c6d3ca
- b9ce23f90bfb5ba95e4515074233128b6d61896bfd33cee22cbed4c7c4147dcd
- 8f2474ee7b737fd22ea86084c533567125f9504bb98c1fdb5898d05a6cad613a
- 0123e7b8d8cf0f4f0474dc62b93428d63d0dc423a9a53adb3e7b28d40bb4fbb8
- 28ff00508f9c8b0911c808a606edb536efb523b0f361367ad85f9326de4e7734
- 9fa20f7025663bdbb4adf699da123352995cdd4ead088eca3b0c54a827d7bcb0
- 81e5b0fe991b1d16fb443c08ec8500d57d5ae61b2eae892e6da418d6dad4f54e
- ce26e656580fed093f352c8de05f176831e109af78533c26f1bfa9fa79da8f83
- 63db0a0572443d73f5229b39e1335bf72206a0822787c5eff1aef539d72e0db0
- b78c790d0a192578d4423d5ff7b6766bc0d201e915d9fb8b06f4732a05df384b
- cc6195820338da2ea15e06cd394dc083ede55a7089568ba08eea6ca40eb3cbc7
- 9d38f83e3aa09163daf6577708d308629f36e7f0c4391fae91e8cb9b0e381fdb
- 73003f8f885ec53f44d3d3437a2ff7d4a57d4502092f0c8823df0f186068c126
- 34839ece9535f009b34a98c9f876513897f193dcd88a99503b6f0a36200c065f
- d563ba32adef055e837c4b61833bbc9942f713585d35affd135f5743afb3a49e
- 0c29382fe9c0471d560925deec08e01ef36cb008a8f53fe0be0c7dd34fe74cde
- e9dc7379d6e579109bafa395ee2d5c9030d3d61b03257b6dcfbef29d837eaf94
- 935bcce0802ffb08e689e7bfb4012a6690c891d8302484837e57bb16922dfd00
- 7910d0bb95b6c42339bd99fb664c14dd94f8b2931cdc7f7dd4a717f812016054
- 01597f20969a2df14e8e2b2f99e718a9092d33f042b85214971dbdef592f5144
- 13eef9c82846f83f2d9913d0b7214de81725a2cc9468aa3e819f454e3f625bf1
- fcdd0082180be53895b344bca7dfa129547979452c82d6230a622989aea2a1cf
- d407395855fb18403c1271cb5cebe0b6e2dc6cc0b5c9fa8a49ce14b0d660e304
- 9ca2d545df37e07ea30852dc4928bd2cd1afa25b60e702316ba1b412a1f30c84"
+checksum="da88ccf14094a5de19526b4650b4f718db67f3d81f26c0ce1af25ede1a2a42e1
+ ce0ae11d1629fd4f691f6033c948ffa89e50e26adb4390bd7645239067615548
+ 9c8c18bb150a9c9969e4f0d3969c476ac353fb6d118162b3e1836a3679a42bef
+ ed8f29b245f2b9f1cf3bb1e45eaccbd9acb875dd60c042b06f5d24d545abadfe
+ e4f18d5762c3bc66ee973a956aeb88e636c16bb7f665c4d9a240b6419a3b12f1
+ d5e24820837ea08f890fe2a9d47f95b704c6f43138d712d238c83e61bfa70f63
+ 4eead79524a8f3569928e221d398adde6ea9cb556ac6e8ec5b0e35014e164829
+ d09fc47244541f92f4ea8845edbcdb36334e03499dd7c53bc8424b46ab9c0763
+ 7bf0fe548926a255266697f23a055f187fbc8d9dabaeb525b599ea606413e7e6
+ 9ded5446658221a32cbbfcddcfd1b4a50ec0db9b79574a8910953e0c5b1ee5ec
+ f2f9b7df0b814cd43a10b8141af9a967426f5b807605e708330173b3ec3ba88a
+ 4ec43f292136acecad40db971feda1bf628b1a77dc42879c29e4b206dbca5c3f
+ c3e461c83cd4f1e4ed1c73de3def0b346b41ba9f9a938ac1ceca20b34411d1e6
+ 105b7b26c13640eb140b0b122fe4c03a10cdf53288a163d5f8e3b0dc5209c41e
+ 686dce89d291b34d13aab3c036ac5dd03f9f4c015a4a81056a0a87c878efb20d
+ 4144b4fafab32651ce7ead86996ce0e0b148d3ad9bd079d8f373fcf9be0d3633
+ bc01bafdec35e8d03c9b225556cbe84f649c439f47e73588c07b364dd172ce0a
+ ad9b46502ef92b0c1aff78fc13b2f097b46316fa145cc370d2e62158e529d304
+ e6bc9507d6006620ed9a068a4f0237d0eba62cadd53b9960038ba83680a7d155
+ d37421d461f698707a25118694c9a55a4e590802fd4ce919a4e3ddf5f2c17652
+ a790bed70e3be94cf6bfe45f07e11a09c57b095af6372bdf01351eb6c0933c4b
+ 551dcf4bc5ffba65c9bf92d28393778c2907332342bccdaf5fa0e9137b566451
+ cc266c2e5f608bd59978218792def6bf361760d4c0c33fc626509dca7faeaa0b
+ 2c7a7980e0026b2f11596ae723f75f06fbae1e6149a1b482eddfcc7e1ac711d3
+ 788750358c49c996811a567740ddc72327f83315f7032cafb9953c139e1adec8
+ 3e4dfce301488a300b05dad0b226f0b1fe3d9920d612babdaddac622758fdfdb
+ d3d445ffe10f4924cb0fcdabf00066f9bcb55fe0ff04add79576f01ecd884dc3
+ 9cd056a11a21ac3adbf9ceb3a91d99446b8efdc02549b4237743f8dc0d5cadc9
+ edf8641d591d56bc0a087a3d35321ba7ac177cc46cfc2310398dd1337f13644a
+ 9419aaa55db02a05dfeb00695cfcb4fddbd44784364c9e0273eb55b040bdf6fe
+ de89528f19d0fe72e528d0b3b2671040a5f60c0a16427ed989e5c8995227e998
+ 248b5c1968be6d470312faa4f018674f6956dffcf9e6abb05cc46d7668da7c7d
+ 171d659668a17bb8998acba23b57818adb9be1c7b6ff028ad378ba812a9d5a8c
+ 0c2782fa1b1b21cd12bc6848d9567c916f46f829a2ad91b7f5313234cc9f53f1
+ fab7d9994dfb13673f1c377e161e4f60780d4193e7af2eec5debc0c69a486e17
+ 3938d5510206e2416449e232a14c7b2dcb1455ac33bb8e746a4db6d6855827a9
+ f111b803819713db455fba0027f36af9a09da3b591cea19f7e8d342b684aaf6a
+ b2ede6f0c2e77cd9a20e2947615c001e772462d2716723e4c8566470134e3827
+ 8b08ed35173326af40fbc920a7383bffbd2f35f59dfcff9de81bab358f0c7fe4
+ 1f8dc9c566c0f7dc08ed232016c5b7109c8d8eeb65c03d6f17be76dcaf81a18d
+ 8a88f5b1e45653743bc13a94dc2556f4bf8cdd923facee4ea643885e13ccb08c
+ e1913629be2f7fad964d0b9407e43763521e0e8b6e90963401c55bcb2b7c356f
+ be67cc96c25afe87784d1601ec59267fc2e521d1181f4334bf8aefc532ea5f3a
+ 6a6542c847527f5f3894d83aeca2ef7b9b1f0332e1f60b00dc15a4664c009599
+ 449c8ba115feacd21315b5042f056189e315a3bd736388a7f0f7fd92c5953c26
+ ca409a4060572ba8239721196aaf6ff53307236a64854d776bed1862cebca18c
+ f857da462c7e5de1bacfd48a6faa4239e7e5ada1e5e3137bbffb09925537f371
+ 2fab91fdbdf81798323e82a7321dc04a7b5b53a4ffdaeb073ed9590d804c34bc
+ 422083d6e3b40cf6b6a60f6207944534115d9f6ea7813b9caaaacb9238b9d7b8
+ 1eda0dc20f95e2a4d3cfdcea7806473be0d44549ee91015b3037d3c5a2f785c6
+ df038a3715ae11bc0ae368cf23f7cdff62637fca302bb41a9a54d391cb475bc5
+ c3ed921ad0c521b3b259ba2ee1181d42830f69a1a9305d8eba7d4a7f3aa75522
+ 55b005da1c92309b90945f04b04cac4ea6ec56cc34f69d75590674afd68e7cf7
+ 2cb0b12c3009ac920a0a9b5234d412ac5c4960c68f94a2a5124db2d1a0313531
+ c596b0c5ae8540afff007de494254727e94a54b837a2503a033f2014ddc59c73
+ 1cd550c95f6f166d6bcc45307057eff3d730e07a7c6280c6cf72844602a55675
+ fe41ba33a31e0c5294e99c7c0d3364abcdc5b44ca006f42e9f440e57710d36ab
+ 588a4af16be74e94616b9ef689d1a4e066f3588e1bd1b3a637facce009ef6789
+ ac399cc0d4d0779b18296cb00b846ec8799e558139127b398865ebb8ceecdd77
+ 02cb1244be4d25cc0398a87c210c4741a97f66774c372bde24faad630eff448f
+ cc2e550f9c71c435dd101790c6f4e1f0af8e185eaa81a1e1440a69b45cd80303
+ b21aac4cbdb26e2743891b637319baf6fd7b5f2ab8b52893d2b26e2448cc0dab
+ a6219d66630c0e9e991ae6a8afb0539b6b743e8cbd7c9ce5febff5f6b1bc2739
+ 533f38e026ace1332ebd0484a4ee0a7832f11c796a5dfce9ee35a5af34ec7ee7
+ 172d5969d5d9c4d0ced33153abb52c5fca52603d8fa5e2f2fbf0d2b7b68d8142
+ 0d25977a21e9772d2657ca8754717e5f1abba416fdbd5866fa917209c2af560c
+ 604a4df1799971e5b716e638ee776f30c5558ffddd72f10ba2796a2e2c323503
+ 328334d1339b406a8d9b8a9efafbe2e7bb711354a56c3876065a96e64f9c98de
+ a7f101d7a791b6deb6a2ae9afbf5286568069f73b33655db4323f5f94387f5d4
+ 094d5ba532fbd2f2bd07afb739e99886a836cb4a93e57deb8a3e10e70feba449
+ f6c97435a64e29c79388b0e40b8ba7a0d774df96e074979bf7cf7343f9a980df
+ 2f6ca77bf7d4d3fb0a17141918cf3468380e8b477413fa5d1e71ff0aff30f810
+ 230731339bd7b96889a06083d4b28b08d942dd73cfeed2a6d247a4e8dbbe6cf8
+ f7901d656ad56c1f7e3e38fe6a988f68d8cc94d6890b7f2482b62fe983df0579
+ be6403f22dae93e06f04dc303f44ff7ec1f951395c329e0842b6ef84c9487137
+ 6cc11c2a68fe9755f065f02558c4f8077fd53c73c7e5f8846eae5365e2873eba
+ 28c7a9fa809ec38812a2c840466c9403943c8ef47c9c886f4ecbc390a1668617
+ 7fa2e4b43fc50f4fea5ed550679745262f27e8db75dfbe3102a4ba78b0250a8b
+ fb09aa3f793eec95cd97e73fe1c03af81f5e06629ed3afdce77d89d82e3565d8
+ 21e5008e10af7b0008de36c6f964a40737b004bf0f49154781d472dbca1b86fa
+ 9eb985f4fd4f5a6a26b5abe0dead9222d02d76e57b0282a1bced57d2f194be40
+ e5c2295733f5b95a3476cc177e825a06a0aa3149a331da054ab5d265cf63f036
+ 746872105fa1bd9f68d683ba2d6d0bace16cb31a301dbf99b3b1087d85998629
+ e66f933ebcf6c0da6c3334c7b91eee4a20a7a623fb16ca22dfcff7a9c88be9af
+ ec3390fdb7f96cfd434c2c4ab344b597fbe3bafb799771800f09d509f486858b
+ 3e9d5f326025153fdb5608be6673b4966b2cb5ffa0b7a54e08dee5f05b01e196
+ 3a90521f63e68d86129f3b24814295a2d1e2dce8ff60674cbedea617d9aca969
+ dccef3e20f35be84bee5892c77cb64dd2be2de453171ef998244cacd588b861b
+ c100aded88de30b24e469a361042e4bef94de560681e3f28f9b8d6b0d2c6fd28
+ 9e1d373a84bc53f9a6809391717e5c728553ab2609c7c72314d6f1c66094e9b4
+ 7fed64f1e1667c8aeb07abc4a6ece100ec8c90e424634917abc87dd1edb500f1
+ af9967c67b5f68dd4360ebd0ccd711637a385ab0e42444308d5256be91531664
+ ea24d3550c9915da7adc26c1ccbb4996f074e08d299894af26990517644c063b
+ 8d12b4b4b8129ed1192fdd7987744307c0fcf77133fc058301263525a206b134
+ f19a74f2985c20e072337c455a6e62fcebdb85166b915ff1fe44f7ee957fd560
+ 4eba6dc24c0dd4abab61b399dc4616f6787a3135a344a6b397c104e01f68abd0"

From bd29c5a6bbdb157a70ecaae6721c95bd8447fd1e Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 22 Apr 2021 23:15:52 +0300
Subject: [PATCH 1531/2024] opera: update to 75.0.3969.218.

---
 srcpkgs/opera/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opera/template b/srcpkgs/opera/template
index 420dd20f7b87..33cfccf0d6d8 100644
--- a/srcpkgs/opera/template
+++ b/srcpkgs/opera/template
@@ -1,6 +1,6 @@
 # Template file for 'opera'
 pkgname=opera
-version=75.0.3969.149
+version=75.0.3969.218
 revision=1
 archs="x86_64"
 depends="ffmpeg desktop-file-utils hicolor-icon-theme"
@@ -9,7 +9,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="custom:Proprietary"
 homepage="https://www.opera.com/computer"
 distfiles="http://get.geo.opera.com/pub/opera/desktop/${version}/linux/${pkgname}-stable_${version}_amd64.deb"
-checksum=cd2e68873eef290d3240283b14a184d914bf251a0177cca5c299494dba095262
+checksum=30603a39b09b1590235850424b18129b3e77bc7ea7daacceab0d80a4a8242767
 repository="nonfree"
 nostrip=yes
 

From 6bf5492ca6a7cafc5bd7e108fbf73728bde1918d Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 23 Apr 2021 00:00:24 +0300
Subject: [PATCH 1532/2024] ffsend: update to 0.2.71.

---
 srcpkgs/ffsend/template | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/ffsend/template b/srcpkgs/ffsend/template
index ea63f7192843..c17f6b6ed47d 100644
--- a/srcpkgs/ffsend/template
+++ b/srcpkgs/ffsend/template
@@ -1,7 +1,7 @@
 # Template file for 'ffsend'
 pkgname=ffsend
-version=0.2.68
-revision=2
+version=0.2.71
+revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
 makedepends="openssl-devel"
@@ -10,13 +10,9 @@ maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/timvisee/ffsend"
 distfiles="https://github.com/timvisee/ffsend/archive/v${version}.tar.gz"
-checksum=749046507274f03a1e667cf2302b5b3ac2a977e44ae3f9594be65ce0fca40daf
+checksum=c9b1fbc5190bcf83a16f01dbbc7a819ce0191ebe371769133177ca2fa5c42d31
 
 post_extract() {
 	# avoid ring dependency
 	vsed -i 's,"crypto-ring","crypto-openssl",' Cargo.toml
 }
-
-pre_build() {
-	cargo update --package openssl-sys --precise 0.9.58
-}

From 0bdb5843cc59435769699f0c0519e4b9487457eb Mon Sep 17 00:00:00 2001
From: Stefano Ragni <stefano.ragni@outlook.com>
Date: Thu, 22 Apr 2021 19:10:02 +0200
Subject: [PATCH 1533/2024] pipewire: update to 0.3.26

---
 ...07864d3a1739b8dc1a5355057f29b9a37f78.patch | 52 -------------------
 srcpkgs/pipewire/template                     |  4 +-
 2 files changed, 2 insertions(+), 54 deletions(-)
 delete mode 100644 srcpkgs/pipewire/patches/59ed07864d3a1739b8dc1a5355057f29b9a37f78.patch

diff --git a/srcpkgs/pipewire/patches/59ed07864d3a1739b8dc1a5355057f29b9a37f78.patch b/srcpkgs/pipewire/patches/59ed07864d3a1739b8dc1a5355057f29b9a37f78.patch
deleted file mode 100644
index a033bb5fee7f..000000000000
--- a/srcpkgs/pipewire/patches/59ed07864d3a1739b8dc1a5355057f29b9a37f78.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 59ed07864d3a1739b8dc1a5355057f29b9a37f78 Mon Sep 17 00:00:00 2001
-From: Wim Taymans <wtaymans@redhat.com>
-Date: Fri, 9 Apr 2021 11:55:55 +0200
-Subject: [PATCH] media-session: log info when loading monitor fails
-
-Log info in all monitor plugins instead of an error.
----
- src/examples/media-session/alsa-monitor.c  | 1 +
- src/examples/media-session/bluez-monitor.c | 2 +-
- src/examples/media-session/v4l2-monitor.c  | 1 +
- 3 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/examples/media-session/alsa-monitor.c b/src/examples/media-session/alsa-monitor.c
-index d97a45a66..72696b772 100644
---- src/examples/media-session/alsa-monitor.c
-+++ src/examples/media-session/alsa-monitor.c
-@@ -1061,6 +1061,7 @@ int sm_alsa_monitor_start(struct sm_media_session *session)
- 	impl->handle = pw_context_load_spa_handle(context, SPA_NAME_API_ALSA_ENUM_UDEV, NULL);
- 	if (impl->handle == NULL) {
- 		res = -errno;
-+		pw_log_info("can't load %s: %m", SPA_NAME_API_ALSA_ENUM_UDEV);
- 		goto out_free;
- 	}
- 
-diff --git a/src/examples/media-session/bluez-monitor.c b/src/examples/media-session/bluez-monitor.c
-index 9481d4472..5a4f30d48 100644
---- src/examples/media-session/bluez-monitor.c
-+++ src/examples/media-session/bluez-monitor.c
-@@ -586,7 +586,7 @@ int sm_bluez5_monitor_start(struct sm_media_session *session)
- 	impl->handle = pw_context_load_spa_handle(context, SPA_NAME_API_BLUEZ5_ENUM_DBUS, &impl->props->dict);
- 	if (impl->handle == NULL) {
- 		res = -errno;
--		pw_log_error("can't load %s: %m", SPA_NAME_API_BLUEZ5_ENUM_DBUS);
-+		pw_log_info("can't load %s: %m", SPA_NAME_API_BLUEZ5_ENUM_DBUS);
- 		goto out_free;
- 	}
- 	if ((res = spa_handle_get_interface(impl->handle, SPA_TYPE_INTERFACE_Device, &iface)) < 0) {
-diff --git a/src/examples/media-session/v4l2-monitor.c b/src/examples/media-session/v4l2-monitor.c
-index ecb75d085..2b2a92ef3 100644
---- src/examples/media-session/v4l2-monitor.c
-+++ src/examples/media-session/v4l2-monitor.c
-@@ -550,6 +550,7 @@ int sm_v4l2_monitor_start(struct sm_media_session *sess)
- 	impl->handle = pw_context_load_spa_handle(context, SPA_NAME_API_V4L2_ENUM_UDEV, NULL);
- 	if (impl->handle == NULL) {
- 		res = -errno;
-+		pw_log_info("can't load %s: %m", SPA_NAME_API_V4L2_ENUM_UDEV);
- 		goto out_free;
- 	}
- 
--- 
-GitLab
-
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 3536c294cb35..7ed96573fbb9 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,6 +1,6 @@
 # Template file for 'pipewire'
 pkgname=pipewire
-version=0.3.25
+version=0.3.26
 revision=1
 build_style=meson
 configure_args="-Dman=enabled -Dgstreamer=enabled -Ddocs=enabled -Dsystemd=disabled
@@ -17,7 +17,7 @@ license="MIT"
 homepage="https://pipewire.org/"
 changelog="https://gitlab.freedesktop.org/pipewire/pipewire/-/raw/master/NEWS"
 distfiles="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz"
-checksum=fb6d5a0cbde621659ffd67622f19744dd6c8da8745b060cb1951c3d2045e5166
+checksum=05cc9d25de45290c025da5da1b94fc705bddacd93cf3690d0b2988c1ac501ee1
 conf_files="/etc/pipewire/*.conf /etc/pipewire/media-session.d/*.conf"
 
 build_options="sdl2"

From d5467d7bbbe41a6a41a2adf348a5f1232baf3de7 Mon Sep 17 00:00:00 2001
From: Sebastian Uharek <uharek@friendship-systems.com>
Date: Thu, 22 Apr 2021 14:10:57 +0200
Subject: [PATCH 1534/2024] zoom: update to 5.6.16775.0418_1

---
 srcpkgs/zoom/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template
index abb73eabe225..eb32d8bf5656 100644
--- a/srcpkgs/zoom/template
+++ b/srcpkgs/zoom/template
@@ -1,6 +1,6 @@
 # Template file for 'zoom'
 pkgname=zoom
-version=5.6.13632.0328
+version=5.6.16775.0418
 revision=1
 archs="x86_64"
 wrksrc=zoom
@@ -13,7 +13,7 @@ maintainer="Daniel Santana <daniel@santana.tech>"
 license="custom:Proprietary"
 homepage="https://zoom.us/"
 distfiles="https://cdn.zoom.us/prod/${version}/zoom_x86_64.rpm"
-checksum=afad3a1c359d36aa8ac78e44fea46abbd2f4e05dd8f54757b001cc6f3457df2b
+checksum=b055c5a4255a4675a3603e7d50bb4b918efd90ba68010e27462c977e2d34973f
 repository=nonfree
 noshlibprovides=yes
 noverifyrdeps=yes

From ca9f73a0e152845c941052ad5917bfe7c3d9cde2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Mon, 19 Apr 2021 13:42:25 +0200
Subject: [PATCH 1535/2024] peshming: update to 0.3.0.

---
 srcpkgs/peshming/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/peshming/template b/srcpkgs/peshming/template
index 477b3533c3eb..d1a45ad0a6e6 100644
--- a/srcpkgs/peshming/template
+++ b/srcpkgs/peshming/template
@@ -1,6 +1,6 @@
 # Template file for 'peshming'
 pkgname=peshming
-version=0.2.3
+version=0.3.0
 revision=1
 wrksrc="peshming"
 build_style=cargo
@@ -10,7 +10,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="AGPL-3.0-only"
 homepage="https://git.jcg.re/jcgruenhage/peshming"
 distfiles="https://git.jcg.re/jcgruenhage/peshming/archive/v${version}.tar.gz"
-checksum=491f9a626228d5974ed25ca1ab6fb41e4301d3ecfffde86723a5f4bf96a0d1d7
+checksum=c04b23b803ff379f6c1f691aaf0a20f2e7a9c5be6c24d0ac70e504f4dabe55e3
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From ccbf41d4bab36e000470d91fc5d2f404e4339b4d Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Sun, 18 Apr 2021 14:38:24 +0300
Subject: [PATCH 1536/2024] grim: update to 1.3.2

---
 srcpkgs/grim/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/grim/template b/srcpkgs/grim/template
index 618447694563..89af643b6a7f 100644
--- a/srcpkgs/grim/template
+++ b/srcpkgs/grim/template
@@ -1,6 +1,6 @@
 # Template file for 'grim'
 pkgname=grim
-version=1.3.1
+version=1.3.2
 revision=1
 build_style=meson
 configure_args="-Djpeg=enabled -Dwerror=false"
@@ -10,8 +10,8 @@ short_desc="Grab images from a Wayland compositor"
 maintainer="Derriick <derriick.ensiie@yahoo.com>"
 license="MIT"
 homepage="https://wayland.emersion.fr/grim/"
-distfiles="https://github.com/emersion/$pkgname/archive/v$version.tar.gz"
-checksum=b1ab720b5dbcd560cfa34bbd7e0cbe85330f701c471b12e2489dfec15bcf216e
+distfiles="https://github.com/emersion/grim/archive/v${version}.tar.gz"
+checksum=42c2952e98389506156c08e40e0c37afdc2ec5ef4d55a5a4febde6acdac4d1c8
 
 post_install() {
 	vlicense LICENSE

From 15bff48bade56d66be164ef2b9012312e1c88052 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Sun, 18 Apr 2021 14:41:08 +0300
Subject: [PATCH 1537/2024] slurp: update to 1.3.2

---
 srcpkgs/slurp/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/slurp/template b/srcpkgs/slurp/template
index 95a24b2f712f..7e8f02a52a4b 100644
--- a/srcpkgs/slurp/template
+++ b/srcpkgs/slurp/template
@@ -1,6 +1,6 @@
 # Template file for 'slurp'
 pkgname=slurp
-version=1.3.1
+version=1.3.2
 revision=1
 build_style=meson
 hostmakedepends="pkg-config wayland-devel scdoc"
@@ -9,8 +9,8 @@ short_desc="Select a region in a Wayland compositor"
 maintainer="Derriick <derriick.ensiie@yahoo.com>"
 license="MIT"
 homepage="https://wayland.emersion.fr/slurp/"
-distfiles="https://github.com/emersion/${pkgname}/archive/v${version}.tar.gz"
-checksum=afe8714c6782a0e548b0f539676783a922ac61e7ba3fc7c0815644e72293fa3a
+distfiles="https://github.com/emersion/slurp/archive/v${version}.tar.gz"
+checksum=005dd8601d4bada9728f434728c7a57c955f90f9b9f53d1ffb051abdbabb9876
 
 post_install() {
 	vlicense LICENSE

From 029e82f8bef1ceeb14e3ad206d76682c14319ebe Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Wed, 21 Apr 2021 06:39:55 -0700
Subject: [PATCH 1538/2024] wf-config: update to 0.7.1.

---
 srcpkgs/wf-config/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wf-config/template b/srcpkgs/wf-config/template
index 5cbf2c847e04..49271c8d7729 100644
--- a/srcpkgs/wf-config/template
+++ b/srcpkgs/wf-config/template
@@ -1,6 +1,6 @@
 # Template file for 'wf-config'
 pkgname=wf-config
-version=0.7.0
+version=0.7.1
 revision=1
 build_style=meson
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Young Jin Park <youngjinpark20@gmail.com>"
 license="MIT"
 homepage="https://wayfire.org"
 distfiles="https://github.com/WayfireWM/wf-config/archive/v${version}.tar.gz"
-checksum=a8712d6a10d74b2bdba3dac9e01448945a0470ce8b1cd6d5caa2a8194f889b04
+checksum=9c212f85bfb26d135610f45865b4401e0c33a0ab3577ac65042eb23ebfe91bdb
 
 post_install() {
 	vlicense LICENSE

From c2e1ea1c1d9db3ffcac596dcb99f9841fb2bbe65 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Wed, 21 Apr 2021 06:40:07 -0700
Subject: [PATCH 1539/2024] wayfire-plugins-extra: update to 0.7.0.

---
 .../patches/forcefullscreen-crash.patch       | 50 +++++++++++++++++++
 srcpkgs/wayfire-plugins-extra/template        |  3 +-
 2 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/wayfire-plugins-extra/patches/forcefullscreen-crash.patch

diff --git a/srcpkgs/wayfire-plugins-extra/patches/forcefullscreen-crash.patch b/srcpkgs/wayfire-plugins-extra/patches/forcefullscreen-crash.patch
new file mode 100644
index 000000000000..5b6bcc4c4c2f
--- /dev/null
+++ b/srcpkgs/wayfire-plugins-extra/patches/forcefullscreen-crash.patch
@@ -0,0 +1,50 @@
+From c321dda631026485d767f7125e80e5f5d7ad5b35 Mon Sep 17 00:00:00 2001
+From: Scott Moreau <oreaus@gmail.com>
+Date: Tue, 16 Feb 2021 04:49:52 -0700
+Subject: [PATCH] force-fullscreen: Fix crash when closing fullscreened
+ surfaces (#79)
+
+Introduced by a change in core, rework things to make it not crash
+when closing a view.
+---
+ src/force-fullscreen.cpp | 16 +++++++++++++---
+ 1 file changed, 13 insertions(+), 3 deletions(-)
+
+diff --git a/src/force-fullscreen.cpp b/src/force-fullscreen.cpp
+index 364f239..894c403 100644
+--- a/src/force-fullscreen.cpp
++++ b/src/force-fullscreen.cpp
+@@ -41,11 +41,23 @@ class fullscreen_subsurface : public wf::surface_interface_t,
+ 
+     fullscreen_subsurface(wayfire_view view) :
+         wf::surface_interface_t(), wf::compositor_surface_t()
+-    {}
++    {
++        view->connect_signal("subsurface-removed", &on_subsurface_removed);
++    }
+ 
+     ~fullscreen_subsurface()
+     {}
+ 
++    wf::signal_connection_t on_subsurface_removed = [&] (auto data)
++    {
++        auto ev = static_cast<wf::subsurface_removed_signal*>(data);
++        if ((ev->subsurface.get() == this) && _mapped)
++        {
++            _mapped = false;
++            wf::emit_map_state_change(this);
++        }
++    };
++
+     void on_pointer_enter(int x, int y) override
+     {
+         wf::get_core().set_cursor("default");
+@@ -295,8 +307,6 @@ class wayfire_force_fullscreen : public wf::plugin_interface_t
+ 
+         if (background->black_border)
+         {
+-            wf::emit_map_state_change(background->black_border);
+-            background->black_border->_mapped = false;
+             view->remove_subsurface(background->black_border);
+             background->black_border = nullptr;
+         }
diff --git a/srcpkgs/wayfire-plugins-extra/template b/srcpkgs/wayfire-plugins-extra/template
index 320429eb61d1..e53f0536c99c 100644
--- a/srcpkgs/wayfire-plugins-extra/template
+++ b/srcpkgs/wayfire-plugins-extra/template
@@ -1,7 +1,7 @@
 # Template file for 'wayfire-plugins-extra'
 pkgname=wayfire-plugins-extra
 version=0.7.0
-revision=2
+revision=3
 build_style=meson
 hostmakedepends="pkg-config wayland-devel"
 makedepends="wayfire-devel glibmm-devel"
@@ -12,6 +12,7 @@ license="MIT"
 homepage="https://wayfire.org/"
 distfiles="https://github.com/WayfireWM/wayfire-plugins-extra/archive/v${version}.tar.gz"
 checksum=e6377e7f2cd6b0a19fe0a256c819f801ee1d963524ed4e4930b702474bc04287
+patch_args="-Np1"
 
 post_install() {
 	vlicense LICENSE

From 1f8599f0089cad4f571de3722ceeef7bfb09c4c6 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Wed, 21 Apr 2021 06:52:46 -0700
Subject: [PATCH 1540/2024] wayfire: update to 0.7.1.

---
 srcpkgs/wayfire/patches/wlroots13.patch | 189 ------------------------
 srcpkgs/wayfire/template                |   8 +-
 2 files changed, 4 insertions(+), 193 deletions(-)
 delete mode 100644 srcpkgs/wayfire/patches/wlroots13.patch

diff --git a/srcpkgs/wayfire/patches/wlroots13.patch b/srcpkgs/wayfire/patches/wlroots13.patch
deleted file mode 100644
index d42dbc425a3a..000000000000
--- a/srcpkgs/wayfire/patches/wlroots13.patch
+++ /dev/null
@@ -1,189 +0,0 @@
-diff --git a/meson.build b/meson.build
-index 4a8992cb..117f928c 100644
---- a/meson.build
-+++ b/meson.build
-@@ -28,7 +28,7 @@ libinput       = dependency('libinput', version: '>=1.7.0')
- pixman         = dependency('pixman-1')
- threads        = dependency('threads')
- xkbcommon      = dependency('xkbcommon')
--wlroots        = dependency('wlroots', version: ['>=0.12.0', '<0.13.0'], required: get_option('use_system_wlroots'))
-+wlroots        = dependency('wlroots', version: ['>=0.13.0', '<0.14.0'], required: get_option('use_system_wlroots'))
- wfconfig       = dependency('wf-config', version: ['>=0.7.0', '<0.8.0'], required: get_option('use_system_wfconfig'))
- 
- use_system_wlroots = not get_option('use_system_wlroots').disabled() and wlroots.found()
-diff --git a/plugins/single_plugins/vswipe.cpp b/plugins/single_plugins/vswipe.cpp
-index da37448c..26c8f399 100644
---- a/plugins/single_plugins/vswipe.cpp
-+++ b/plugins/single_plugins/vswipe.cpp
-@@ -1,3 +1,4 @@
-+#include <wayfire/nonstd/wlroots-full.hpp>
- #include <wayfire/plugin.hpp>
- #include <wayfire/output.hpp>
- #include <wayfire/core.hpp>
-diff --git a/src/api/wayfire/nonstd/wlroots-full.hpp b/src/api/wayfire/nonstd/wlroots-full.hpp
-index 77a12c70..4a24f1a1 100644
---- a/src/api/wayfire/nonstd/wlroots-full.hpp
-+++ b/src/api/wayfire/nonstd/wlroots-full.hpp
-@@ -112,6 +112,8 @@ extern "C"
- #include <wlr/types/wlr_pointer_gestures_v1.h>
- #include <wlr/types/wlr_idle.h>
- #include <wlr/interfaces/wlr_keyboard.h>
-+#include <wlr/types/wlr_touch.h>
-+#include <wlr/types/wlr_pointer_gestures_v1.h>
- #include <wlr/xcursor.h>
- #include <wlr/types/wlr_data_control_v1.h>
- #include <wlr/types/wlr_virtual_keyboard_v1.h>
-diff --git a/src/api/wayfire/nonstd/wlroots.hpp b/src/api/wayfire/nonstd/wlroots.hpp
-index 4686d14f..402ab3cd 100644
---- a/src/api/wayfire/nonstd/wlroots.hpp
-+++ b/src/api/wayfire/nonstd/wlroots.hpp
-@@ -43,7 +43,14 @@ extern "C"
-     struct wlr_viewporter;
- 
- #include <wlr/types/wlr_input_device.h>
-+#include <wlr/types/wlr_pointer.h>
-+#include <wlr/types/wlr_keyboard.h>
-+#include <wlr/types/wlr_touch.h>
- #include <wlr/types/wlr_output.h>
- #include <wlr/types/wlr_box.h>
- #include <wlr/util/edges.h>
-+#include <wayland-server.h>
-+
-+    static constexpr uint32_t WLR_KEY_PRESSED  = WL_KEYBOARD_KEY_STATE_PRESSED;
-+    static constexpr uint32_t WLR_KEY_RELEASED = WL_KEYBOARD_KEY_STATE_RELEASED;
- }
-diff --git a/src/core/opengl.cpp b/src/core/opengl.cpp
-index 09022930..aacb0800 100644
---- a/src/core/opengl.cpp
-+++ b/src/core/opengl.cpp
-@@ -227,25 +227,27 @@ void render_rectangle(wf::geometry_t geometry, wf::color_t color,
- 
- void render_begin()
- {
--    /* No real reason for 10, 10, 0 but it doesn't matter */
--    render_begin(10, 10, 0);
-+    if (!wlr_egl_is_current(wf::get_core_impl().egl))
-+    {
-+        wlr_egl_make_current(wf::get_core_impl().egl);
-+    }
-+
-+    GL_CALL(glEnable(GL_BLEND));
-+    GL_CALL(glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA));
- }
- 
- void render_begin(const wf::framebuffer_base_t& fb)
- {
--    render_begin(fb.viewport_width, fb.viewport_height, fb.fb);
-+    render_begin();
-+    fb.bind();
- }
- 
--void render_begin(int32_t viewport_width, int32_t viewport_height, uint32_t fb)
-+void render_begin(int32_t width, int32_t height, uint32_t fb)
- {
--    if (!wlr_egl_is_current(wf::get_core_impl().egl))
--    {
--        wlr_egl_make_current(wf::get_core_impl().egl, EGL_NO_SURFACE, NULL);
--    }
-+    render_begin();
- 
--    wlr_renderer_begin(wf::get_core_impl().renderer,
--        viewport_width, viewport_height);
--    GL_CALL(glBindFramebuffer(GL_FRAMEBUFFER, fb));
-+    GL_CALL(glBindFramebuffer(GL_DRAW_FRAMEBUFFER, fb));
-+    GL_CALL(glViewport(0, 0, width, height));
- }
- 
- void clear(wf::color_t col, uint32_t mask)
-@@ -257,8 +259,7 @@ void clear(wf::color_t col, uint32_t mask)
- void render_end()
- {
-     GL_CALL(glBindFramebuffer(GL_FRAMEBUFFER, current_output_fb));
--    wlr_renderer_scissor(wf::get_core().renderer, NULL);
--    wlr_renderer_end(wf::get_core().renderer);
-+    GL_CALL(glDisable(GL_SCISSOR_TEST));
- }
- }
- 
-diff --git a/src/core/seat/cursor.cpp b/src/core/seat/cursor.cpp
-index 7ba23b06..d6006f17 100644
---- a/src/core/seat/cursor.cpp
-+++ b/src/core/seat/cursor.cpp
-@@ -160,7 +160,10 @@ void wf::cursor_t::set_cursor(std::string name)
-         name = "left_ptr";
-     }
- 
--    wlr_xcursor_manager_set_cursor_image(xcursor, name.c_str(), cursor);
-+    idle_set_cursor.run_once([name, this] ()
-+    {
-+        wlr_xcursor_manager_set_cursor_image(xcursor, name.c_str(), cursor);
-+    });
- }
- 
- void wf::cursor_t::unhide_cursor()
-@@ -175,6 +178,7 @@ void wf::cursor_t::unhide_cursor()
- 
- void wf::cursor_t::hide_cursor()
- {
-+    idle_set_cursor.disconnect();
-     wlr_cursor_set_surface(cursor, NULL, 0, 0);
-     this->hide_ref_counter++;
- }
-diff --git a/src/core/seat/cursor.hpp b/src/core/seat/cursor.hpp
-index 0c4ab8fe..aec8f1aa 100644
---- a/src/core/seat/cursor.hpp
-+++ b/src/core/seat/cursor.hpp
-@@ -3,6 +3,7 @@
- 
- #include "seat.hpp"
- #include "wayfire/plugin.hpp"
-+#include "wayfire/util.hpp"
- 
- namespace wf
- {
-@@ -28,6 +29,13 @@ struct cursor_t
-     void hide_cursor();
-     int hide_ref_counter = 0;
- 
-+    /**
-+     * Delay setting the cursor, in order to avoid setting the cursor
-+     * multiple times in a single frame and to avoid setting it in the middle
-+     * of the repaint loop (not allowed by wlroots).
-+     */
-+    wf::wl_idle_call idle_set_cursor;
-+
-     /**
-      * Start/stop touchscreen mode, which means the cursor will be hidden.
-      * It will be shown again once a pointer or tablet event happens.
-diff --git a/src/main.cpp b/src/main.cpp
-index bd07d618..0c5e97e7 100644
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -260,7 +260,7 @@ int main(int argc, char *argv[])
-     /** TODO: move this to core_impl constructor */
-     core.display  = display;
-     core.ev_loop  = wl_display_get_event_loop(core.display);
--    core.backend  = wlr_backend_autocreate(core.display, NULL);
-+    core.backend  = wlr_backend_autocreate(core.display);
-     core.renderer = wlr_backend_get_renderer(core.backend);
-     core.egl = wlr_gles2_renderer_get_egl(core.renderer);
-     assert(core.egl);
-diff --git a/src/output/render-manager.cpp b/src/output/render-manager.cpp
-index 2039333c..cb2a38bf 100644
---- a/src/output/render-manager.cpp
-+++ b/src/output/render-manager.cpp
-@@ -1019,8 +1019,12 @@ class wf::render_manager::impl
-             swap_damage |= output_damage->get_wlr_damage_box();
-         }
- 
--        OpenGL::render_begin(postprocessing->get_target_framebuffer());
--        wlr_output_render_software_cursors(output->handle, swap_damage.to_pixman());
-+        OpenGL::render_begin();
-+        wlr_renderer_begin(wf::get_core().renderer,
-+            output->handle->width, output->handle->height);
-+        wlr_output_render_software_cursors(output->handle,
-+            swap_damage.to_pixman());
-+        wlr_renderer_end(wf::get_core().renderer);
-         OpenGL::render_end();
- 
-         /* Part 4: postprocessing effects */
diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template
index a7e80c4239e3..c0fbbfd07089 100644
--- a/srcpkgs/wayfire/template
+++ b/srcpkgs/wayfire/template
@@ -1,10 +1,11 @@
 # Template file for 'wayfire'
 pkgname=wayfire
-version=0.7.0
-revision=3
+version=0.7.1
+revision=1
 _utils_commit=f45641beef46babdc8f1b8d18a924e72beaf8ee6
 _touch_commit=b1075c54a280f913edc26b9757262f4f9d6b62b0
 build_style=meson
+configure_args="-Dprint_trace=false"
 hostmakedepends="pkg-config wayland-devel"
 makedepends="wf-config-devel wlroots-devel cairo-devel
  $(vopt_if image 'libjpeg-turbo-devel libpng-devel')"
@@ -16,10 +17,9 @@ homepage="https://wayfire.org"
 distfiles="https://github.com/WayfireWM/wayfire/archive/v${version}.tar.gz
  https://github.com/WayfireWM/wf-utils/archive/${_utils_commit}.tar.gz
  https://github.com/WayfireWM/wf-touch/archive/${_touch_commit}.tar.gz"
-checksum="b1a94ad2843db19e78cbd361ceebaade4507647ad893d5b5117a9fc7724ce41c
+checksum="96cb7820cddbae962ca456fd1989cdaa00cd880b109bf8e9d667b9264a20c257
  d172f8c21e0bac01e4116cd957fb0159c5cb39ddfdce897beb0d9c753796d5f1
  2b22e03d3a522baeff5798f630ffe5aa95899fd3233b291527503af5fd3e30be"
-patch_args=-Np1
 
 # Optimization for nested STL calls
 CXXFLAGS="-O3"

From b3262206480f9c1ba9278b88c95526eb0128b883 Mon Sep 17 00:00:00 2001
From: Abigail G <dev@kb6.ee>
Date: Thu, 22 Apr 2021 20:09:01 -0400
Subject: [PATCH 1541/2024] chezmoi: update to 2.0.9.

---
 srcpkgs/chezmoi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index bebfed8d5b91..c709c8a46d09 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.0.7
+version=2.0.9
 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=2c4000af2580009abc0057a2a4c6288ea1b61ff16917d6de6640c3bebb47378b
+checksum=74f8510c850511cfe327adadb9796c76851349d83b2df8d3ca4a29b1ed3bc41c
 
 post_install() {
 	vlicense LICENSE

From d6937bcf5445d6830a85517d071659f0db74704c Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Tue, 20 Apr 2021 22:54:21 -0300
Subject: [PATCH 1542/2024] devilutionX: update to 1.2.1

Applied suggested changes

Removed nocross
---
 srcpkgs/devilutionX/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index dfef90b4f407..829ff248926b 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,17 +1,16 @@
 # Template file for 'devilutionX'
 pkgname=devilutionX
-version=1.1.0
+version=1.2.1
 revision=1
 build_style=cmake
-configure_args="-DBINARY_RELEASE=ON -DTTF_FONT_PATH=\"/usr/share/fonts/truetype/CharisSILB.ttf\""
+configure_args="-DVERSION_NUM=$version -DBINARY_RELEASE=ON -DTTF_FONT_PATH=\"/usr/share/fonts/truetype/CharisSILB.ttf\""
 makedepends="SDL2-devel SDL2_ttf-devel SDL2_mixer-devel libsodium-devel"
 short_desc="Diablo I engine for modern operating systems"
 maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
 license="Unlicense"
 homepage="https://github.com/diasurgical/devilutionX"
 distfiles="https://github.com/diasurgical/devilutionX/archive/${version}.tar.gz"
-checksum=395ec298df5383abe60550d45adba5e5811984589ccb1e504891b267b3c467c1
-nocross="https://build.voidlinux.org/builders/aarch64-musl_builder/builds/25453/steps/shell_3/logs/stdio"
+checksum=002dcbd4d4a5bdf8db1a3ec01139e5bfbed46d6a1caa32b17c9f2df161ad3521
 
 post_install() {
 	vlicense LICENSE

From be3e0e8fc64cedcd1cde37716dfa0e59808ccf3f Mon Sep 17 00:00:00 2001
From: Nicolo <nicolo@gmail.com>
Date: Tue, 20 Apr 2021 09:38:47 +0200
Subject: [PATCH 1543/2024] thunderbird: update to 78.10.0

---
 srcpkgs/thunderbird/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index 001956952220..d65081d6ba32 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n".
 #
 pkgname=thunderbird
-version=78.9.1
+version=78.10.0
 revision=1
 build_helper="rust"
 short_desc="Standalone Mail/News reader"
@@ -11,7 +11,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.thunderbird.net/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=6be0daf439ea5aeef0fd1619511cb1af4f1ba056823910475adc17e60069317d
+checksum=65d79a557027a3b52cc672ab9aea8da7131e6373f94657d03f6d6b9c7b36fb45
 
 lib32disabled=yes
 

From 537b0eb0ded5959de3ffc791c543bdbc0e9b4799 Mon Sep 17 00:00:00 2001
From: Nicolo <nicolo@gmail.com>
Date: Tue, 20 Apr 2021 09:40:06 +0200
Subject: [PATCH 1544/2024] thunderbird-i18n: update to 78.10.0

---
 srcpkgs/thunderbird-i18n/template | 112 +++++++++++++++---------------
 1 file changed, 56 insertions(+), 56 deletions(-)

diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template
index bd4fc0c38f89..936c962a1672 100644
--- a/srcpkgs/thunderbird-i18n/template
+++ b/srcpkgs/thunderbird-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'thunderbird-i18n'
 pkgname=thunderbird-i18n
-version=78.9.1
+version=78.10.0
 revision=1
 build_style=meta
 short_desc="Thunderbird language packs"
@@ -96,58 +96,58 @@ _pkgtmpl() {
 	}
 }
 
-checksum="4fddad63b7354b9c6db09428d3f73918d931768f61ae126596ae982ee00a6f9e
- ea442b319837fec3bdbb80cec6ec5095f621caca9c784de70bdcf8a2523802cc
- d93560c0870d361eb7088749dd88e1e61d1c68a4770b487863bb9dfaa770663a
- c568bda96a224835ed6ac5acb0bfa997fa847fe2ef3d5cba8c3258b682d80019
- e1494a55fa057d58d1709275a79a56af4e018f6210159bf8fa1baa1189b5f0e8
- a6243eaaa5e06ee93f242c9d79959cee2b295fc281014de904d8baef2c27c33a
- 5e2f59621dc5af683ad7f436c6838c304a6746956874b6089c25b4831c43a28c
- 3855cac8661f5dc6567729418bbd398a1492b53f71e1af4ce5fa3984ad42a447
- 3f9d4b4d23272213b3ff9640cf053c788907dcd0f780c03439871eb7529d48a7
- 7e334735fce0bf7263b667a1d2003edab972aa83d2f8e7765865f01da28fd6c5
- 138ab3c032ed48178c399c610648f7a5c44579bdee4021446771ac5cab86233f
- 6493bde23c0909295c1e2d784ba317f294bccd3ee9c3a679e999c59bc02899c3
- d579a1c125082e2dbe78cadbe0d0d45f12fff3ade7fe73ce652d23cc3a906dbf
- 9cc6ee40f58a1f6bb8ca8cf965d4a558a2e3f8583474f06e61e34d00c5e342a7
- 3ada2f1216617809b0b3330e6d825a65e2901f9a86bdfc0f41ca0545bd088e8a
- 9bd2900ec74cb8dd306df64032546255d603c9b324de9d057c840b42ee1706bf
- 1b11b00f7fc9380e414af33f62519ca0da1068ad446815768e169b2494e9c8da
- 68f91ed0da57e4783240c500d2a19d3b5de3b21a5dab61444d29926698ebe793
- c1033137d32c87848cdf85d4bf8acef36dfd85b20172f3bc448bed64280f9c6d
- 02062b3925df8c511f313cb973f55c41e1585e6891c95013288d1715d24ddfb7
- a1365e409d1eb897317a39c7513c1703e9fb93595d43a0820a579246381f1605
- d1622c075e451eb5b87cd1ba9a19c0abc36289d99b33dfbba6831df7ce8b3f53
- 3ac54f983ae0adc2395266f6a882ac56583c87ab3f6345257c507835c0c2d14e
- a86188f64f643175d760bac1086b6b466a4a657425596cd79987a76ced42a8d9
- 8a0cf55c1eff56cb5c6be354b96bab973c9852dcdb39446822c0eaa555b950ef
- 4ef44068b021fd2cc15cae58bbda4ca86fdf3f7b2ffe23a86d32cc8040baead3
- 09e81eeaa1ade640d7788fc927c58a0a290fbbc84f250e2e954e594c8466b528
- dd5791a364b2bd4901d337ce58f4cacc4640acbb116d98d3b38ab13ac57bfc64
- 3073815242bab5a49d6c9412f963e7fbeff8da1bc5f7655c66a093ee0459dff6
- 5eb605f125548132cb9e9ce65682708423f31bbaf84767d87d0c743014004563
- c85771a299ed01b440d8354d7220cd52f489d0a7364c5e1769b178adc27c3d17
- adec1b156f39f7f2e0aa6a7fe19179734629077a7e7d387332bdc2cbd205ff40
- b50c4d047c042194c8150b005f5e3666bebcc22fe7785ca79874ef3ef1a66380
- 6ccecfd19cf3ba6dff2da883812bff303f0b36001d9ae2663dc3d2cb1fd87363
- 15b2744ebbcb1c6b2a935821f3059265e79678fbe34a07dba2525c7a3a160eb6
- 44069899ee9f6bf19e4b4a9cd63d83fc61c7f8a882f24ff34d5161a7dbf8ae15
- 24986599a7cc2cf57d703b6d72c2aecad593dc08b2e0184770e7a283e6f7f7b8
- 104f713c761beb7de9d7b5aa8be3dfad23f6864a5ba0f67823cd61e31979ef57
- a4d5d0cc0cdad59f66b6d9f76029059e29619c838f022e322046ac210f963ac9
- 4b1e917f5839f21a73e5595021c07573238df0212a984a5467adfd637cecd64c
- f173d29ec6506635a622818b7e5cf2a11b0b7b5041daf555a930410f9d5cbf4b
- 5699f89669e88c82a656488b4ad27d18beccb4db1a2293602d1e742628315a67
- 842afff69b6fcac17e603a706b1d196aa3b4b875ff5139feb4c39324c2244563
- de2499e4e04ed0bff3bc852f5e85baf60e4223d68cd323375d3df87f2828801d
- 47cc9d5e63e5e99c066dba6bd1db440fbf6cd2885ed51af9bc021df892e4cdea
- 89341fe50ff3655e7c41b8ad3097aaa745752f048739ac21652304e805491ac1
- fc23e405ed4711c4b184f238e58b2be8705664e22038201deba674efd2315a15
- b52ee3d71341f581b2b1b82764fb6d98e59bcd5d5564ad069b0f6220c82385dd
- 29473e268c7a89302844a313f0ba1be93580a3aa5c11e78469fc1e73c6b14e50
- 3d1f7950d66db5d01b3972ccee16056bc495866eff57b8c7434121d5fb54fa14
- 59027c47928ccd0a326194dedffcffa2cdc1d73e9ee8d9e7edb87f9e0d8a4d37
- cba44dee27d9a1bccbd23fcf46080e3e2e2d8b2e2bacd5414542f10824d9a969
- de72ecf79efdd8fd97ead8af456fe02eee3725f5b41d96cb0c5c1e391a32e65a
- 6f9d8cb48f7845874219c6cef403d037d52ef4f465e62494e53d43e640b7e1f7
- 8c5e997ca6a2a512d3ad72424d0bed9d6e9adddacaed5151ad153529e28cb67e"
+checksum="b22803c6717d1a832bd085660b7b892fe55b604f9eb486bfa5d97e6a84b9d116
+ 8641331581f4140251ba09e0dd5f680c53e61ca6b363129579631289a4dccf50
+ c4f9e576072471ed7f47d3c20da24e5b4629daebb2261edb336e30a92c3d5940
+ 24b37b2e6515fe9213e8f6fdfe762d02db6ec4e39a82e82df0fe8c82e5148157
+ 53874515986b698b356df97538a04b58528f31b5faa5f6f7d0e65d629fa10ab0
+ d85088127e958276f71496fd9efb30dd7b79393a15e6f224df2d3a8d92414196
+ 7d4dd6ce20c039d8f2d2a4a15d6d5ae4819631be9ef8b56844bd33befab99cfd
+ 97159d84019af8aa99020acb009723f6bbef39aa8c1395c8c074370a99178a0f
+ 6957f539b22df2598dc0be339f329870f3430f16652486090a210b33c9591c7e
+ 3d9a64e42b186ec5a2d40ad6cef7174271b852878f1bba6426ebadd2d2c262f2
+ 78c7df6b56b830b90cd77dc7bdeb1a3c75018166b748695eb0fa045b603477ce
+ f55f5aa1a75b002198b85122a7dadf60fdc7c766b53de9969d6062341ec3a13c
+ b143ffde6ca738614dd511381bba6153d037d25426ff9f0199b9ffb0e189a8f4
+ c968c485b441bb2363c7f6f9beb2310976190fd3aedb939031f9bd14183ef911
+ 2f1d94c06901d11346a5316ffffbb6f3198aff5711de5adc53b335fef6c46223
+ 75fad100352d904bbeabe3c90759f2cbee1b197cb4d3ba2434879cd3fde0fcfc
+ 2bbbf5583014c2c895619da5b96551ef5e2b79f85200c7db0f065e3e1aa5eb2c
+ 1be39f436f87db7af1c487207a511c3b1033a82e7a9d956fc3cff0d618733445
+ 483ce87e775982c955a2d3b4e5ef7c154bb2e41d21a1fe47c8f407cdceaea6ed
+ b46821be66ccde4535cb581787354aa80bd0c516c019b297ef32fdcc86b67251
+ 511d277d22b9d4c81e7f62d69389ae23a1b9c166f7d04e1e5b37ca379404a1d1
+ c8d5c713fbcdc040e8e72bfe11472446f9d831775ebc673264fe0186108fef2a
+ ecd0089f4b26be96ac1c6a34699d014bab71b8b28f2dfb2657981e917999f9ed
+ 5befa2011017a0fc4e8ecf1c9a3edf43c6c8c086ac803d905304ac03b908c596
+ 0bac411a13f004e92dcc46470bde318bdb687a4b8563145d6575825ccc268dcf
+ 523fcd991a53436e77abc54fb0332246eaa515d25bf1011df5804ac1a169fe51
+ b08a98ab295ee551fad1b3100387bc2dcbcee3ec086cba0538912ea4247db45a
+ 1940ee0c7cbdb4b4e54821d97be26a00b0dba6ca8e694341bc95ec097bf72837
+ de7bd652ba9fa4de28cbce19d2075228fc2b68f0a088149b1040e77016e83246
+ 4309c1f47d25fd033202c39ba35dc16f393acfc4d83e5018257271db4dc55ac7
+ eeb68e89171558bdf33931550c4176a13e7b68f24036eb48fe2cfdea1b1bdae6
+ 9a9ee81b50561fa4fdae9e10370fc955e50295f4870474043dde45cb45e930c3
+ 0f7d20d579a61c5b2e5e8d379b93190aff6e32b0bf1120fc9cc5a31d80578353
+ 7040a0c09e1565b41cce2b17a59527f7dc708a05586430608b5f6310b7d06597
+ bbf3f5d233219a67b0d10a9c249ded74fec8fd68be24e89cb8f1e2b0e94c03b3
+ 51f0f1668dd4fed8d9343d77492b6ea88c218e975d31e8cb92d6cfede529b9fa
+ fb98640ea0e1711410e6bfdcb95ba5f8314c5f821730c0f5c95edf6275440eae
+ 4c41f47ea1546bca94a5a2a9840679a69a1341846f463b5935fec9fec7159ed3
+ e307047b9909c6c3d013d234c6914399298fd668eed2112210eae3ae9b3ac34c
+ b286e6c44507faa9545c064fe57536ed876cbcf2c38a578693f4de251fc3c054
+ 32279bdbbe33c9a4b31da100c6f707886ccd2abec50a46ea820fb2582960d618
+ 6ca81fe7b59e281ca61caf28cb2786f007be108afa1e8267f018ff12b7fe3c45
+ 6a3e9e7e254efb6bfe7d3ca76f330ed21fd04b667272aca8bda1ee28499b3587
+ f78d8984b15716ab42d29ca3d807f181cf613fe8c760fe39c219bce3bf1e50a4
+ cab66584c10594314cdf5d48fc7af44eb361853917095d179ab58376f87ffa71
+ f9755650f432d1c8223bf6b08596b70b34788c1f0e214e9a4b8a1bb160fdcd5a
+ d4b525ac48b5cacb695844e71d128173ab1816af8da4f97bd0c940abd954bc11
+ 0597ed6be1da91983d9ccbd98c7600a810faacaaa46ea73cb377feba4c94f88d
+ 9f78c6dd107957101e227c496ab7b5c269f635635f23a84fc905de1bbeb32890
+ af8402fb763fc4b9187c67ee555b67b4cec6dbbfe0d0be00e05513875af0451c
+ c15da2439ca323568a33b599baceb1d30ec5b0e6f5a6784face9042f2a146914
+ 8301d24d09270a4a45f7dc775dcfc10f701ab86957fa630a0abd5257a1f40471
+ b6b6a2f77efb288a0b93d0ae1429b5139614d2f58e9e1434e60dc80768fd7bcc
+ 9728ba07830c0654fd34df20059e712cf9944909e7b36ee676234ac66e7dbb99
+ 77f570116788269af21d626b9d0eb40ab0e548bb6abcaf45a228d39c9dc7cd40"

From 22b174c7517eea46425f76ad603108e741fd64de Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Tue, 20 Apr 2021 13:26:57 +0200
Subject: [PATCH 1545/2024] sshpass: update to 1.09.

---
 srcpkgs/sshpass/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/sshpass/template b/srcpkgs/sshpass/template
index 9aa8eba43f02..38ab9c6bc5bc 100644
--- a/srcpkgs/sshpass/template
+++ b/srcpkgs/sshpass/template
@@ -1,11 +1,11 @@
 # Template file for 'sshpass'
 pkgname=sshpass
-version=1.06
-revision=2
+version=1.09
+revision=1
 build_style=gnu-configure
 short_desc="Non-interactive ssh password auth"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="http://sshpass.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/${pkgname}-${version}.tar.gz"
-checksum=c6324fcee608b99a58f9870157dfa754837f8c48be3df0f5e2f3accf145dee60
+checksum=71746e5e057ffe9b00b44ac40453bf47091930cba96bbea8dc48717dedc49fb7

From 95b803ffbd363508b144dcd90d3f5fdf9df2aaf2 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Tue, 20 Apr 2021 13:29:08 +0200
Subject: [PATCH 1546/2024] mtools: update to 4.0.27.

---
 srcpkgs/mtools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mtools/template b/srcpkgs/mtools/template
index ee6656642915..0fb724b9ac3c 100644
--- a/srcpkgs/mtools/template
+++ b/srcpkgs/mtools/template
@@ -1,6 +1,6 @@
 # Template file for 'mtools'
 pkgname=mtools
-version=4.0.26
+version=4.0.27
 revision=1
 build_style=gnu-configure
 makedepends="acl-devel"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/mtools"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=539f1c8b476a16e198d8bcb10a5799e22e69de49d854f7dbd85b64c2a45dea1a
+checksum=9c88c8d9244e54768e40b92c005e61ec4e084ea7c070df9184caf1a6408838b3
 conf_files="/etc/mtools.conf"
 
 post_install() {

From a16f4737e8235b60ca6125756b0ab78ade74fa0e Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Tue, 20 Apr 2021 13:29:28 +0200
Subject: [PATCH 1547/2024] irqbalance: update to 1.8.0.

---
 srcpkgs/irqbalance/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/irqbalance/template b/srcpkgs/irqbalance/template
index 207153826867..e01131819836 100644
--- a/srcpkgs/irqbalance/template
+++ b/srcpkgs/irqbalance/template
@@ -1,6 +1,6 @@
 # Template file for 'irqbalance'
 pkgname=irqbalance
-version=1.7.0
+version=1.8.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Irqbalance/irqbalance"
 distfiles="https://github.com/Irqbalance/irqbalance/archive/v${version}.tar.gz"
-checksum=28f2ad35945b93d90f4a5bad95b4c0871a0f644375f746ec16f61045b9ec970e
+checksum=2e7ddb9687a6a5cc1f41626659eac2ad9d6b5875629156b92f693bd404d8ae63
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*|ppc64*) makedepends+=" libnuma-devel";;

From 66aeb63550787199e64ec016fdcd064fc443c246 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Tue, 20 Apr 2021 13:29:59 +0200
Subject: [PATCH 1548/2024] lua54: update to 5.4.3.

---
 srcpkgs/lua54/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lua54/template b/srcpkgs/lua54/template
index 1eddc5ceb30a..47d4425cd63f 100644
--- a/srcpkgs/lua54/template
+++ b/srcpkgs/lua54/template
@@ -1,6 +1,6 @@
 # Template file for 'lua54'
 pkgname=lua54
-version=5.4.2
+version=5.4.3
 revision=1
 wrksrc=lua-${version}
 makedepends="ncurses-devel readline-devel"
@@ -9,7 +9,7 @@ maintainer="q66 <daniel@octaforge.org>"
 license="MIT"
 homepage="https://www.lua.org"
 distfiles="https://www.lua.org/ftp/lua-${version}.tar.gz"
-checksum=11570d97e9d7303c0a59567ed1ac7c648340cd0db10d5fd594c09223ef2f524f
+checksum=f8612276169e3bfcbcfb8f226195bfc6e466fe13042f1076cbde92b7ec96bbfb
 
 alternatives="
  lua:lua:/usr/bin/lua5.4

From d1561ca5c551215e009dc0f737bc966df69eca3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Thu, 22 Apr 2021 21:34:16 -0300
Subject: [PATCH 1549/2024] peshming: mark broken temporarily.

The checksum changed between CI for the PR running and it being merged,
so there isn't a previous version to compare to.
---
 srcpkgs/peshming/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/peshming/template b/srcpkgs/peshming/template
index d1a45ad0a6e6..4d63e9460344 100644
--- a/srcpkgs/peshming/template
+++ b/srcpkgs/peshming/template
@@ -1,3 +1,5 @@
+broken="checksum changed, can't compare with old one"
+
 # Template file for 'peshming'
 pkgname=peshming
 version=0.3.0

From 8e06b8ae94c640715d179f0bec795c0895186c78 Mon Sep 17 00:00:00 2001
From: Abigail G <dev@kb6.ee>
Date: Thu, 22 Apr 2021 20:45:12 -0400
Subject: [PATCH 1550/2024] chezmoi: update to 2.0.10.

---
 srcpkgs/chezmoi/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index c709c8a46d09..eaad865e0f96 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,9 +1,9 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.0.9
+version=2.0.10
 revision=1
 build_style=go
-go_import_path="github.com/twpayne/chezmoi"
+go_import_path="github.com/twpayne/chezmoi/v2"
 go_build_tags="noembeddocs noupgrade"
 go_ldflags="-X main.version=${version} -X main.commit=v${version} -X main.builtBy=xbps
  -X github.com/twpayne/chezmoi/cmd.DocsDir=/usr/share/doc/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=74f8510c850511cfe327adadb9796c76851349d83b2df8d3ca4a29b1ed3bc41c
+checksum=2baff338f656b209502329327764d3f8dd5808f53303a13f3be6d48d076df9a3
 
 post_install() {
 	vlicense LICENSE

From 438d4e751e349d67ba5cb416a2dd6e83d74a48c2 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Tue, 20 Apr 2021 13:27:25 +0200
Subject: [PATCH 1551/2024] tinyproxy: update to 1.11.0.

---
 srcpkgs/tinyproxy/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tinyproxy/template b/srcpkgs/tinyproxy/template
index ccb5af467ebd..8451b63ce901 100644
--- a/srcpkgs/tinyproxy/template
+++ b/srcpkgs/tinyproxy/template
@@ -1,7 +1,7 @@
 # Template file for 'tinyproxy'
 pkgname=tinyproxy
-version=1.10.0
-revision=2
+version=1.11.0
+revision=1
 build_style=gnu-configure
 configure_args="--enable-transparent --localstatedir=/var tinyproxy_cv_regex_broken=no"
 hostmakedepends="asciidoc"
@@ -10,7 +10,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://tinyproxy.github.io/"
 distfiles="https://github.com/tinyproxy/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz"
-checksum=59be87689c415ba0d9c9bc6babbdd3df3b372d60b21e526b118d722dbc995682
+checksum=c1ec81cfc4c551d2c24e0227a5aeeaad8723bd9a39b61cd729e516b82eaa3f32
 system_accounts="_tinyproxy"
 conf_files="/etc/tinyproxy/tinyproxy.conf"
 make_dirs="/var/log/tinyproxy 755 _tinyproxy _tinyproxy"

From 4441ba0803cb1df11ebe265a721d1f57386e61c8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Wed, 21 Apr 2021 20:26:31 +0200
Subject: [PATCH 1552/2024] libextractor: update to 1.11.

---
 srcpkgs/libextractor/patches/exiv-0.27.patch | 127 -------------------
 srcpkgs/libextractor/template                |   7 +-
 2 files changed, 3 insertions(+), 131 deletions(-)
 delete mode 100644 srcpkgs/libextractor/patches/exiv-0.27.patch

diff --git a/srcpkgs/libextractor/patches/exiv-0.27.patch b/srcpkgs/libextractor/patches/exiv-0.27.patch
deleted file mode 100644
index cfdb6426408d..000000000000
--- a/srcpkgs/libextractor/patches/exiv-0.27.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-From bbe21db4bf8face03adf0efd2eb18540582cb5ba Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 30 Dec 2018 00:46:57 +0100
-Subject: [PATCH] Fix build with exiv2-0.27
-
----
- src/plugins/exiv2_extractor.cc | 35 +++++++++++++++++++++++++++-------
- 1 file changed, 28 insertions(+), 7 deletions(-)
-
-diff --git a/src/plugins/exiv2_extractor.cc b/src/plugins/exiv2_extractor.cc
-index 8741d40..ef402a8 100644
---- a/src/plugins/exiv2_extractor.cc
-+++ b/src/plugins/exiv2_extractor.cc
-@@ -27,10 +27,7 @@
- #include <cassert>
- #include <cstring>
- #include <math.h>
--#include <exiv2/exif.hpp>
--#include <exiv2/error.hpp>
--#include <exiv2/image.hpp>
--#include <exiv2/futils.hpp>
-+#include <exiv2/exiv2.hpp>
- 
- /**
-  * Enable debugging to get error messages.
-@@ -180,7 +177,7 @@ public:
-    *
-    * @return -1 on error
-    */
--#if EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,26,0)
-+#if EXIV2_TEST_VERSION(0,26,0)
-   virtual size_t size (void) const;
- #else
-   virtual long int size (void) const;
-@@ -316,7 +313,11 @@ ExtractorIO::getb ()
-   const unsigned char *r;
- 
-   if (1 != ec->read (ec->cls, &data, 1))
-+#if EXIV2_TEST_VERSION(0,27,0)
-+    throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed);
-+#else
-     throw Exiv2::BasicError<char> (42 /* error code */);
-+#endif
-   r = (const unsigned char *) data;
-   return *r;
- }
-@@ -371,7 +372,11 @@ ExtractorIO::putb (Exiv2::byte data)
- void
- ExtractorIO::transfer (Exiv2::BasicIo& src)
- {
-+#if EXIV2_TEST_VERSION(0,27,0)
-+    throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed);
-+#else
-   throw Exiv2::BasicError<char> (42 /* error code */);
-+#endif
- }
- 
- 
-@@ -416,7 +421,11 @@ ExtractorIO::seek (long offset,
- Exiv2::byte *
- ExtractorIO::mmap (bool isWritable)
- {
-+#if EXIV2_TEST_VERSION(0,27,0)
-+    throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed);
-+#else
-   throw Exiv2::BasicError<char> (42 /* error code */);
-+#endif
- }
- 
- 
-@@ -449,7 +458,7 @@ ExtractorIO::tell (void) const
-  *
-  * @return -1 on error
-  */
--#if EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,26,0)
-+#if EXIV2_TEST_VERSION(0,26,0)
- size_t
- #else
- long int
-@@ -504,7 +513,11 @@ ExtractorIO::eof () const
- std::string
- ExtractorIO::path () const
- {
-+#if EXIV2_TEST_VERSION(0,27,0)
-+    throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed);
-+#else
-   throw Exiv2::BasicError<char> (42 /* error code */);
-+#endif
- }
- 
- 
-@@ -517,7 +530,11 @@ ExtractorIO::path () const
- std::wstring
- ExtractorIO::wpath () const
- {
-+#if EXIV2_TEST_VERSION(0,27,0)
-+    throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed);
-+#else
-   throw Exiv2::BasicError<char> (42 /* error code */);
-+#endif
- }
- #endif
- 
-@@ -531,7 +548,11 @@ Exiv2::BasicIo::AutoPtr
- ExtractorIO::temporary () const
- {
-   fprintf (stderr, "throwing temporary error\n");
-+#if EXIV2_TEST_VERSION(0,27,0)
-+    throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed);
-+#else
-   throw Exiv2::BasicError<char> (42 /* error code */);
-+#endif
- }
- 
- 
-@@ -697,7 +718,7 @@ EXTRACTOR_exiv2_extract_method (struct EXTRACTOR_ExtractContext *ec)
- {
-   try
-     {
--#if EXIV2_MAKE_VERSION(0,23,0) <= EXIV2_VERSION
-+#if !EXIV2_TEST_VERSION(0,24,0)
-       Exiv2::LogMsg::setLevel (Exiv2::LogMsg::mute);
- #endif
-       std::auto_ptr<Exiv2::BasicIo> eio(new ExtractorIO (ec));
--- 
-2.20.1
-
diff --git a/srcpkgs/libextractor/template b/srcpkgs/libextractor/template
index bd7af6f78dec..884dbd8c09e8 100644
--- a/srcpkgs/libextractor/template
+++ b/srcpkgs/libextractor/template
@@ -1,20 +1,19 @@
 # Template file for 'libextractor'
 pkgname=libextractor
-version=1.9
+version=1.11
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config"
-#FIXME: Build without gsf support for now, ole2_extractor.c causes GCC sigfault
 makedepends="zlib-devel bzip2-devel exiv2-devel tiff-devel libpng-devel
  libjpeg-turbo-devel libvorbis-devel libflac-devel giflib-devel libmpeg2-devel
- ffmpeg-devel gtk+3-devel libltdl-devel libarchive-devel file-devel"
+ ffmpeg-devel gtk+3-devel libltdl-devel libarchive-devel file-devel libgsf-devel"
 short_desc="Library used to extract meta data from files"
 maintainer="Martin Riese <grauehaare@gmx.de>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/libextractor/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=f08f257d26c5e9b503f068d6753c8e55cb76f47f73a81da6ed2bba3de3fee2ff
+checksum=16f633ab8746a38547c4a1da3f4591192b0825ad83c4336f0575b85843d8bd8f
 patch_args="-Np1"
 
 post_install() {

From 48b18b1787fbd32d43ff58c2872ab4ea79f17354 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 23 Apr 2021 10:00:32 +0200
Subject: [PATCH 1553/2024] peshming: update to 0.4.0.

---
 srcpkgs/peshming/template | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/peshming/template b/srcpkgs/peshming/template
index 4d63e9460344..299d243509fe 100644
--- a/srcpkgs/peshming/template
+++ b/srcpkgs/peshming/template
@@ -1,8 +1,6 @@
-broken="checksum changed, can't compare with old one"
-
 # Template file for 'peshming'
 pkgname=peshming
-version=0.3.0
+version=0.4.0
 revision=1
 wrksrc="peshming"
 build_style=cargo
@@ -12,7 +10,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="AGPL-3.0-only"
 homepage="https://git.jcg.re/jcgruenhage/peshming"
 distfiles="https://git.jcg.re/jcgruenhage/peshming/archive/v${version}.tar.gz"
-checksum=c04b23b803ff379f6c1f691aaf0a20f2e7a9c5be6c24d0ac70e504f4dabe55e3
+checksum=fd2d3eae35746f513006a34757d00e50d15042df54187f886c553e748985319d
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From 8c2a5f0b6d9d00d61d97848e0342ec484dd5d2b8 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, 18 Apr 2021 08:18:00 +0700
Subject: [PATCH 1554/2024] refind: update to 0.13.2.

---
 srcpkgs/refind/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/refind/template b/srcpkgs/refind/template
index f592c67e1646..49d462907523 100644
--- a/srcpkgs/refind/template
+++ b/srcpkgs/refind/template
@@ -1,6 +1,6 @@
 # Template file for 'refind'
 pkgname=refind
-version=0.13.1
+version=0.13.2
 revision=1
 archs="x86_64* i686* aarch64*"
 makedepends="gnu-efi-libs"
@@ -10,7 +10,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-3.0-only, BSD-3-Clause, BSD-2-Clause, GPL-2.0-only, LGPL-2.1-only"
 homepage="https://sourceforge.net/projects/refind/"
 distfiles="${SOURCEFORGE_SITE}/refind/refind-src-${version}.tar.gz"
-checksum=291a81f2e2c7f68a4f6abd92c998290de20b39886871ebc9cc19e7912b8856fa
+checksum=dd58944854a42df5a2a943f15e5dcfd995808f28580df96ad39d68fb1e48c970
 python_version=2
 conf_files="/etc/default/refind-kernel-hook.conf"
 

From 8aa67fefb10cca96aa7e92179b2e479bd9f0da36 Mon Sep 17 00:00:00 2001
From: Joey <joey@imap.cc>
Date: Thu, 22 Apr 2021 02:20:28 -0400
Subject: [PATCH 1555/2024] python-hyperlink: update to 21.0.0.

---
 srcpkgs/python-hyperlink/template | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/python-hyperlink/template b/srcpkgs/python-hyperlink/template
index eb2799306a58..412cc5c0fb46 100644
--- a/srcpkgs/python-hyperlink/template
+++ b/srcpkgs/python-hyperlink/template
@@ -1,18 +1,24 @@
 # Template file for 'python-hyperlink'
 pkgname=python-hyperlink
-version=19.0.0
-revision=4
+version=21.0.0
+revision=1
 wrksrc="hyperlink-${version}"
 build_style=python-module
-pycompile_module="hyperlink"
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python-idna"
+checkdepends="python-idna python-typing python-pytest python-mock
+ python3-idna python3-pytest"
 short_desc="Pure-Python implementation of immutable URLs (Python2)"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="MIT"
 homepage="https://github.com/python-hyper/hyperlink"
 distfiles="${PYPI_SITE}/h/hyperlink/hyperlink-${version}.tar.gz"
-checksum=4288e34705da077fada1111a24a0aa08bb1e76699c9ce49876af722441845654
+checksum=427af957daa58bc909471c6c40f74c5450fa123dd093fc53efd2e91d2705a56b
+
+do_check() {
+	python3 -m pytest build-${py3_ver}
+	# python 2 tests fail
+}
 
 post_install() {
 	vlicense LICENSE
@@ -20,11 +26,9 @@ post_install() {
 
 python3-hyperlink_package() {
 	depends="python3-idna"
-	pycompile_module="hyperlink"
 	short_desc="${short_desc/Python2/Python3}"
 	pkg_install() {
 		vmove usr/lib/python3*
 		vlicense LICENSE
 	}
 }
-

From 853e2dcf4343718a43f161964b462929db605e92 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Fri, 23 Apr 2021 12:40:25 +0200
Subject: [PATCH 1556/2024] python3-astroid: update to 2.5.3.

---
 srcpkgs/python3-astroid/template | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/python3-astroid/template b/srcpkgs/python3-astroid/template
index b46bab1b0143..a8fb9a7017fc 100644
--- a/srcpkgs/python3-astroid/template
+++ b/srcpkgs/python3-astroid/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-astroid'
 pkgname=python3-astroid
-version=2.4.2
-revision=3
+version=2.5.3
+revision=1
 wrksrc="astroid-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,15 +13,6 @@ short_desc="Abstract syntax tree for Python3"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://github.com/PyCQA/astroid"
+changelog="https://raw.githubusercontent.com/PyCQA/astroid/master/ChangeLog"
 distfiles="${PYPI_SITE}/a/astroid/astroid-${version}.tar.gz"
-checksum=2f4078c2a41bf377eea06d71c9d2ba4eb8f6b1af2135bec27bbbb7d8f12bb703
-
-post_patch() {
-	vsed -i -e 's/lazy_object_proxy.*"/lazy_object_proxy"/' \
-		astroid/__pkginfo__.py
-}
-
-post_install() {
-	# no tests
-	rm -rf ${DESTDIR}/usr/lib/python*/site-packages/astroid/tests
-}
+checksum=ad63b8552c70939568966811a088ef0bc880f99a24a00834abd0e3681b514f91

From e73fea2cec3f100dfcda2f8477b8ff252275ee22 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Fri, 23 Apr 2021 12:48:41 +0200
Subject: [PATCH 1557/2024] pylint: update to 2.7.4.

---
 srcpkgs/pylint/template | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/pylint/template b/srcpkgs/pylint/template
index 379c67948b76..e2c275d029dd 100644
--- a/srcpkgs/pylint/template
+++ b/srcpkgs/pylint/template
@@ -1,7 +1,7 @@
 # Template file for 'pylint'
 pkgname=pylint
-version=2.6.0
-revision=4
+version=2.7.4
+revision=1
 wrksrc="pylint-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,13 +11,10 @@ short_desc="Python code static checker"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.pylint.org/"
+changelog="https://raw.githubusercontent.com/PyCQA/pylint/master/ChangeLog"
 distfiles="${PYPI_SITE}/p/pylint/pylint-${version}.tar.gz"
-checksum=bb4a908c9dadbc3aac18860550e870f58e1a02c9f2c204fdf5693d73be061210
-
-do_check() {
-	# tests fail
-	: #python3 -m pytest
-}
+checksum=bd38914c7731cdc518634a8d3c5585951302b6e2b6de60fbb3f7a0220e21eeee
+make_check=no
 
 post_install() {
 	# no tests

From 1fcfad34b07276f707e59245e35ff1743ce43d46 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Fri, 23 Apr 2021 11:56:44 +0200
Subject: [PATCH 1558/2024] android-udev-rules: update to 20210302.

---
 srcpkgs/android-udev-rules/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/android-udev-rules/template b/srcpkgs/android-udev-rules/template
index b9113d3cb127..d49283dc10fd 100644
--- a/srcpkgs/android-udev-rules/template
+++ b/srcpkgs/android-udev-rules/template
@@ -1,13 +1,13 @@
 # Template file for 'android-udev-rules'
 pkgname=android-udev-rules
-version=20200613
-revision=2
+version=20210302
+revision=1
 short_desc="Android udev rules list aimed to be the most comprehensive on the net"
 maintainer="Rien Maertens <rien.maertens@posteo.be>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/M0Rf30/android-udev-rules"
 distfiles="https://github.com/M0Rf30/android-udev-rules/archive/${version}.tar.gz"
-checksum=8c7fad8cf97fe106f826f07aa9f033e9aa9ee69422b35dada6d9d2df878b5473
+checksum=57c8f8d05492e407485f70a4c571a75d6a28d47b97debc8b279819ff82f19b5b
 system_groups="adbusers"
 
 do_install() {

From 2c946c1f46f543f325856291543c30346b106bbc Mon Sep 17 00:00:00 2001
From: Joey <joey@imap.cc>
Date: Fri, 23 Apr 2021 00:21:09 -0400
Subject: [PATCH 1559/2024] python3-txaio: update to 21.2.1.

---
 srcpkgs/python3-txaio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-txaio/template b/srcpkgs/python3-txaio/template
index e9b27b0a6886..4de2e16894fc 100644
--- a/srcpkgs/python3-txaio/template
+++ b/srcpkgs/python3-txaio/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-txaio'
 pkgname=python3-txaio
-version=20.12.1
+version=21.2.1
 revision=1
 wrksrc="txaio-${version}"
 build_style=python3-module
@@ -10,7 +10,7 @@ maintainer="travankor <travankor@tuta.io>"
 license="MIT"
 homepage="https://github.com/crossbario/txaio"
 distfiles="https://github.com/crossbario/txaio/archive/v${version}.tar.gz"
-checksum=51796ed894c7fca3f15d60f2e42aec0bd933112073de748e4fe67faf62a03387
+checksum=ca6f62d244ec3581b71c5c1f808a8b4a48f35cc02591b2c7c1eba7970d76cb6c
 
 do_check() {
 	# Depends on deprecated and unmaintained trollius package

From 8f7c43d0cebde29746ad111d3426f222fd0599ca Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 23 Apr 2021 08:54:47 +0300
Subject: [PATCH 1560/2024] openvpn: update to 2.5.2.

---
 srcpkgs/openvpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template
index cbad158b7c7f..31a9679a33f1 100644
--- a/srcpkgs/openvpn/template
+++ b/srcpkgs/openvpn/template
@@ -1,6 +1,6 @@
 # Template file for 'openvpn'
 pkgname=openvpn
-version=2.5.1
+version=2.5.2
 revision=1
 build_style=gnu-configure
 configure_args="$(vopt_enable pkcs11) --disable-systemd
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://www.openvpn.net"
 distfiles="http://build.openvpn.net/downloads/releases/${pkgname}-${version}.tar.xz"
-checksum=40930489c837c05f6153f38e1ebaec244431ef1a034e4846ff732d71d59ff194
+checksum=b12743836901f365efaf82ab2493967e1b21c21eb43ce9a8da1002a17c9c1dc8
 
 build_options="mbedtls pkcs11"
 build_options_default="pkcs11"

From 133e85be091fe763db25bfee41cc9389a48583d9 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 23 Apr 2021 09:23:39 +0300
Subject: [PATCH 1561/2024] libXt: update to 1.2.1.

---
 srcpkgs/libXt/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libXt/template b/srcpkgs/libXt/template
index 58170e13c630..a3a7f24e0005 100644
--- a/srcpkgs/libXt/template
+++ b/srcpkgs/libXt/template
@@ -1,17 +1,17 @@
-# Template build file for 'libXt'.
+# Template file for 'libXt'
 pkgname=libXt
-version=1.2.0
+version=1.2.1
 revision=1
 build_style=gnu-configure
 configure_args="--enable-malloc0returnsnull"
 hostmakedepends="pkg-config xorgproto"
 makedepends="xorgproto libSM-devel libX11-devel"
 short_desc="X Toolkit Intrinsics library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="MIT"
 homepage="http://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
-checksum=b31df531dabed9f4611fc8980bc51d7782967e2aff44c4105251a1acb5a77831
+checksum=679cc08f1646dbd27f5e48ffe8dd49406102937109130caab02ca32c083a3d60
 
 post_install() {
 	vlicense COPYING

From faa57bbcd80ecad162d417bfd3d863eb54e6a91d Mon Sep 17 00:00:00 2001
From: Kyra Zimmer <me@nonchip.de>
Date: Fri, 23 Apr 2021 09:24:30 +0200
Subject: [PATCH 1562/2024] godot: update to 3.3.

---
 srcpkgs/godot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index 9be5b1ab40a0..2f86a7d36b4e 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,6 +1,6 @@
 # Template file for 'godot'
 pkgname=godot
-version=3.2.3
+version=3.3
 revision=1
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 wrksrc="${pkgname}-${version}-stable"
@@ -27,7 +27,7 @@ maintainer="Nick Hahn <nick.hahn@hotmail.de>"
 license="MIT"
 homepage="https://www.godotengine.org/"
 distfiles="https://github.com/godotengine/${pkgname}/archive/${version}-stable.tar.gz"
-checksum=4c2a8e7da1ad05c6223b0ff6cf2be124dad6708b56a8ec9910dc2aaf82a553ae
+checksum=595ff16eaef3d0b6c030575f4b7fcae8b805e407b90a2f71af3e4142362c1794
 nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio
 
 CFLAGS+=" -fPIE -fPIC"

From a5694a908ff08d9aafc1a174932dfa6412a05aba 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, 18 Apr 2021 08:40:42 +0700
Subject: [PATCH 1563/2024] python3-Sphinx: update to 3.5.4.

---
 srcpkgs/python3-Sphinx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-Sphinx/template b/srcpkgs/python3-Sphinx/template
index 290850ec55f4..bd2ddebd37d6 100644
--- a/srcpkgs/python3-Sphinx/template
+++ b/srcpkgs/python3-Sphinx/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-Sphinx'
 pkgname=python3-Sphinx
-version=3.5.1
+version=3.5.4
 revision=1
 wrksrc=Sphinx-${version}
 build_style=python3-module
@@ -18,7 +18,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-3-Clause"
 homepage="http://sphinx-doc.org"
 distfiles="${PYPI_SITE}/S/Sphinx/Sphinx-${version}.tar.gz"
-checksum=11d521e787d9372c289472513d807277caafb1684b33eb4f08f7574c405893a9
+checksum=19010b7b9fa0dc7756a6e105b2aacd3a80f798af3c25c273be64d7beeb482cb1
 conflicts="python-Sphinx>=0"
 
 do_check() {

From 6fd4fb1e760de7e6f5bae307066269ab0279b2d4 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Fri, 23 Apr 2021 11:23:41 +1000
Subject: [PATCH 1564/2024] libnpupnp: update to 4.1.4

---
 srcpkgs/libnpupnp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libnpupnp/template b/srcpkgs/libnpupnp/template
index 16c0d5b6cc57..677191fbea33 100644
--- a/srcpkgs/libnpupnp/template
+++ b/srcpkgs/libnpupnp/template
@@ -1,6 +1,6 @@
 # Template file for 'libnpupnp'
 pkgname=libnpupnp
-version=4.1.3
+version=4.1.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="amak <amak.git@outlook.com>"
 license="BSD-3-Clause"
 homepage="https://www.lesbonscomptes.com/upmpdcli/npupnp-doc/libnpupnp.html"
 distfiles="https://www.lesbonscomptes.com/upmpdcli/downloads/libnpupnp-${version}.tar.gz"
-checksum=74703d49be52d29b52f59342ec7359178b127568399551d9d3f56bb7950fcc02
+checksum=03506f02546e3b3d31b389e046c4691f020b82d315426ce79f1e2b1eb7958656
 
 post_install() {
 	vlicense COPYING

From 4f99ec0d2251ad435670c690af828ce588100ea3 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 23 Apr 2021 19:17:48 +0200
Subject: [PATCH 1565/2024] firefox: fix flac-no-ffvpx.patch to unbreak ppc64*

---
 srcpkgs/firefox/patches/flac-no-ffvpx.patch | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/firefox/patches/flac-no-ffvpx.patch b/srcpkgs/firefox/patches/flac-no-ffvpx.patch
index e3f60e8ecf64..740f5614456f 100644
--- a/srcpkgs/firefox/patches/flac-no-ffvpx.patch
+++ b/srcpkgs/firefox/patches/flac-no-ffvpx.patch
@@ -12,15 +12,14 @@ index 53fc3c9937f7..b23771ab80fa 100644
  
  namespace mozilla {
  
-@@ -14,6 +15,11 @@ namespace mozilla {
+@@ -14,6 +15,10 @@ namespace mozilla {
  bool FlacDecoder::IsEnabled() {
  #ifdef MOZ_FFVPX
    return StaticPrefs::media_flac_enabled();
 +#elif defined(MOZ_FFMPEG)
 +  RefPtr<PDMFactory> platform = new PDMFactory();
 +  return StaticPrefs::media_flac_enabled() &&
-+         platform->SupportsMimeType("audio/flac"_ns,
-+                                    /* DecoderDoctorDiagnostics* */ nullptr);
++         platform->SupportsMimeType("audio/flac"_ns);
  #else
    // Until bug 1295886 is fixed.
    return false;

From 6e582ea03ed763ce2eb6da84a99eb7165ec7c087 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 23 Apr 2021 15:07:54 -0300
Subject: [PATCH 1566/2024] cairo-dock-plugins: revbump to actually replace
 vte290 with vte3.

8d643c6fddaf029b045ddbe29e2f21ece1a7fd50 didn't revbump, only changed
the dependency.

Closes #30456, thanks eth0OS for diagnosing.
---
 srcpkgs/cairo-dock-plugins/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cairo-dock-plugins/template b/srcpkgs/cairo-dock-plugins/template
index 6bb439f1b5df..38295ded98c2 100644
--- a/srcpkgs/cairo-dock-plugins/template
+++ b/srcpkgs/cairo-dock-plugins/template
@@ -1,7 +1,7 @@
 # Template file for 'cairo-dock-plugins'
 pkgname=cairo-dock-plugins
 version=3.4.1
-revision=14
+revision=15
 build_style=cmake
 hostmakedepends="gettext pkg-config"
 makedepends="alsa-lib-devel fftw-devel pulseaudio-devel libexif-devel

From 0f306a1ec56e404dc9c99929dedae0ed32af529e Mon Sep 17 00:00:00 2001
From: reback00 <reback00@protonmail.com>
Date: Sat, 24 Apr 2021 00:31:07 +0600
Subject: [PATCH 1567/2024] ibus-m17n: update to 1.4.5

---
 srcpkgs/ibus-m17n/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ibus-m17n/template b/srcpkgs/ibus-m17n/template
index 7118fe0e3bc0..325e7ef18321 100644
--- a/srcpkgs/ibus-m17n/template
+++ b/srcpkgs/ibus-m17n/template
@@ -1,6 +1,6 @@
 # Template file for 'ibus-m17n'
 pkgname=ibus-m17n
-version=1.4.4
+version=1.4.5
 revision=1
 build_style=gnu-configure
 configure_args="--prefix=/usr --libexecdir=/usr/lib/ibus"
@@ -13,7 +13,7 @@ maintainer="reback00 <reback00@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/ibus/ibus-m17n"
 distfiles="https://github.com/ibus/ibus-m17n/releases/download/${version}/ibus-m17n-${version}.tar.gz"
-checksum=a479351c3ed44283aef2b990f21e8a3e1b23ff0745836d3a45edfe7929432915
+checksum=3aeb59fe13ab64516f7a39462d78812952b480c5ee885aa2ab45e8ff52ff1a8c
 
 pre_configure() {
 	autoreconf -fi

From d4f2fdec9db7146589547ba7a66379e7ecade250 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 17 Apr 2021 08:48:49 +0300
Subject: [PATCH 1568/2024] libdrm: update to 2.4.105.

Closes: #30278 [via git-merge-pr]
---
 .../libdrm/patches/revert_set_fb_modifiers_flag.patch    | 9 +++++++++
 srcpkgs/libdrm/template                                  | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/libdrm/patches/revert_set_fb_modifiers_flag.patch

diff --git a/srcpkgs/libdrm/patches/revert_set_fb_modifiers_flag.patch b/srcpkgs/libdrm/patches/revert_set_fb_modifiers_flag.patch
new file mode 100644
index 000000000000..9df4a09b81b1
--- /dev/null
+++ b/srcpkgs/libdrm/patches/revert_set_fb_modifiers_flag.patch
@@ -0,0 +1,9 @@
+https://gitlab.freedesktop.org/mesa/drm/-/commit/40f73d0b0b3936ccadc693edc25aad70c1225766
+--- xf86drmMode.c	2021-04-07 16:54:11.000000000 +0300
++++ xf86drmMode.c	2021-04-23 08:16:18.037479830 +0300
+@@ -292,2 +292 @@ drm_public int drmModeAddFB2WithModifier
+-	if (modifier) {
+-		f.flags |= DRM_MODE_FB_MODIFIERS;
++	if (modifier)
+@@ -295 +293,0 @@ drm_public int drmModeAddFB2WithModifier
+-	}
diff --git a/srcpkgs/libdrm/template b/srcpkgs/libdrm/template
index 36ec6d3fa67a..ef96bcf5d129 100644
--- a/srcpkgs/libdrm/template
+++ b/srcpkgs/libdrm/template
@@ -1,6 +1,6 @@
 # Template file for 'libdrm'
 pkgname=libdrm
-version=2.4.103
+version=2.4.105
 revision=1
 wrksrc="drm-libdrm-${version}"
 build_style=meson
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://dri.freedesktop.org/"
 distfiles="https://gitlab.freedesktop.org/mesa/drm/-/archive/libdrm-${version}/drm-libdrm-${version}.tar.gz"
-checksum=9235bcbcaca43372151ce82af7c1f83aec5e6f371153cd7957a117f99098713f
+checksum=0ba5017cafd4b7ac885356403c20105d40efcd11271ebf75727c1a5599e4ed53
 
 case "$XBPS_TARGET_MACHINE" in
 	aarch64*) configure_args+=" -Dvc4=true";;

From 94e37254ceea7f32d67effa198fa8e400cba73c6 Mon Sep 17 00:00:00 2001
From: reback00 <reback00@protonmail.com>
Date: Sat, 24 Apr 2021 00:04:44 +0600
Subject: [PATCH 1569/2024] pnpm: update to 6.1.0

---
 srcpkgs/pnpm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pnpm/template b/srcpkgs/pnpm/template
index 6d7ecfe1ce8b..6de605f2e69f 100644
--- a/srcpkgs/pnpm/template
+++ b/srcpkgs/pnpm/template
@@ -1,6 +1,6 @@
 # Template file for 'pnpm'
 pkgname=pnpm
-version=6.0.1
+version=6.1.0
 revision=1
 build_style=fetch
 hostmakedepends="nodejs jq"
@@ -10,7 +10,7 @@ maintainer="reback00 <reback00@protonmail.com>"
 license="MIT"
 homepage="https://pnpm.js.org/"
 distfiles="https://registry.npmjs.org/${pkgname}/-/${pkgname}-${version}.tgz"
-checksum=6e390217ab6250f85d28cb0135620e3b0526a849dda7fb7c54f092c1b6bd465c
+checksum=29edaaee2babbeb34309421b24cbe8f36b05066abba6ab14c97f7483ad5e3378
 python_version=3
 
 do_install() {

From c292d9e58e7ed1cbf2ee36f7304d2c60ebe93b66 Mon Sep 17 00:00:00 2001
From: Seth <runningdroid@zoho.com>
Date: Thu, 15 Apr 2021 02:40:44 -0400
Subject: [PATCH 1570/2024] urlwatch: update to 2.23 and claim maintainership

---
 srcpkgs/urlwatch/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/urlwatch/template b/srcpkgs/urlwatch/template
index b03f00c3418b..f6098a2707ce 100644
--- a/srcpkgs/urlwatch/template
+++ b/srcpkgs/urlwatch/template
@@ -1,7 +1,7 @@
 # Template file for 'urlwatch'
 pkgname=urlwatch
-version=2.21
-revision=2
+version=2.23
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-appdirs python3-keyring python3-minidb python3-requests
@@ -11,16 +11,16 @@ depends="python3-appdirs python3-keyring python3-minidb python3-requests
 checkdepends="python3-pytest python3-pycodestyle python3-docutils
  python3-Pygments ${depends}"
 short_desc="Tool for monitoring webpages for updates"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="RunningDroid <runningdroid@zoho.com>"
 license="BSD-3-Clause"
 homepage="https://thp.io/2008/urlwatch/"
 distfiles="${PYPI_SITE}/u/urlwatch/urlwatch-${version}.tar.gz"
-checksum=c259e0169cc99114b54470d08a8312473159dfdbed1d712d1a222fd8a9d7291a
+checksum=73a29efbef80c02bc8c285fca427793979c0e4bef40bc084df5de5436378b842
 
 do_check() {
 	# skip the tests that require python modules that aren't packaged
 	# (pdftotext & pytesseract)
-	pytest -k "not (pdf or ocr)" -v
+	pytest -k "not (pdf or ocr or json)" -v
 }
 
 post_install() {

From 9a54f4086fc7deb08819caaff4a87dbd188e8df4 Mon Sep 17 00:00:00 2001
From: Justin Jagieniak <justin@jagieniak.net>
Date: Tue, 30 Mar 2021 21:24:54 +0200
Subject: [PATCH 1571/2024] New package: kup-0.8.0

---
 srcpkgs/kup/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/kup/template

diff --git a/srcpkgs/kup/template b/srcpkgs/kup/template
new file mode 100644
index 000000000000..461bbcd45f97
--- /dev/null
+++ b/srcpkgs/kup/template
@@ -0,0 +1,16 @@
+# Template file for 'kup'
+pkgname=kup
+version=0.8.0
+revision=1
+build_style=cmake
+hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons gettext kconfig"
+makedepends="cmake qt5-devel kcoreaddons-devel ki18n-devel kio-devel ksolid-devel
+ kidletime-devel knotifications-devel kconfig-devel kinit-devel kjobwidgets-devel
+ libgit2-devel plasma-framework-devel"
+depends="rsync"
+short_desc="Kup is created to keep backups of personal files"
+maintainer="Justin Jagieniak <justin@jagieniak.net>"
+license="GPL-2.0-or-later"
+homepage="https://www.kde.org/applications/utilities/kup/"
+distfiles="${KDE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
+checksum="79154cd12bcbef87b3b22851adcd505f5da7723483361c7a16ae4c3eea61f0bd"

From 06b6c3835d17356353cf34bef583d9ad05bdb165 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 23 Apr 2021 21:08:44 +0200
Subject: [PATCH 1572/2024] common/shlibs: cleanup double entries

---
 common/shlibs | 51 ---------------------------------------------------
 1 file changed, 51 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 966f665424f3..d2cd0cd4c793 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -118,7 +118,6 @@ libGLESv2.so atom-1.41.0_1
 libGLESv2.so opera-55.0.2994.37_2
 libGLESv2.so discord-0.0.7_1
 libGLESv2.so keybase-desktop-3.1.2_1
-libGLESv2.so wire-desktop-3.6.2885_1
 libGLESv2.so Signal-Desktop-1.23.2_1
 libGLESv2.so slack-desktop-3.4.2_1
 libbrcmEGL.so rpi-userland-20180103_2
@@ -571,18 +570,6 @@ libkrb5support.so.0 mit-krb5-libs-1.8_1
 libkdb_ldap.so.1 mit-krb5-libs-1.14.2_2
 libverto.so.0 mit-krb5-libs-1.8_1
 libverto-k5ev.so.0 mit-krb5-libs-1.8_1
-libgssapi_krb5.so.2 mit-krb5-libs-1.18.3_2
-libgssrpc.so.4 mit-krb5-libs-1.18.3_2
-libk5crypto.so.3 mit-krb5-libs-1.18.3_2
-libkadm5clnt_mit.so.12 mit-krb5-libs-1.18.3_2
-libkadm5srv_mit.so.12 mit-krb5-libs-1.18.3_2
-libkdb5.so.10 mit-krb5-libs-1.18.3_2
-libkrb5.so.3 mit-krb5-libs-1.18.3_2
-libkrad.so.0 mit-krb5-libs-1.18.3_2
-libkrb5support.so.0 mit-krb5-libs-1.18.3_2
-libkdb_ldap.so.1 mit-krb5-libs-1.18.3_2
-libverto.so.0 mit-krb5-libs-1.18.3_2
-libverto-k5ev.so.0 mit-krb5-libs-1.18.3_2
 libmenu-cache.so.3 menu-cache-1.0.0_1
 libupower-glib.so.3 libupower-glib3-0.99.3_1
 libcanberra.so.0 libcanberra-0.23_1
@@ -643,18 +630,14 @@ libboost_wserialization.so.1.72.0 libboost_wserialization1.72-1.72.0_1
 libboost_graph.so.1.72.0 libboost_graph1.72-1.72.0_1
 libboost_log.so.1.72.0 libboost_log1.72-1.72.0_1
 libboost_locale.so.1.72.0 libboost_locale1.72-1.72.0_1
-libboost_math_tr1.so.1.72.0 libboost_math_tr11.72-1.72.0_1
 libboost_program_options.so.1.72.0 libboost_program_options1.72-1.72.0_1
 libboost_iostreams.so.1.72.0 libboost_iostreams1.72-1.72.0_1
 libboost_system.so.1.72.0 libboost_system1.72-1.72.0_1
 libboost_thread.so.1.72.0 libboost_thread1.72-1.72.0_1
 libboost_log_setup.so.1.72.0 libboost_log_setup1.72-1.72.0_1
 libboost_date_time.so.1.72.0 libboost_date_time1.72-1.72.0_1
-libboost_math_c99.so.1.72.0 libboost_math_c991.72-1.72.0_1
 libboost_wave.so.1.72.0 libboost_wave1.72-1.72.0_1
-libboost_math_tr1.so.1.72.0 libboost_math_tr11.72-1.72.0_1
 libboost_atomic.so.1.72.0 libboost_atomic1.72-1.72.0_1
-libboost_math_c99.so.1.72.0 libboost_math_c991.72-1.72.0_1
 libboost_type_erasure.so.1.72.0 libboost_type_erasure1.72-1.72.0_1
 libboost_fiber.so.1.72.0 libboost_fiber1.72-1.72.0_1
 libboost_stacktrace_noop.so.1.72.0 libboost_stacktrace_noop1.72-1.72.0_1
@@ -697,14 +680,6 @@ libevent_core-2.1.so.7 libevent-2.1.11_1
 libevent_extra-2.1.so.7 libevent-2.1.11_1
 libevent_pthreads-2.1.so.7 libevent-2.1.11_1
 libevent_openssl-2.1.so.7 libevent-2.1.11_1
-liblber-2.4.so.2 libldap-2.4.57_2
-libldap-2.4.so.2 libldap-2.4.57_2
-libldap_r-2.4.so.2 libldap-2.4.57_2
-libevent-2.1.so.7 libevent-2.1.12_2
-libevent_core-2.1.so.7 libevent-2.1.12_2
-libevent_extra-2.1.so.7 libevent-2.1.12_2
-libevent_pthreads-2.1.so.7 libevent-2.1.12_2
-libevent_openssl-2.1.so.7 libevent-2.1.12_2
 libSDL_mixer-1.2.so.0 SDL_mixer-1.2.11_1
 libapr-1.so.0 apr-1.4.2_1
 libaprutil-1.so.0 apr-util-1.6.1_11
@@ -997,7 +972,6 @@ libIceDB.so.37 libIce-3.7.5_2
 libIceXML.so.37 libIce-3.7.5_2
 libIceDiscovery.so.37 libIce-3.7.5_2
 libIceLocatorDiscovery.so.37 libIce-3.7.5_2
-libkdecorations2private.so.8 kdecoration-5.20.90_1
 libvdpau.so.1 libvdpau-0.4.1_1
 libgsm.so.1 libgsm-1.0.13_13
 libcgroup.so.1 libcgroup-0.37.1_1
@@ -1191,7 +1165,6 @@ libspice-client-glib-2.0.so.8 spice-gtk-0.37_6
 libspice-controller.so.0 spice-gtk-0.37_6
 libvirt-gconfig-1.0.so.0 libvirt-glib-0.1.2_1
 libvirt-gobject-1.0.so.0 libvirt-glib-0.1.2_1
-libvirt-glib-1.0.so.0 libvirt-glib-0.1.2_1
 libgsasl.so.7 libgsasl-1.8.0_1
 libzmq.so.5 zeromq-4.1.2_1
 libstatgrab.so.10 libstatgrab-0.91_1
@@ -1602,12 +1575,6 @@ libdovecot-compression.so.0 dovecot-2.3.13_3
 libdovecot-sql.so.0 dovecot-2.3.13_3
 libdovecot-storage.so.0 dovecot-2.3.13_3
 libdovecot-lda.so.0 dovecot-2.3.13_3
-libdovecot.so.0 dovecot-2.3.13_3
-libdovecot-login.so.0 dovecot-2.3.13_3
-libdovecot-compression.so.0 dovecot-2.3.13_3
-libdovecot-sql.so.0 dovecot-2.3.13_3
-libdovecot-storage.so.0 dovecot-2.3.13_3
-libdovecot-lda.so.0 dovecot-2.3.13_3
 libwiretap.so.11 libwireshark-3.4.0_1
 libwireshark.so.14 libwireshark-3.4.0_1
 libwsutil.so.12 libwireshark-3.4.0_1
@@ -1933,7 +1900,6 @@ libQt53DQuickScene2D.so.5 qt5-3d-5.15.2_3
 libQt53DExtras.so.5 qt5-3d-5.15.2_3
 libQt53DQuickExtras.so.5 qt5-3d-5.15.2_3
 libQt53DQuickAnimation.so.5 qt5-3d-5.15.2_3
-libQt53DQuickInput.so.5 qt5-3d-5.15.2_3
 libQt5Charts.so.5 qt5-charts-5.15.2_3
 libQt5DataVisualization.so.5 qt5-datavis3d-5.15.2_3
 libQt5Gamepad.so.5 qt5-gamepad-5.15.2_3
@@ -2205,16 +2171,6 @@ libclamunrar.so.9 clamav-0.103.1_2
 libclamunrar_iface.so.9 clamav-0.103.1_2
 libfreshclam.so.2 clamav-0.103.1_2
 libqca-qt5.so.2 qca-qt5-2.1.3_1
-libclamav.so.9 clamav-0.103.1_2
-libclamunrar.so.9 clamav-0.103.1_2
-libclamunrar_iface.so.9 clamav-0.103.1_2
-libfreshclam.so.2 clamav-0.103.1_2
-libqca-qt5.so.2 qca-qt5-2.3.1_2
-libclamav.so.9 clamav-0.103.1_2
-libclamunrar.so.9 clamav-0.103.1_2
-libclamunrar_iface.so.9 clamav-0.103.1_2
-libfreshclam.so.2 clamav-0.103.1_2
-libqca-qt5.so.2 qca-qt5-2.3.1_2
 libqt5keychain.so.1 qtkeychain-qt5-0.7.0_1
 libphonon4qt5.so.4 phonon-qt5-4.8.3_1
 libphonon4qt5experimental.so.4 phonon-qt5-4.8.3_1
@@ -2456,9 +2412,6 @@ libvterm.so.0 libvterm-0.0.20151005_1
 libboinc_opencl.so.7 boinc-7.16.16_2
 libboinc_api.so.7 boinc-7.16.16_2
 libboinc_graphics2.so.7 boinc-7.16.16_2
-libboinc_opencl.so.7 boinc-nox-7.16.16_2
-libboinc_api.so.7 boinc-nox-7.16.16_2
-libboinc_graphics2.so.7 boinc-nox-7.16.16_2
 libsynfig.so.0 synfig-1.0.1_1
 libhidapi-hidraw.so.0 hidapi-0.8.0rc1_1
 libhidapi-libusb.so.0 hidapi-0.8.0rc1_1
@@ -2959,8 +2912,6 @@ libqalculate.so.21 libqalculate-3.0.0_1
 libweston-9.so.0 weston-9.0.0_1
 libostree-1.so.1 libostree-2020.8_2
 librhash.so.0 rhash-1.3.4_1
-libostree-1.so.1 libostree-2020.8_2
-librhash.so.0 rhash-1.4.1_2
 libserialport.so.0 libserialport-0.1.1_1
 libsigrok.so.4 libsigrok-0.5.0_1
 libsigrokcxx.so.4 libsigrok-0.5.0_1
@@ -3427,8 +3378,6 @@ libspa-jack.so libspa-jack-0.3.6_1
 libspa-v4l2.so libspa-v4l2-0.3.6_1
 libspa-videoconvert.so libspa-videoconvert-0.3.6_1
 libspa-vulkan.so libspa-vulkan-0.3.6_1
-libspa-bluez5.so libspa-bluetooth-0.3.6_1
-libspa-ffmpeg.so libspa-ffmpeg-0.3.6_1
 librem.so rem-0.5.3_1
 libshp.so.1 shapelib-1.4.1_1
 libantlr3c.so libantlr3c-3.4_1

From 5a0fde637430114ab6fe8cb6801c936eb027f039 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Fri, 23 Apr 2021 12:43:46 +0200
Subject: [PATCH 1573/2024] jitterentropy: update to 3.0.2.

Set make_use_env=yes so the makefile appends its desired CFLAGS to those
of xbps-src (mainly so -O0 takes precedence over -O2 in XBPS_CFLAGS)
as jitterentropy should be built without optimization.
---
 srcpkgs/jitterentropy/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/jitterentropy/template b/srcpkgs/jitterentropy/template
index 5a9003fdbbc2..ffaf54f5fbd6 100644
--- a/srcpkgs/jitterentropy/template
+++ b/srcpkgs/jitterentropy/template
@@ -1,15 +1,16 @@
 # Template file for 'jitterentropy'
 pkgname=jitterentropy
-version=3.0.1
-revision=3
+version=3.0.2
+revision=1
 wrksrc="${pkgname}-library-${version}"
 build_style=gnu-makefile
+make_use_env=yes
 short_desc="Hardware RNG based on CPU timing jitter"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="BSD-3-Clause"
 homepage="https://www.chronox.de/jent.html"
 distfiles="https://github.com/smuellerDD/jitterentropy-library/archive/v${version}.tar.gz"
-checksum=015a443ebfaab7bc302caa24dcc124aefe1818046893f49591d2465bd3f58e16
+checksum=5be868e343c25e24312f5e6894642ce1044994b99d6676430c760584a1b1613e
 
 post_install() {
 	vlicense COPYING

From 8380a689c4284dfc7502be623d3a1ab0a760b9a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 23 Apr 2021 23:21:09 +0200
Subject: [PATCH 1574/2024] filelight: update to 21.04.0.

---
 srcpkgs/filelight/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/filelight/template b/srcpkgs/filelight/template
index 0ceb7e92fc8e..0efc46d8bf71 100644
--- a/srcpkgs/filelight/template
+++ b/srcpkgs/filelight/template
@@ -1,6 +1,6 @@
 # Template file for 'filelight'
 pkgname=filelight
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://utils.kde.org/projects/filelight/"
 distfiles="${KDE_SITE}/release-service/${version}/src/filelight-${version}.tar.xz"
-checksum=206a70d9aa2d5ba025cb5ab84d860843a163919f26517eca5c0108b123be4a5a
+checksum=db2004c06c2ae95f007ade9244d161bb140b3012776cce0f0f1fcf7a0cc3d7ad

From df03ab6f99171a4a05f5b938fa8b01c09817bf8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 23 Apr 2021 23:21:09 +0200
Subject: [PATCH 1575/2024] kaccounts-integration: update to 21.04.0.

---
 srcpkgs/kaccounts-integration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kaccounts-integration/template b/srcpkgs/kaccounts-integration/template
index b018988aada9..ab092f3f894d 100644
--- a/srcpkgs/kaccounts-integration/template
+++ b/srcpkgs/kaccounts-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-integration'
 pkgname=kaccounts-integration
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-integration.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-integration-${version}.tar.xz"
-checksum=98390b72fbb3eb26a892f6f2169d71df754dd44887ed599116b624012297a655
+checksum=fe3e3096a237ba0f97cd8a25926648aef30fdc8dd475d78748857032a9f6cefe
 
 kaccounts-integration-devel_package() {
 	short_desc+=" - development"

From 9de3f91d29fc99aa7fdba0c269f8beccaa25874f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 23 Apr 2021 23:21:09 +0200
Subject: [PATCH 1576/2024] kaccounts-providers: update to 21.04.0.

---
 srcpkgs/kaccounts-providers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kaccounts-providers/template b/srcpkgs/kaccounts-providers/template
index a5094cd0fcc3..84d97909a996 100644
--- a/srcpkgs/kaccounts-providers/template
+++ b/srcpkgs/kaccounts-providers/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-providers'
 pkgname=kaccounts-providers
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-providers.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-providers-${version}.tar.xz"
-checksum=ae71cadebff1e16991c48fcb9c71c177e2fc2d04536b89d1437587bcdae70617
+checksum=e0b58817dd41f18f6408e40f7d0390f6e8c426394fc1e36c691f98f794c6369f
 
 build_options="nextcloud"
 desc_option_nextcloud="Build nextcloud support (needs Qt5 WebEngine)"

From 161ccf07ecd19b3ee154736cc606e83d2b64f2d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 23 Apr 2021 23:21:09 +0200
Subject: [PATCH 1577/2024] kcron: update to 21.04.0.

---
 srcpkgs/kcron/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcron/template b/srcpkgs/kcron/template
index ae834a7601cf..3966dd412522 100644
--- a/srcpkgs/kcron/template
+++ b/srcpkgs/kcron/template
@@ -1,6 +1,6 @@
 # Template file for 'kcron'
 pkgname=kcron
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://userbase.kde.org/System_Settings/Task_Scheduler"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcron-${version}.tar.xz"
-checksum=ee8276e91e35959c6ea795327957ed6a218a59ac0912aac3a3cbc5f5abafc54a
+checksum=c3ca3b59d10a850e7bf24cdc95256bd1d98ce1be1c2da55fb075de8e2c239e90

From 99bbc0d79919fd75ab891ce4406543f28f4b2676 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 23 Apr 2021 23:21:09 +0200
Subject: [PATCH 1578/2024] kdialog: update to 21.04.0.

---
 srcpkgs/kdialog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdialog/template b/srcpkgs/kdialog/template
index e0a4a3b03b3e..0a09104ba02e 100644
--- a/srcpkgs/kdialog/template
+++ b/srcpkgs/kdialog/template
@@ -1,6 +1,6 @@
 # Template file for 'kdialog'
 pkgname=kdialog
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/utilities/kdialog"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdialog-${version}.tar.xz"
-checksum=231f6735e5905e92381da835da1b90bddb8ada39d8bffd90c8d2f9a3673602de
+checksum=babc9bc9c88cdce81e2380cde280be650ea6ec10fddb949a45a142a1ee6d5535

From e8ac006f527e890a99a155e0c08e47300e7c0d8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 23 Apr 2021 23:21:09 +0200
Subject: [PATCH 1579/2024] keditbookmarks: update to 21.04.0.

---
 srcpkgs/keditbookmarks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/keditbookmarks/template b/srcpkgs/keditbookmarks/template
index d976cd270763..afd2126e025c 100644
--- a/srcpkgs/keditbookmarks/template
+++ b/srcpkgs/keditbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'keditbookmarks'
 pkgname=keditbookmarks
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/keditbookmarks-${version}.tar.xz"
-checksum=6823446698d80e6ce59601f1772ec316ad205954cac8be6381456f714c6dd759
+checksum=8c9e69198d3351eef02531562a53ccef6e6781af95ea9cb7d0b49e07d313b3a9
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen

From a24d4b96730523e3c14354c726920392fbb1bd78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 23 Apr 2021 23:21:09 +0200
Subject: [PATCH 1580/2024] kfind: update to 21.04.0.

---
 srcpkgs/kfind/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kfind/template b/srcpkgs/kfind/template
index a74ffe9109ff..cdbae9b72098 100644
--- a/srcpkgs/kfind/template
+++ b/srcpkgs/kfind/template
@@ -1,6 +1,6 @@
 # Template file for 'kfind'
 pkgname=kfind
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kfind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kfind-${version}.tar.xz"
-checksum=e6f608fcd717021bc2f4c69def81f18361c05abb72503deb268d219fb8a6f167
+checksum=72bfa8708e0e627fff6cc78693f6c778ba27cebdc65f84c69189385de5814284

From ef7003032c1bebea068d5a0528442badb87fd668 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 23 Apr 2021 23:21:10 +0200
Subject: [PATCH 1581/2024] kig: update to 21.04.0.

---
 srcpkgs/kig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template
index 5a4bf8f150d7..65fba07bd5ec 100644
--- a/srcpkgs/kig/template
+++ b/srcpkgs/kig/template
@@ -1,6 +1,6 @@
 # Template file for 'kig'
 pkgname=kig
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools gettext
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://www.kde.org/applications/education/kig/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kig-${version}.tar.xz"
-checksum=ce3261eb10e052fa10fcb3742d6a1820006bfa100f5aaae09f367acac3019ed9
+checksum=178ecb364e248f4f7ed39dcb93dcd6ce4cee0c5628f5e49d6e05383afc3d9734

From 35ae21a9b5d1cfe4fb97e76a3893c447df026dd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 23 Apr 2021 23:21:10 +0200
Subject: [PATCH 1582/2024] kio-gdrive: update to 21.04.0.

---
 srcpkgs/kio-gdrive/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kio-gdrive/template b/srcpkgs/kio-gdrive/template
index 95fa01678436..8821e625326d 100644
--- a/srcpkgs/kio-gdrive/template
+++ b/srcpkgs/kio-gdrive/template
@@ -1,15 +1,16 @@
 # Template file for 'kio-gdrive'
 pkgname=kio-gdrive
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool pkg-config qt5-qmake qt5-host-tools
  kcoreaddons libaccounts-qt5-devel kdoctools"
-makedepends="libaccounts-qt5-devel kaccounts-integration-devel kparts-devel libkgapi-devel"
+makedepends="libaccounts-qt5-devel kaccounts-integration-devel kparts-devel
+ libkgapi-devel purpose-devel"
 depends="kaccounts-providers"
 short_desc="KIO slave that enables access and edit Google Drive files"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KIO_GDrive"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-gdrive-${version}.tar.xz"
-checksum=4569cc07681aa88a81bda7923c795916cc6d1578859e11f0bb336699db8f7b70
+checksum=506f79cf2d4a86f5ce0e3905c1de481ba8558ac865f50bd1a347aeef35183e5c

From 69a7c440016fbe161368f675672639859e091bee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 23 Apr 2021 23:21:10 +0200
Subject: [PATCH 1583/2024] kmag: update to 21.04.0.

---
 srcpkgs/kmag/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmag/template b/srcpkgs/kmag/template
index 80dd3ad29b1d..66fa244199e1 100644
--- a/srcpkgs/kmag/template
+++ b/srcpkgs/kmag/template
@@ -1,6 +1,6 @@
 # Template file for 'kmag'
 pkgname=kmag
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kmag/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmag-${version}.tar.xz"
-checksum=32932eb791d76de88de93a04f71f1224c41f0e33eb87b84eeab55668a18961dc
+checksum=1e0fcce98fe11cb2bae0a762fb382127f7f57a15ccdf2e496f8c977dd238dc1b

From 518c35cacf76c7f02347f7efbe62b21871610c91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 23 Apr 2021 23:21:10 +0200
Subject: [PATCH 1584/2024] kmix: update to 21.04.0.

---
 srcpkgs/kmix/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kmix/template b/srcpkgs/kmix/template
index 7d2aebd41a18..086f61de35b3 100644
--- a/srcpkgs/kmix/template
+++ b/srcpkgs/kmix/template
@@ -1,11 +1,11 @@
 # Template file for 'kmix'
 pkgname=kmix
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 configure_args="-DSYSCONF_INSTALL_DIR=/etc -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
- kdoctools kcoreaddons gettext"
+ kdoctools kcoreaddons kconfig gettext"
 makedepends="plasma-framework-devel kinit-devel alsa-lib-devel pulseaudio-devel
  libcanberra-devel ksolid-devel"
 short_desc="KDE's mixer application"
@@ -13,4 +13,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/multimedia/kmix/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmix-${version}.tar.xz"
-checksum=68f892958eec984685567ad36624084118b6dc5e7a4633733a6c3e6aea34ea17
+checksum=e29742d0618e704fc9593051527347eac8aaf209f90451180f17b279ebb24ce8

From 9afa5b0d72b54c10546edc6ad258ae2fb27de73f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 23 Apr 2021 23:21:10 +0200
Subject: [PATCH 1585/2024] kolourpaint: update to 21.04.0.

---
 srcpkgs/kolourpaint/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kolourpaint/template b/srcpkgs/kolourpaint/template
index 515eb3004375..c2af4d68866d 100644
--- a/srcpkgs/kolourpaint/template
+++ b/srcpkgs/kolourpaint/template
@@ -1,6 +1,6 @@
 # Template file for 'kolourpaint'
 pkgname=kolourpaint
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="BSD-2-Clause, GPL-2.0-or-later, LGPL-2.1-only, GFDL-1.2-only"
 homepage="http://www.kolourpaint.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kolourpaint-${version}.tar.xz"
-checksum=2f947803698f8169891191cb6ff841d3e991f9ae7157469cf01f4af594bde93e
+checksum=7c0fe6886e3432e29b986d9b7dd31da45dea35c566bc52b14a474c68b49ae176
 
 post_install() {
 	vlicense COPYING

From bd72e27b1b74fe8dec74b23c05b787f33aa24d09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 23 Apr 2021 23:21:10 +0200
Subject: [PATCH 1586/2024] kompare: update to 21.04.0.

---
 srcpkgs/kompare/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kompare/template b/srcpkgs/kompare/template
index 3178f0531cfb..35d74c21175f 100644
--- a/srcpkgs/kompare/template
+++ b/srcpkgs/kompare/template
@@ -1,6 +1,6 @@
 # Template file for 'kompare'
 pkgname=kompare
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/development/kompare/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kompare-${version}.tar.xz"
-checksum=7b57eddfa2c8f232252d4e981359fbe7844050aa2707d95044646d917967fb7f
+checksum=cee3e22e4072e218302d245cb6f918dc7c6f2e8b5b0ffc81d177fde71e89e19e

From 99f17f61ce9b24392693a5eaa34b3374d39ab4e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 23 Apr 2021 23:21:10 +0200
Subject: [PATCH 1587/2024] kruler: update to 21.04.0.

---
 srcpkgs/kruler/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kruler/template b/srcpkgs/kruler/template
index 571083d96a7e..9fce375f5560 100644
--- a/srcpkgs/kruler/template
+++ b/srcpkgs/kruler/template
@@ -1,6 +1,6 @@
 # Template file for 'kruler'
 pkgname=kruler
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/kruler/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kruler-${version}.tar.xz"
-checksum=3f7152398f31f7315be5b504d9bb55e11358ab5cee8303e6b406d8f686836fdb
+checksum=be7cbde21b33f072bc0efb71562483cdd0ac7ca2cd8c91c4f05dbc52ce9a377b

From f89764d1f26adf30ebfa61c4978fb0619fc5b14f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 23 Apr 2021 23:21:10 +0200
Subject: [PATCH 1588/2024] ksystemlog: update to 21.04.0.

---
 srcpkgs/ksystemlog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksystemlog/template b/srcpkgs/ksystemlog/template
index 3364a48d7be4..2d43380567f4 100644
--- a/srcpkgs/ksystemlog/template
+++ b/srcpkgs/ksystemlog/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemlog'
 pkgname=ksystemlog
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/system/ksystemlog/"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksystemlog-${version}.tar.xz"
-checksum=1e3fa2a9e2c9f995ce8aea028ca68ba2487db7212ad298d9d2d7fa98710cf0eb
+checksum=2474b8d13451e7c884250d7e29b808dbad1e90cacbb1df4786c890abdd445f19
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen

From e89ca300b0e5e4492b777be6385153bd5300523e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 23 Apr 2021 23:21:10 +0200
Subject: [PATCH 1589/2024] kteatime: update to 21.04.0.

---
 srcpkgs/kteatime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kteatime/template b/srcpkgs/kteatime/template
index 5e34401f5c86..02babcb5d659 100644
--- a/srcpkgs/kteatime/template
+++ b/srcpkgs/kteatime/template
@@ -1,6 +1,6 @@
 # Template file for 'kteatime'
 pkgname=kteatime
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/games/kteatime/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kteatime-${version}.tar.xz"
-checksum=f016698e891688f9fbec934b3b66021e49aa05b699920171c57758273b622cf9
+checksum=c5ef71f467fe09ac499d989fcb3ed0544a046ab75664901d4d85fbaedb7a67fe

From 58021cfe43d521cdb6287e1d3054086c68a1836a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 23 Apr 2021 23:21:10 +0200
Subject: [PATCH 1590/2024] kturtle: update to 21.04.0.

---
 srcpkgs/kturtle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kturtle/template b/srcpkgs/kturtle/template
index 272021b4c219..d139c8e7fdeb 100644
--- a/srcpkgs/kturtle/template
+++ b/srcpkgs/kturtle/template
@@ -1,6 +1,6 @@
 # Template file for 'kturtle'
 pkgname=kturtle
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/education/kturtle/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kturtle-${version}.tar.xz"
-checksum=e6bedbae45faf41158b2dab80229c69f8490698cb35afcb3507b9db2668ab89e
+checksum=8d11d1999d0d7617189c0e47d6077ddd508922f5da0fa1f21f2da8e328cd0dd1

From 6ba0e7a4e7bbd6c0dce9aab7f551fe5e5d858583 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 23 Apr 2021 23:21:10 +0200
Subject: [PATCH 1591/2024] kwalletmanager: update to 21.04.0.

---
 srcpkgs/kwalletmanager/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwalletmanager/template b/srcpkgs/kwalletmanager/template
index 3264711f87d2..32d5cdb4a789 100644
--- a/srcpkgs/kwalletmanager/template
+++ b/srcpkgs/kwalletmanager/template
@@ -1,6 +1,6 @@
 # Template file for 'kwalletmanager'
 pkgname=kwalletmanager
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth kdoctools pkg-config
@@ -11,4 +11,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/system/org.kde.kwalletmanager5"
 distfiles="${KDE_SITE}/release-service/${version}/src/kwalletmanager-${version}.tar.xz"
-checksum=995414a017735a0dedf19bffdc715cc0f526925b597bba9aa7f5d34e97059d9a
+checksum=7323e7d548bec44ba53e77bf4e482024644529f25d2b339244bc4d6079eb07e6

From a95111cddc2271912bf05e207779ce5376aae488 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 23 Apr 2021 23:21:11 +0200
Subject: [PATCH 1592/2024] libkomparediff2: update to 21.04.0.

---
 srcpkgs/libkomparediff2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkomparediff2/template b/srcpkgs/libkomparediff2/template
index 1c52bb2a33ef..43a571b3f5a4 100644
--- a/srcpkgs/libkomparediff2/template
+++ b/srcpkgs/libkomparediff2/template
@@ -1,6 +1,6 @@
 # Template file for 'libkomparediff2'
 pkgname=libkomparediff2
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkomparediff2-${version}.tar.xz"
-checksum=8386c5108fd761aa5b4b8dbd25f36b021c0bf3a42127e41916c8cd646b99c35f
+checksum=f06c5e2599e43e8cb65cf2896f3736bbf162364e0f1785e6cb1066e8b552778e
 
 libkomparediff2-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 342d0b2f63ec54f48f8cf9b1075ad76c13a9d115 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 23 Apr 2021 23:21:11 +0200
Subject: [PATCH 1593/2024] signon-kwallet-extension: update to 21.04.0.

---
 srcpkgs/signon-kwallet-extension/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/signon-kwallet-extension/template b/srcpkgs/signon-kwallet-extension/template
index 0d25c1caada5..898328cc37a7 100644
--- a/srcpkgs/signon-kwallet-extension/template
+++ b/srcpkgs/signon-kwallet-extension/template
@@ -1,6 +1,6 @@
 # Template file for 'signon-kwallet-extension'
 pkgname=signon-kwallet-extension
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://cgit.kde.org/signon-kwallet-extension.git/"
 distfiles="${KDE_SITE}/release-service/${version}/src/signon-kwallet-extension-${version}.tar.xz"
-checksum=d7b308fc800445cbcd4cec30a0997d8a10fcd23db69c8d49d6436aa3dedcf0a8
+checksum=b6982f9da2a449cf35e5119f5fe59a6a52f963e1cf7d8d244ba86523c9514a16

From dcabd0015d9de3c2064ebdd863c29f109fd61134 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 23 Apr 2021 23:21:11 +0200
Subject: [PATCH 1594/2024] svgpart: update to 21.04.0.

---
 srcpkgs/svgpart/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/svgpart/template b/srcpkgs/svgpart/template
index d14b83ea39f8..93f39454a4ed 100644
--- a/srcpkgs/svgpart/template
+++ b/srcpkgs/svgpart/template
@@ -1,6 +1,6 @@
 # Template file for 'svgpart'
 pkgname=svgpart
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/svgpart.git"
 distfiles="${KDE_SITE}/release-service/${version}/src/svgpart-${version}.tar.xz"
-checksum=f4b588f4b29178fd03a63c2b005837629bf9bbcf59f0a80fffa6a2354ff3b3d1
+checksum=b2c1f78265d865aa39019e74721e2534bd8cf0a9147e6a5cbce54e9268f70e32

From 5574484734af23fc88bc6ddc01aef56ead5de74f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 23 Apr 2021 23:21:11 +0200
Subject: [PATCH 1595/2024] yakuake: update to 21.04.0.

---
 srcpkgs/yakuake/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yakuake/template b/srcpkgs/yakuake/template
index 4fc0179ba8d7..ff79d77ecda9 100644
--- a/srcpkgs/yakuake/template
+++ b/srcpkgs/yakuake/template
@@ -1,6 +1,6 @@
 # Template file for 'yakuake'
 pkgname=yakuake
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kcoreaddons qt5-host-tools qt5-qmake gettext"
@@ -10,4 +10,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/system/org.kde.yakuake"
 distfiles="${KDE_SITE}/release-service/${version}/src/yakuake-${version}.tar.xz"
-checksum=7ddd1a47fdd3af67be16ae40182bea97f7c004448391ac52737d3e5f2e0b25f8
+checksum=6be41491ebdde6750e1560d674ddc5c8222767bb17db7530d906ac7609637cca

From 501e045195ef0cdca658a3ab1499f7a7aecdffb8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 24 Apr 2021 12:35:25 +0200
Subject: [PATCH 1596/2024] parallel: update to 20210422.

---
 srcpkgs/parallel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/parallel/template b/srcpkgs/parallel/template
index c20964551f88..6481bd1f1567 100644
--- a/srcpkgs/parallel/template
+++ b/srcpkgs/parallel/template
@@ -1,6 +1,6 @@
 # Template file for 'parallel'
 pkgname=parallel
-version=20210322
+version=20210422
 revision=1
 build_style=gnu-configure
 depends="perl"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/parallel/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=98f71b445a23a18bb4e9bce4f374b93e6a6d9decdf892be8d22459f224b85694
+checksum=be3e6a3b644467bef25905cb4fd917e67eef982ba4f6e258df25bb0235b59ee8
 
 pre_configure() {
 	# no html and pdf doc

From c2aceae491661c621e9c57cf4fa6ea8b73151c83 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 24 Apr 2021 12:37:00 +0200
Subject: [PATCH 1597/2024] nncp: update to 6.4.0.

---
 srcpkgs/nncp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template
index 5f934bc6f5b3..de0aa1311cc6 100644
--- a/srcpkgs/nncp/template
+++ b/srcpkgs/nncp/template
@@ -1,6 +1,6 @@
 # Template file for 'nncp'
 pkgname=nncp
-version=6.3.0
+version=6.4.0
 revision=1
 build_style=go
 go_import_path=cypherpunks.ru/nncp
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-only"
 homepage="http://www.nncpgo.org/"
 distfiles="http://www.nncpgo.org/download/${pkgname}-${version}.tar.xz"
-checksum=76c26a11e3423540bb7b8470820176a35fcd0493b21a872ec223eb9443ba466b
+checksum=3d0d1156d69af698d402663cf84e51cc3d40a50d300e34d1105a6f7532e4b99b
 
 do_build() {
 	make

From b815627764bf69fabb07cd730afc38592200f3f8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 24 Apr 2021 12:38:36 +0200
Subject: [PATCH 1598/2024] fdkaac: update to 1.0.2.

---
 srcpkgs/fdkaac/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fdkaac/template b/srcpkgs/fdkaac/template
index 8fcdcb7c7365..d31dc8eb9a68 100644
--- a/srcpkgs/fdkaac/template
+++ b/srcpkgs/fdkaac/template
@@ -1,6 +1,6 @@
 # Template file for 'fdkaac'
 pkgname=fdkaac
-version=1.0.1
+version=1.0.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT, BSD-4-Clause, Zlib"
 homepage="https://github.com/nu774/fdkaac"
 distfiles="https://github.com/nu774/${pkgname}/archive/v${version}.tar.gz"
-checksum=ce9459111cee48c84b2e5e7154fa5a182c8ec1132da880656de3c1bc3bf2cc79
+checksum=8a0b67792605fb8955d6be78a81e3a4029e9b7d0f594d8ed76e0fbcef90be0c8
 
 pre_configure() {
 	autoreconf -fi

From d615efccef5616d5d6bfb8dafe350a5a5fa7450d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 13:23:17 +0100
Subject: [PATCH 1599/2024] akonadi-calendar: update to 21.04.0

---
 srcpkgs/akonadi-calendar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi-calendar/template b/srcpkgs/akonadi-calendar/template
index b9d0442f1675..4ce1a3c1b4d6 100644
--- a/srcpkgs/akonadi-calendar/template
+++ b/srcpkgs/akonadi-calendar/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-calendar'
 pkgname=akonadi-calendar
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-calendar-${version}.tar.xz"
-checksum=93275e67e403056a5d7ba9c4231a10ec08e2df542525378d507d37e493f8f114
+checksum=a198bade1dd014d78a289eb76712388f055c7e7d7359c44aba2c857eba14c9f9
 
 akonadi-calendar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 9b9c4ab7cd510c7ee837b1922d1a8bced090ae0e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 13:23:20 +0100
Subject: [PATCH 1600/2024] akonadi-contacts: update to 21.04.0

---
 srcpkgs/akonadi-contacts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi-contacts/template b/srcpkgs/akonadi-contacts/template
index 45c4f7fe35f0..fab227d6bb2d 100644
--- a/srcpkgs/akonadi-contacts/template
+++ b/srcpkgs/akonadi-contacts/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-contacts'
 pkgname=akonadi-contacts
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-contacts-${version}.tar.xz"
-checksum=2437f17f249df22e125aa3c5e12ba39a54fc063fe146b9756b5104e946cf87e2
+checksum=508e27b5a95b4ecc4070cc0b73d6cb8d74bc06f23874d8bcc6dbdd86fa6e6084
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools python3 kconfig"

From eeeff4eed3b313a71697286d8ca60d31cc18f308 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 13:23:22 +0100
Subject: [PATCH 1601/2024] akonadi-import-wizard: update to 21.04.0

---
 srcpkgs/akonadi-import-wizard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi-import-wizard/template b/srcpkgs/akonadi-import-wizard/template
index d55c65f015c6..7658f8ac84d2 100644
--- a/srcpkgs/akonadi-import-wizard/template
+++ b/srcpkgs/akonadi-import-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-import-wizard'
 pkgname=akonadi-import-wizard
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools qt5-host-tools qt5-qmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=f6718d41395a191077a18b3d20940083a81efcdd9eb489371a95308e9ff70d20
+checksum=b0550d12a791f72fea3bf567d2f626226f9feecccd3e4571fe443fe5aabfbdc5
 
 akonadi-import-wizard-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 52c233770a930a1ee5374a4d4eda149523156a3e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 13:23:24 +0100
Subject: [PATCH 1602/2024] akonadi-mime: update to 21.04.0

---
 srcpkgs/akonadi-mime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi-mime/template b/srcpkgs/akonadi-mime/template
index ea4766ba3ed6..8d02897f3fad 100644
--- a/srcpkgs/akonadi-mime/template
+++ b/srcpkgs/akonadi-mime/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-mime'
 pkgname=akonadi-mime
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-mime-${version}.tar.xz"
-checksum=f45d97ddfed592db897cb7dd0e50183dd72b0f2bdb761168917bd4b739d7ddb6
+checksum=3b40689ef271be84d48cabf97ddb6e76e76287b7e7045b8e898660807512fb0c
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools kconfig"

From c5c9be7819251c9210f02a02d05d94154c3affde Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 13:23:26 +0100
Subject: [PATCH 1603/2024] akonadi-notes: update to 21.04.0

---
 srcpkgs/akonadi-notes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi-notes/template b/srcpkgs/akonadi-notes/template
index 7cb79ec96ba7..70da10f5dac0 100644
--- a/srcpkgs/akonadi-notes/template
+++ b/srcpkgs/akonadi-notes/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-notes'
 pkgname=akonadi-notes
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=87455a4cab94a8dae020e3a6ecf1e924440d8df1840bde6cb69a046e5cace5ba
+checksum=40f071df637788f0512d7c158846010e42ce10615d30375191e611892f1e1550
 
 akonadi-notes-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From a4289dfa99c59fa4f4babfa30d35eb060e55e74f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 13:23:28 +0100
Subject: [PATCH 1604/2024] akonadi-search: update to 21.04.0

---
 srcpkgs/akonadi-search/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi-search/template b/srcpkgs/akonadi-search/template
index 7d1d6e6f45e3..3279749c5472 100644
--- a/srcpkgs/akonadi-search/template
+++ b/srcpkgs/akonadi-search/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-search'
 pkgname=akonadi-search
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 AppStream
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-search-${version}.tar.xz"
-checksum=f85cac2a99e94772d780ea8cbaaf069f86fd7c0b3e7a5c6ea1dbad5a2c104c2d
+checksum=c7dc4fec6f7938b9862904495dac0f1ae7cc3d1c8164a70d3bf01660f14e3fa1
 
 akonadi-search-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 1be9dbd4aca0e07fe0537faff5dc2c462cd520ad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 13:23:31 +0100
Subject: [PATCH 1605/2024] akonadi5: update to 21.04.0

---
 srcpkgs/akonadi5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi5/template b/srcpkgs/akonadi5/template
index 5225f361508c..d7569af90bb3 100644
--- a/srcpkgs/akonadi5/template
+++ b/srcpkgs/akonadi5/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi5'
 pkgname=akonadi5
-version=20.12.3
+version=21.04.0
 revision=1
 wrksrc="akonadi-${version}"
 build_style=cmake
@@ -18,7 +18,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-${version}.tar.xz"
-checksum=b919ac1d1c8534c304925ba51f7f79b1b5fd8fa21fb906ee3a5829c403f4922d
+checksum=3fb7424fe9096739780bf87391509fa1259d59de679f1b62f2beb18d796741cd
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-tools-devel qt5-devel kconfig kcoreaddons"

From 289a9c1d0a08d724fa959d7010bad32029220843 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 13:23:37 +0100
Subject: [PATCH 1606/2024] ark: update to 21.04.0

---
 srcpkgs/ark/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ark/template b/srcpkgs/ark/template
index 1d94001fdbd3..e6c70e49d0a3 100644
--- a/srcpkgs/ark/template
+++ b/srcpkgs/ark/template
@@ -1,6 +1,6 @@
 # Template file for 'ark'
 pkgname=ark
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.ark"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=e4f2dfe595f7b51879c8db3734ad56a2363a934013ee4bd4bc8c94a210405b3b
+checksum=0e5e0552598038e38f42d813aefb46ebee9a3d00ffb1ea163b526de58ce39e0c
 
 do_check() {
 	:

From f3e5733d2f44e2eb33dd53b55a92c417346bceb7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 13:23:39 +0100
Subject: [PATCH 1607/2024] baloo-widgets5: update to 21.04.0

---
 srcpkgs/baloo-widgets5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/baloo-widgets5/template b/srcpkgs/baloo-widgets5/template
index 8707807ea2c3..62443834736a 100644
--- a/srcpkgs/baloo-widgets5/template
+++ b/srcpkgs/baloo-widgets5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo-widgets5'
 pkgname=baloo-widgets5
-version=20.12.3
+version=21.04.0
 revision=1
 wrksrc="baloo-widgets-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/libraries/baloo-widgets"
 distfiles="${KDE_SITE}/release-service/${version}/src/baloo-widgets-${version}.tar.xz"
-checksum=113bec52f93b0c18f62e0c5814a8221ea1c8e2f26e6079937d337564fffbf633
+checksum=3996d5741c2f88c5e32ecd672148f7d255a863a4c355e92f120ae67c2c48c523
 
 baloo-widgets5-devel_package() {
 	short_desc+=" - development"

From 69b0ebd3a744beece4a78de7574b7479587fdd4e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 13:23:41 +0100
Subject: [PATCH 1608/2024] calendarsupport: update to 21.04.0

---
 srcpkgs/calendarsupport/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/calendarsupport/template b/srcpkgs/calendarsupport/template
index fd393f83edc8..bc3e8b2ac369 100644
--- a/srcpkgs/calendarsupport/template
+++ b/srcpkgs/calendarsupport/template
@@ -1,6 +1,6 @@
 # Template file for 'calendarsupport'
 pkgname=calendarsupport
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig python3 qt5-host-tools qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/calendarsupport-${version}.tar.xz"
-checksum=ab418fb8ed8a9aee1d0798fe934e59593b6b985c85220405814f159c954a8d10
+checksum=8fd41c24640abfaf8cb3e338ed9700c86e90c7f69dbf37ff6b54175fe30d7d54
 
 calendarsupport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From b00d7a0d3746ad42005783aa87903d8523548270 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 13:23:51 +0100
Subject: [PATCH 1609/2024] dolphin: update to 21.04.0

---
 srcpkgs/dolphin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dolphin/template b/srcpkgs/dolphin/template
index 6d49c330ee06..7bfd47b7e4b9 100644
--- a/srcpkgs/dolphin/template
+++ b/srcpkgs/dolphin/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin'
 pkgname=dolphin
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=9794b825de2440f53bd237c0bc1c974e89431b5c440ab81ccc1135e696f8a1f3
+checksum=4988e59d4e3edfd58c2d0857745398fc1840c87ec03ea13b0d73254874cfbdbe
 
 if [ "$CROSS_BUILD" ]; then
 	LDFLAGS=" -Wl,-rpath-link,../bin"

From 5fa5d2cee2b886e8f7cdaf755076195d8499579f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 13:23:56 +0100
Subject: [PATCH 1610/2024] elisa: update to 21.04.0

---
 srcpkgs/elisa/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elisa/template b/srcpkgs/elisa/template
index dd3bc47166b7..f81c2069914c 100644
--- a/srcpkgs/elisa/template
+++ b/srcpkgs/elisa/template
@@ -1,6 +1,6 @@
 # Template file for 'elisa'
 pkgname=elisa
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/en/multimedia/org.kde.elisa"
 distfiles="${KDE_SITE}/release-service/${version}/src/elisa-${version}.tar.xz"
-checksum=7a97d305b4319f077db6ce387895c2c3442112d5a3d9d4d68d0c2d884ce79865
+checksum=4fa3843e58cf9007ef0b59d9e8df083400c083098d8b14da5df6cd8bc8315194
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"

From f004c6ae1f58a53d79176e2da04b7debf23af7c5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 13:24:04 +0100
Subject: [PATCH 1611/2024] grantleetheme: update to 21.04.0

---
 srcpkgs/grantleetheme/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grantleetheme/template b/srcpkgs/grantleetheme/template
index ee3c7553d0b3..3d2653ae6a79 100644
--- a/srcpkgs/grantleetheme/template
+++ b/srcpkgs/grantleetheme/template
@@ -1,6 +1,6 @@
 # Template file for 'grantleetheme'
 pkgname=grantleetheme
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 configure_args="KDE_INSTALL_USE_QT_SYS_PATHS=TRUE"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/grantleetheme-${version}.tar.xz"
-checksum=e33dacd0d4e51e69be2590b4916cfcd4db5ad6ce57d4f8d97f6326e4eb2a3a7d
+checksum=9afa6d2414a67362f2c86c6d0379375feafa80323e15fd8fd70131a3d589adcb
 
 grantleetheme-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"

From ef99ba6433c033a5ca77dc9102075134661d99b6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 13:24:37 +0100
Subject: [PATCH 1612/2024] kalarmcal: update to 21.04.0

---
 srcpkgs/kalarmcal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kalarmcal/template b/srcpkgs/kalarmcal/template
index e8a5505e7095..e53b066f6904 100644
--- a/srcpkgs/kalarmcal/template
+++ b/srcpkgs/kalarmcal/template
@@ -1,6 +1,6 @@
 # Template file for 'kalarmcal'
 pkgname=kalarmcal
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=0f7e1b46f81c9a77178ea93b536b3985aad00dcf5bd01881b7945bccf96d98a0
+checksum=a3866ca74629e1d29372db8f01779ab042d8663b52404343597efe6155ace532
 
 kalarmcal-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 22076dc4d27932d60eadb6825a5486ae4af74b12 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 13:24:46 +0100
Subject: [PATCH 1613/2024] kate5: update to 21.04.0

---
 srcpkgs/kate5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kate5/template b/srcpkgs/kate5/template
index a01026c622f8..0c29f7e25c9f 100644
--- a/srcpkgs/kate5/template
+++ b/srcpkgs/kate5/template
@@ -1,6 +1,6 @@
 # Template file for 'kate5'
 pkgname=kate5
-version=20.12.3
+version=21.04.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.kate"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=81bc2d8afe1958186feec8b1b275da5d6eb52bd8b4fa154896d19830d628d4fd
+checksum=3780cc0de0cf078add7901e255a6524c34f093a4aff2a2d032ed88c20a7421d4
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake"

From 0a6b927eba8c1c85075aa1010126993bcc3a540c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 13:24:54 +0100
Subject: [PATCH 1614/2024] kcalutils: update to 21.04.0

---
 srcpkgs/kcalutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcalutils/template b/srcpkgs/kcalutils/template
index 1610e7c7cb44..b224a9375473 100644
--- a/srcpkgs/kcalutils/template
+++ b/srcpkgs/kcalutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcalutils'
 pkgname=kcalutils
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcalutils-${version}.tar.xz"
-checksum=1d1f333e55c0d6e476315bf8e08fc2a332e51a122985f6757eb669560148432b
+checksum=1b13ea5e03426a7985a4274006cb1c3b855556fcd2ebc5b757bd2ac6e143744f
 
 kcalutils-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From df4755f03cb08136c66c96ab00dbdf4ef08d1072 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 13:25:02 +0100
Subject: [PATCH 1615/2024] kdeconnect: update to 21.04.0

---
 common/shlibs               | 4 ++--
 srcpkgs/kdeconnect/template | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index d2cd0cd4c793..52a2fa276788 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3080,8 +3080,8 @@ libsquirrel.so.0 squirrel-libs-3.1_1
 libsqstdlib.so.0 squirrel-libs-3.1_1
 libexecinfo.so.1 libexecinfo-1.1_1
 libkdeconnectpluginkcm.so.2 kdeconnect-20.12.2_1
-libkdeconnectinterfaces.so.20 kdeconnect-20.12.2_1
-libkdeconnectcore.so.20 kdeconnect-20.12.2_1
+libkdeconnectinterfaces.so.21 kdeconnect-21.03.80_1
+libkdeconnectcore.so.21 kdeconnect-21.03.80_1
 libkpmcore.so.10 kpmcore-4.2.0_1
 libpkcs11-helper.so.1 pkcs11-helper-1.25.1_6
 libr_core.so.5.0.0 radare2-5.0.0_1
diff --git a/srcpkgs/kdeconnect/template b/srcpkgs/kdeconnect/template
index ab3eda20f4da..a7162f4fe354 100644
--- a/srcpkgs/kdeconnect/template
+++ b/srcpkgs/kdeconnect/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeconnect'
 pkgname=kdeconnect
-version=20.12.3
+version=21.04.0
 revision=1
 wrksrc="kdeconnect-kde-${version}"
 build_style=cmake
@@ -15,5 +15,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/KDE/kdeconnect-kde"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-kde-${version}.tar.xz"
-checksum=0198a5de49b168485f67e47b0f01f36fef78a3f8be796e8876f3cb6c819608a8
+checksum=f7c1aecd4e312367a164bbf43f73e657f99b851eece7d72525231522221476fd
 python_version=3

From 16fddf55c8f63da223fcc8e6971bcbc47e0e64fc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 13:25:16 +0100
Subject: [PATCH 1616/2024] kdepim-runtime: update to 21.04.0

---
 srcpkgs/kdepim-runtime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdepim-runtime/template b/srcpkgs/kdepim-runtime/template
index 1c4318f57e49..0bd05b6b5534 100644
--- a/srcpkgs/kdepim-runtime/template
+++ b/srcpkgs/kdepim-runtime/template
@@ -1,6 +1,6 @@
 # Template file for 'kdepim-runtime'
 pkgname=kdepim-runtime
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 # XXX KolabLibraries, Kolabxml
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later, AGPL-3.0-or-later, BSD-3-Clause, BSD-2-Clause"
 homepage="https://invent.kde.org/unmaintained/kdepimlibs"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=bb6b315389c4b5cfc1d1737d70feed1c7f3bf50c5a01f88efda061b7e666e352
+checksum=ead3479e34ca942516d33383bca4bc1d4fd9f81858e12421f935d41d3dd42ed4
 
 post_install() {
 	for license in AGPL-3.0-or-later.txt BSD-3-Clause.txt BSD-2-Clause.txt; do

From ab023f16e5149cf7956af8cd359d499a3267ff42 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 13:25:33 +0100
Subject: [PATCH 1617/2024] khelpcenter: update to 21.04.0

---
 srcpkgs/khelpcenter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/khelpcenter/template b/srcpkgs/khelpcenter/template
index 764687445dc0..32db9c684d5a 100644
--- a/srcpkgs/khelpcenter/template
+++ b/srcpkgs/khelpcenter/template
@@ -1,6 +1,6 @@
 # Template file for 'khelpcenter'
 pkgname=khelpcenter
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.Help"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=0e29e793687395d0349d23856a790ea2bab88c1b3f13ab5e0fdd1445627f3d56
+checksum=fb9655db22859ec75f1a05a966106469885de7e148d1f5b41354fe36d88ddb11
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kconfig kdoctools python3 qt5-host-tools qt5-qmake"

From c61540b565a780ba9c3ba0561e2e3225a9ead4b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 13:25:34 +0100
Subject: [PATCH 1618/2024] kidentitymanagement: update to 21.04.0

---
 srcpkgs/kidentitymanagement/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kidentitymanagement/template b/srcpkgs/kidentitymanagement/template
index ba430b39dea8..80ec39cd867b 100644
--- a/srcpkgs/kidentitymanagement/template
+++ b/srcpkgs/kidentitymanagement/template
@@ -1,6 +1,6 @@
 # Template file for 'kidentitymanagement'
 pkgname=kidentitymanagement
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kidentitymanagement"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=036a3b55d11a106ca2a4ab0712942baeea58b7559422730eaf6f904c4a902d98
+checksum=aaf5bf200f9bb9caf1571ebd1dc2075bda1e2afe6be27b9cc9857dffe99903f9
 
 kidentitymanagement-devel_package() {
 	short_desc+=" - development"

From 6010131469acd3ec2f3449c3b7177f59668878bb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 13:25:39 +0100
Subject: [PATCH 1619/2024] kimap: update to 21.04.0

---
 srcpkgs/kimap/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kimap/template b/srcpkgs/kimap/template
index 332a609aa036..e193f57ff7e8 100644
--- a/srcpkgs/kimap/template
+++ b/srcpkgs/kimap/template
@@ -1,7 +1,7 @@
 # Template file for 'kimap'
 pkgname=kimap
-version=20.12.3
-revision=2
+version=21.04.0
+revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
  gettext kcoreaddons"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kimap-${version}.tar.xz"
-checksum=321dbb9881480e7fa75a9a6c8b117030f0cbc97e5e43f39dff8fe643fd271320
+checksum=dd2e04c17c2fad5ec51cf1087ea59ffe1c72070afed80f4e4bbae0f0a3e66c39
 
 do_check() {
 	: # XXX: QFATAL : FakeServerTest::testLoadScenario() Unable to start the server

From 704356fca522f966912993a3b2f2949c124a3e07 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 13:25:45 +0100
Subject: [PATCH 1620/2024] kldap: update to 21.04.0

---
 srcpkgs/kldap/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index 9affc4221013..49529a618628 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,17 +1,17 @@
 # Template file for 'kldap'
 pkgname=kldap
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
  gettext kcoreaddons kdoctools"
-makedepends="kio-devel"
+makedepends="kio-devel qtkeychain-qt5-devel"
 short_desc="LDAP access API for KDE"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kldap-${version}.tar.xz"
-checksum=4c0cbcdffe92b0f7884721f564702aab65a208e5938c9a118a1ef30082d9d653
+checksum=8f00ce4fb66efd5566c40d26c959bf1c863646b56d7c0b56a314827ff1bf18d7
 
 kldap-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 20c2b75d554bdacc1ab45ac1f42561a037d43d8f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 13:25:48 +0100
Subject: [PATCH 1621/2024] kmail-account-wizard: update to 21.04.0

---
 srcpkgs/kmail-account-wizard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmail-account-wizard/template b/srcpkgs/kmail-account-wizard/template
index f69a776d6eb4..08dac9af87cd 100644
--- a/srcpkgs/kmail-account-wizard/template
+++ b/srcpkgs/kmail-account-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'kmail-account-wizard'
 pkgname=kmail-account-wizard
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-account-wizard-${version}.tar.xz"
-checksum=16143e040aa0eb4a608557b9ba01cdec2be371d90adf358df8767b5ba8234cb6
+checksum=0cc0f1b49a6687dfdeafcfbbf0d909b10dde2206eab2138b39307a59a6e45449

From ed34bb05a6dcbc0b8b50e58c4b0da3474c1dc165 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 13:25:54 +0100
Subject: [PATCH 1622/2024] kmail: update to 21.04.0

---
 srcpkgs/kmail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmail/template b/srcpkgs/kmail/template
index 38cf2c597f9f..746cbc06d03d 100644
--- a/srcpkgs/kmail/template
+++ b/srcpkgs/kmail/template
@@ -1,6 +1,6 @@
 # Template file for 'kmail'
 pkgname=kmail
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-host-tools qt5-qmake
@@ -15,4 +15,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/internet/org.kde.kmail2"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmail-${version}.tar.xz"
-checksum=411e4d40ae86105b879a11b0b1a80686ad63737089f22508565d1880f7c45ca4
+checksum=dc01c873f918ec780692e8cade59d5dba595d42ada9d4fc0d28d22865788f085

From 17cc1eee5d24dfb40c64d9a84449e9e38d46eb2e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 13:25:56 +0100
Subject: [PATCH 1623/2024] kmailtransport: update to 21.04.0

---
 srcpkgs/kmailtransport/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kmailtransport/template b/srcpkgs/kmailtransport/template
index 86aff7a0d45d..998fec15eae7 100644
--- a/srcpkgs/kmailtransport/template
+++ b/srcpkgs/kmailtransport/template
@@ -1,17 +1,18 @@
 # Template file for 'kmailtransport'
 pkgname=kmailtransport
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
  gettext kcoreaddons kconfig"
-makedepends="akonadi-mime-devel kcmutils-devel ksmtp-devel libkgapi-devel"
+makedepends="akonadi-mime-devel kcmutils-devel ksmtp-devel libkgapi-devel
+ qtkeychain-qt5-devel"
 short_desc="Mail Transport Service"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmailtransport-${version}.tar.xz"
-checksum=d718d7b74a5a478ca070d8ddae6927351e470dcf79550c4d0d64b94a331859d4
+checksum=da36d1bc3ea62d1f9de0daca1945d0cc87cf035559dea32b7af35d89f048fcc9
 
 kmailtransport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From a289f5117e033fc3813657de347428974e1c3234 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 13:25:58 +0100
Subject: [PATCH 1624/2024] kmbox: update to 21.04.0

---
 srcpkgs/kmbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmbox/template b/srcpkgs/kmbox/template
index 718912a97d21..aea7c00c99a7 100644
--- a/srcpkgs/kmbox/template
+++ b/srcpkgs/kmbox/template
@@ -1,6 +1,6 @@
 # Template file for 'kmbox'
 pkgname=kmbox
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmbox-${version}.tar.xz"
-checksum=0ec56cfdb4a697a64c57962733df5d77c253f80e6a718b6ed974ccc9eefd9033
+checksum=a4f33928ac8924060d5cd86dc17cb7a97c9b9f01fe4621b0fed53604328ce106
 
 kmbox-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 0d87d14fdc12b924f50f35a1356e0e75ff19965c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 13:25:59 +0100
Subject: [PATCH 1625/2024] kmime: update to 21.04.0

---
 srcpkgs/kmime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmime/template b/srcpkgs/kmime/template
index a83c63f33628..0e2d677aab25 100644
--- a/srcpkgs/kmime/template
+++ b/srcpkgs/kmime/template
@@ -1,6 +1,6 @@
 # Template file for 'kmime'
 pkgname=kmime
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmime-${version}.tar.xz"
-checksum=381e6839d8f830e5b7b31a6272122676e935cf4b25857ca9b247cc9572ef476d
+checksum=042b6cb9eaa5160ee722680c340984d92d3ac1e49d52c38ee68c5b8cf25adb24
 
 if [ "CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"

From 3e4c34d2efe539d0a1485da911d3f8b05f62d270 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 13:26:07 +0100
Subject: [PATCH 1626/2024] knights: update to 21.04.0

---
 srcpkgs/knights/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knights/template b/srcpkgs/knights/template
index e2f3ae82981a..d496b2826749 100644
--- a/srcpkgs/knights/template
+++ b/srcpkgs/knights/template
@@ -1,6 +1,6 @@
 # Template file for 'knights'
 pkgname=knights
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,4 +11,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.knights"
 distfiles="${KDE_SITE}/release-service/${version}/src/knights-${version}.tar.xz"
-checksum=497b1785ef27a00e2ac852855f160950116b3c86fa053ad187f9611712ef057d
+checksum=c392a3b3f02cc52aedd3e22e90950d3204fb1465f49bcfdd1a1fcd7237c68327

From dd86816eb1c9b055ef71df9548adea89e07ca8d5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 13:26:26 +0100
Subject: [PATCH 1627/2024] konsole: update to 21.04.0

---
 srcpkgs/konsole/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/konsole/template b/srcpkgs/konsole/template
index 8c95b7bf738c..326a0943e53e 100644
--- a/srcpkgs/konsole/template
+++ b/srcpkgs/konsole/template
@@ -1,6 +1,6 @@
 # Template file for 'konsole'
 pkgname=konsole
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -GNinja"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.konsole"
 distfiles="${KDE_SITE}/release-service/${version}/src/konsole-${version}.tar.xz"
-checksum=24cd42fdc4ae2e17526bfab9c5ad516bb25b22d654782e98aa52f6e39bdd138d
+checksum=260a1748a065c22d3bb63ffe57bd4bc79067e24a24f6332e5c91317d0e0799b6
 replaces="konsole5>=0"
 # FIXME: after we switch cmake build-style to ninja, remove this as well as
 # the ninja host-dependency and configure_arg as they will become superfluous

From bfe3e1a2bf26013a7b8e60e408b402585e1abd03 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 13:26:30 +0100
Subject: [PATCH 1628/2024] kontactinterface: update to 21.04.0

---
 srcpkgs/kontactinterface/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kontactinterface/template b/srcpkgs/kontactinterface/template
index a3cf11319010..7f06aca0863b 100644
--- a/srcpkgs/kontactinterface/template
+++ b/srcpkgs/kontactinterface/template
@@ -1,6 +1,6 @@
 # Template file for 'kontactinterface'
 pkgname=kontactinterface
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kontactinterface-${version}.tar.xz"
-checksum=3c9f395c2eaf843689e3ace68d8c06cbdbe914f4888657c676cdfe05ba981ddb
+checksum=d51c282f477b8d32bf736169e8d56cbbc5fa3536247de9dd10d49646be3c9bc0
 
 kontactinterface-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 9223a9ed7a02e60b41f36eab03289f38959ac8fe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 13:26:43 +0100
Subject: [PATCH 1629/2024] kpimtextedit: update to 21.04.0

---
 srcpkgs/kpimtextedit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpimtextedit/template b/srcpkgs/kpimtextedit/template
index 262f36077cf7..19861360d3e5 100644
--- a/srcpkgs/kpimtextedit/template
+++ b/srcpkgs/kpimtextedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kpimtextedit'
 pkgname=kpimtextedit
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/kpimtextedit"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=3377669943dfe8990d011a2ceb9d01759518f5097732424afa723ffd7e61931e
+checksum=37db75a87a014d9517b88cd0fc2d85ebcf0982c2c4d1bf75d8e37562023792a9
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-tools-devel"

From 7f84c453891125f9a8a93c1aac857ef05abeaa37 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 13:26:47 +0100
Subject: [PATCH 1630/2024] kqtquickcharts: update to 21.04.0

---
 srcpkgs/kqtquickcharts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kqtquickcharts/template b/srcpkgs/kqtquickcharts/template
index 0b60638e2940..5fb76fd4bfa5 100644
--- a/srcpkgs/kqtquickcharts/template
+++ b/srcpkgs/kqtquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kqtquickcharts'
 pkgname=kqtquickcharts
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://edu.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=b274baf4532a89cae9490d65069f57c105b17ddd39e1186171c89ecb14128cc5
+checksum=9a1f95fa26c43c1daaf22a2219a115dd59e9bbea20f20a8d1efc8dd475189c26
 
 kqtquickcharts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From ff330590e639558d848b040474b04f0a83681797 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 13:26:55 +0100
Subject: [PATCH 1631/2024] ksmtp: update to 21.04.0

---
 srcpkgs/ksmtp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksmtp/template b/srcpkgs/ksmtp/template
index 1996eb712bd5..65e917cc53cf 100644
--- a/srcpkgs/ksmtp/template
+++ b/srcpkgs/ksmtp/template
@@ -1,6 +1,6 @@
 # Template file for 'ksmtp'
 pkgname=ksmtp
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksmtp-${version}.tar.xz"
-checksum=8667c3591c28a7fd08d1d0b726bd641b2cf5b9a51f228317b934e041608cb962
+checksum=c557835c9ee292f23f82f4aa67d6516cc9012ad529b5c1d8ea1931f07c64c456
 
 ksmtp-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From aa8ea4c36f59d035b37ea4e0e2ac3703aec869cc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 13:27:02 +0100
Subject: [PATCH 1632/2024] ktnef: update to 21.04.0

---
 srcpkgs/ktnef/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktnef/template b/srcpkgs/ktnef/template
index 535f5aebe64d..1188507c9819 100644
--- a/srcpkgs/ktnef/template
+++ b/srcpkgs/ktnef/template
@@ -1,6 +1,6 @@
 # Template file for 'ktnef'
 pkgname=ktnef
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktnef-${version}.tar.xz"
-checksum=78d7f3d512a1ab1d7ef4af81b47a865e933b2338004ddb174d35913f13887873
+checksum=1efda4eeeddad6cc7a12ebbc686f563849cbf2d75f3e7b58673d9f27965b407f
 
 ktnef-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 7a9cf2c80630a7dc6c3f352089e535d9ffd9d28d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 13:27:36 +0100
Subject: [PATCH 1633/2024] libgravatar: update to 21.04.0

---
 srcpkgs/libgravatar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgravatar/template b/srcpkgs/libgravatar/template
index 181620254843..74f5688724a5 100644
--- a/srcpkgs/libgravatar/template
+++ b/srcpkgs/libgravatar/template
@@ -1,6 +1,6 @@
 # Template file for 'libgravatar'
 pkgname=libgravatar
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libgravatar-${version}.tar.xz"
-checksum=c4a2dacfd5b69b19ae8cb2e1c7295cd968e27ea1dea31f98cee06740b6991c8c
+checksum=79bb158802903e291308f5111b72015069b2d4e931f2faf0ac0b00e05aba2652
 
 libgravatar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 74778b58104ceeb84e594a9655de90a4ea107706 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 13:27:47 +0100
Subject: [PATCH 1634/2024] libkdepim: update to 21.04.0

---
 srcpkgs/libkdepim/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkdepim/template b/srcpkgs/libkdepim/template
index 71813b6be220..24b5f2b4832f 100644
--- a/srcpkgs/libkdepim/template
+++ b/srcpkgs/libkdepim/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdepim'
 pkgname=libkdepim
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdepim-${version}.tar.xz"
-checksum=ca4d3680cdf2a49c61338184ff7e299766c446c16471f7608a331014d5ec35ab
+checksum=8bb23222eafc0bb3c04a1be4003e27cf7bb00aea9a90b377b3fc5ac970a225aa
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From 5d550c43205702a1db9815bacc1b9f2ad9416e4d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 13:27:51 +0100
Subject: [PATCH 1635/2024] libkgapi: update to 21.04.0

---
 srcpkgs/libkgapi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkgapi/template b/srcpkgs/libkgapi/template
index 2af240c1fc42..2241e447046e 100644
--- a/srcpkgs/libkgapi/template
+++ b/srcpkgs/libkgapi/template
@@ -1,6 +1,6 @@
 # Template file for 'libkgapi'
 pkgname=libkgapi
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/pim/libkgapi"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=fd668411c3d1e9f65237d15d884efd5cfb7cae0a90fa517bcf833f3980653941
+checksum=dfc5412756307e910ab6a9c3d9f14c2cfa095d6f58b767af465fbe55c10b01f5
 
 do_check() {
 	:

From f6e34a96156d94e221717b9f88f31749370214c8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 13:27:52 +0100
Subject: [PATCH 1636/2024] libkipi5: update to 21.04.0

---
 srcpkgs/libkipi5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkipi5/template b/srcpkgs/libkipi5/template
index 78bc22530f84..8ec4d17ecbc9 100644
--- a/srcpkgs/libkipi5/template
+++ b/srcpkgs/libkipi5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkipi5'
 pkgname=libkipi5
-version=20.12.3
+version=21.04.0
 revision=1
 wrksrc="libkipi-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkipi"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkipi-${version}.tar.xz"
-checksum=bb6fff214e3a74e17cb7b49f5e9a92252127ec6cb65e6832da3ac789c7bd14a8
+checksum=0b471aa97a396f4e8f596b14be549618d8fe96925d5469ab402efd80a15b683e
 conflicts="libkipi"
 
 libkipi5-devel_package() {

From 5447aa9dedea2106469b5b2f60c04cafb1f67a58 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 13:27:54 +0100
Subject: [PATCH 1637/2024] libkleo: update to 21.04.0

---
 srcpkgs/libkleo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkleo/template b/srcpkgs/libkleo/template
index 9ad732af326a..3b81460680a0 100644
--- a/srcpkgs/libkleo/template
+++ b/srcpkgs/libkleo/template
@@ -1,6 +1,6 @@
 # Template file for 'libkleo'
 pkgname=libkleo
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkleo-${version}.tar.xz"
-checksum=9949cc5492cf2ea9a349b56aa7d88a79d0f96a48baa73c9339e521e09448950c
+checksum=df6cfd8a776f10fe9645c593fb085d13d60a843de32921a2da2e011db8856f1c
 
 libkleo-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From d3ad30728bcfbdfaf7b9654d469477628384d3fb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 13:28:00 +0100
Subject: [PATCH 1638/2024] libksieve: update to 21.04.0

---
 srcpkgs/libksieve/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libksieve/template b/srcpkgs/libksieve/template
index f27e7c17eec0..ff893fe03964 100644
--- a/srcpkgs/libksieve/template
+++ b/srcpkgs/libksieve/template
@@ -1,6 +1,6 @@
 # Template file for 'libksieve'
 pkgname=libksieve
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/libksieve-${version}.tar.xz"
-checksum=009f80fba22ad1eed770b780df6b0757a83e97eec6ba0454f496eaf6b54c2448
+checksum=94233aab2af077e2715283e3c1ee63de8699405eb5feb269b4199d3c2b8efe13
 
 libksieve-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 57894fa4c842a7f3865a6624af8aa1f2ed6d4656 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 13:28:04 +0100
Subject: [PATCH 1639/2024] mailcommon: update to 21.04.0

---
 srcpkgs/mailcommon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mailcommon/template b/srcpkgs/mailcommon/template
index e5c4615dc9ea..bb36a9ec06d4 100644
--- a/srcpkgs/mailcommon/template
+++ b/srcpkgs/mailcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'mailcommon'
 pkgname=mailcommon
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig libxslt qt5-qmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailcommon-${version}.tar.xz"
-checksum=9568a0de8ca61d0af950ba7c407d5fede2c89eb245976e2224c596e8cdbe177c
+checksum=fd8137c4991f578dae0fdaf29e44330654b4fdff9adf9ce5fbd44e9bdd844cd2
 
 mailcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"

From 2062d2db0beb3c38fce9f6cdfd81ea52bda55097 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 13:28:06 +0100
Subject: [PATCH 1640/2024] mailimporter: update to 21.04.0

---
 srcpkgs/mailimporter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mailimporter/template b/srcpkgs/mailimporter/template
index fb5faea25c65..07eb6841f5c2 100644
--- a/srcpkgs/mailimporter/template
+++ b/srcpkgs/mailimporter/template
@@ -1,6 +1,6 @@
 # Template file for 'mailimporter'
 pkgname=mailimporter
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/mailimporter-${version}.tar.xz"
-checksum=d67af2f3f62ccf934b4c23982750c05e70bbc144bea231eba560278363de73d2
+checksum=656ba4469a8d51a5c336e6b16dc5a976119102103535dba269fa65c60656fb1b
 
 mailimporter-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From a7920dee997e6714cbd4c7fe343d3015d0ca06c6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 13:28:38 +0100
Subject: [PATCH 1641/2024] messagelib: update to 21.04.0

---
 srcpkgs/messagelib/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/messagelib/template b/srcpkgs/messagelib/template
index 0e74a09c710c..e20991c2ba6a 100644
--- a/srcpkgs/messagelib/template
+++ b/srcpkgs/messagelib/template
@@ -1,6 +1,6 @@
 # Template file for 'messagelib'
 pkgname=messagelib
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/messagelib-${version}.tar.xz"
-checksum=3aae37239d281aa6137b57baa5ac8834f5f95786847cc72fd879f664fce12c23
+checksum=2fa33e75aef77ce89f91a777b14dafe9f51fffc431dfd975767e830167c65be3
 
 #TODO: fix build without qca-qt5
 

From 1f86d8a5481596d6a5ad09c7b43dbc4858d9d0a0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 13:28:44 +0100
Subject: [PATCH 1642/2024] okular: update to 21.04.0

---
 srcpkgs/okular/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/okular/template b/srcpkgs/okular/template
index 3bbf7b3eb30a..e411893b98f5 100644
--- a/srcpkgs/okular/template
+++ b/srcpkgs/okular/template
@@ -1,6 +1,6 @@
 # Template file for 'okular'
 pkgname=okular
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config gettext kcoreaddons
@@ -16,7 +16,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/en/graphics/org.kde.okular"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=ae570fcd2b35cc9c061c1c55b6f8de256358f0f5dd8d0a8283f13eae006b73dc
+checksum=1ee7c4c19a88ccac8351b150a7b4fd601db83634a7d361b10e6324dfe9cb1b50
 
 do_check() {
 	cd build

From d720f8955d0d79539d3df0ed949ad3e6c5dfa358 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 13:28:49 +0100
Subject: [PATCH 1643/2024] pim-data-exporter: update to 21.04.0

---
 srcpkgs/pim-data-exporter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pim-data-exporter/template b/srcpkgs/pim-data-exporter/template
index 5cf988e52fd5..df2eaf81c5ca 100644
--- a/srcpkgs/pim-data-exporter/template
+++ b/srcpkgs/pim-data-exporter/template
@@ -1,6 +1,6 @@
 # Template file for 'pim-data-exporter'
 pkgname=pim-data-exporter
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kontact.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=987420ed8accd4a1c9db7baf35807b2c92e1f80eb606aed074b859208829ec9f
+checksum=369c4e1443e05625627063c1e673fd7efc09dd04c2fa4522249804fa76c87365

From e3a4c16a7d70907bbbea751047a3ce09ebb677cc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 13:28:50 +0100
Subject: [PATCH 1644/2024] pimcommon: update to 21.04.0

---
 srcpkgs/pimcommon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pimcommon/template b/srcpkgs/pimcommon/template
index bbd43f034bd9..4bc430f26234 100644
--- a/srcpkgs/pimcommon/template
+++ b/srcpkgs/pimcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'pimcommon'
 pkgname=pimcommon
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 libxslt
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/pimcommon-${version}.tar.xz"
-checksum=0b9a0ad2128f41aa5de06dc2a9b28d631ca6a47a5fcf26e5320045f08228fea1
+checksum=b6e180c48b133563ad5b86b7f33353a97b92a995eaf9db7bdfcfd60bc4acf92e
 
 pimcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 6f841e42bb62fac1372dfb17f5dc5a676e385325 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 13:28:56 +0100
Subject: [PATCH 1645/2024] spectacle: update to 21.04.0

---
 srcpkgs/spectacle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spectacle/template b/srcpkgs/spectacle/template
index 094fa25d5130..5f5b6fe942bf 100644
--- a/srcpkgs/spectacle/template
+++ b/srcpkgs/spectacle/template
@@ -1,6 +1,6 @@
 # Template file for 'spectacle'
 pkgname=spectacle
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.spectacle"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=4ce20ea1a81be1ec81c3917fc12e3c904cd95e58d559d56bd3d3bd2a15e149c0
+checksum=e08a9820f9b53efbefaceaf00a477b95370bfba9c620e371a19e1756cf4d0e33

From 4b96d1a16e6e63ed811985c92bfb8c78483fa133 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 13:26:45 +0100
Subject: [PATCH 1646/2024] kpmcore: update to 21.04.0

---
 common/shlibs            | 2 +-
 srcpkgs/kpmcore/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 52a2fa276788..a6895b823c6b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3082,7 +3082,7 @@ libexecinfo.so.1 libexecinfo-1.1_1
 libkdeconnectpluginkcm.so.2 kdeconnect-20.12.2_1
 libkdeconnectinterfaces.so.21 kdeconnect-21.03.80_1
 libkdeconnectcore.so.21 kdeconnect-21.03.80_1
-libkpmcore.so.10 kpmcore-4.2.0_1
+libkpmcore.so.11 kpmcore-21.03.80_1
 libpkcs11-helper.so.1 pkcs11-helper-1.25.1_6
 libr_core.so.5.0.0 radare2-5.0.0_1
 libr_config.so.5.0.0 radare2-5.0.0_1
diff --git a/srcpkgs/kpmcore/template b/srcpkgs/kpmcore/template
index b463f8b14d44..0673235c5add 100644
--- a/srcpkgs/kpmcore/template
+++ b/srcpkgs/kpmcore/template
@@ -1,6 +1,6 @@
 # Template file for 'kpmcore'
 pkgname=kpmcore
-version=20.12.1
+version=21.04.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -14,7 +14,7 @@ maintainer="jambonmcyeah <jambonmcyeah@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/system/org.kde.partitionmanager"
 distfiles="${KDE_SITE}/release-service/$version/src/$pkgname-$version.tar.xz"
-checksum=3b109cf4066499e9ab2858528f7634eaf9f5a3f7e7ee6b01b209a6ec64f8d85b
+checksum=e7b2ff18f8aac6b7922755d8fe84000c8c4410b13f27d540bd0b4ac1410b6731
 
 if [ -n "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From ba93887685c2632d227837c4650a5f6710042be2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 14:30:50 +0100
Subject: [PATCH 1647/2024] partitionmanager: rebuild against kpmcore-21.04.0

---
 srcpkgs/partitionmanager/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/partitionmanager/template b/srcpkgs/partitionmanager/template
index 074dd1fa7a8f..6b4830f9652c 100644
--- a/srcpkgs/partitionmanager/template
+++ b/srcpkgs/partitionmanager/template
@@ -1,7 +1,7 @@
 # Template file for 'partitionmanager'
 pkgname=partitionmanager
 version=4.2.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="qt5-devel kdoctools kconfig qt5-qmake cmake python3

From f9561492258fbb13aa8aefa8847f81dce3b0dee5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 18:59:43 +0100
Subject: [PATCH 1648/2024] kleopatra: update to 21.04.0

---
 srcpkgs/kleopatra/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kleopatra/template b/srcpkgs/kleopatra/template
index ef0ff2f38fa7..33a3b08d89cf 100644
--- a/srcpkgs/kleopatra/template
+++ b/srcpkgs/kleopatra/template
@@ -1,7 +1,7 @@
 # Template file for 'kleopatra'
 pkgname=kleopatra
-version=20.12.3
-revision=2
+version=21.04.0
+revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons gettext kconfig"
 makedepends="kcmutils-devel AppStream kitemmodels-devel gpgmeqt-devel libkleo-devel kmime-devel"
@@ -12,7 +12,7 @@ maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://www.kde.org/applications/utilities/kleopatra/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum="bf30f99bc6abd44d512ca8c53a7e81af625db72547a33df5c581101d787feaa0"
+checksum=c03bc7147e35d2994a0a7d323108d6b34e2e2c70768a5481bec3b04da7b6a870
 
 do_check() {
 	QT_QPA_PLATFORM=offscreen CTEST_OUTPUT_ON_FAILURE=TRUE \

From 4ef89e65fab46439b6a8e58153384ca3c1615186 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 13:23:34 +0100
Subject: [PATCH 1649/2024] akregator: update to 21.04.0

---
 srcpkgs/akregator/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akregator/template b/srcpkgs/akregator/template
index 7ac7f74a76d8..bd36bdc9dbf6 100644
--- a/srcpkgs/akregator/template
+++ b/srcpkgs/akregator/template
@@ -1,6 +1,6 @@
 # Template file for 'akregator'
 pkgname=akregator
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,4 +13,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/internet/akregator"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=0b154aea2e1c87ba1f103931ba5e82f2bf6582e4a2779bd6407826739c8bd981
+checksum=550bd98de26af1e4bcce0744e5a445c7a500b04ebafb1185402841b874d7a3df

From 4f06f8dbe8cadbd958e75c62589d969e3768bbd0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 13:23:58 +0100
Subject: [PATCH 1650/2024] eventviews: update to 21.04.0

---
 srcpkgs/eventviews/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eventviews/template b/srcpkgs/eventviews/template
index f98487bc3c69..b33b52521f23 100644
--- a/srcpkgs/eventviews/template
+++ b/srcpkgs/eventviews/template
@@ -1,6 +1,6 @@
 # Template file for 'eventviews'
 pkgname=eventviews
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kcoreaddons kconfig
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=7b624e52fae929c9c69d989ec24601f10fd1af50674a2ce3ce7108e2f2866e5e
+checksum=bbd80c0c5c078d0a539cfa43f3b3414e05cae2b2ec9b0d6d986702fa9c3c09ff
 
 eventviews-devel_package() {
 	short_desc+=" - development"

From 3347dc10a437d25fd19078918edf3e9abfa960c9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 13:24:13 +0100
Subject: [PATCH 1651/2024] incidenceeditor: update to 21.04.0

---
 srcpkgs/incidenceeditor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/incidenceeditor/template b/srcpkgs/incidenceeditor/template
index 38164fa470ad..ba22880b00cb 100644
--- a/srcpkgs/incidenceeditor/template
+++ b/srcpkgs/incidenceeditor/template
@@ -1,6 +1,6 @@
 # Template file for 'incidenceeditor'
 pkgname=incidenceeditor
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kcoreaddons kconfig
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=44059c06fc725b085a196c619cdb509829f7a57f17eced56fc6755cdcd07ce13
+checksum=bf6381e0d26d60234cdbb285d3b46bf30dc7df559b30fc855379c0274b1390b9
 
 incidenceeditor-devel_package() {
 	short_desc+=" - development"

From 2b3f68c5b74ff788351122742fe1be642320eee4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 13:24:32 +0100
Subject: [PATCH 1652/2024] kaddressbook: update to 21.04.0

---
 srcpkgs/kaddressbook/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kaddressbook/template b/srcpkgs/kaddressbook/template
index efb82bd64f97..ab124a8735f2 100644
--- a/srcpkgs/kaddressbook/template
+++ b/srcpkgs/kaddressbook/template
@@ -1,6 +1,6 @@
 # Template file for 'kaddressbook'
 pkgname=kaddressbook
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,4 +13,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/office/org.kde.kaddressbook"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=83eda4fd1e4caeccb4de6c0c3368056307b19a7f390b92be605c10676967d795
+checksum=740df0cad1a5708657bb54c038a9fb3bfe2176e493dd0a1a14c5a226896634dd

From 28cd765f1038ae4e268a5bc07aa36b3ca590feed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 13:24:35 +0100
Subject: [PATCH 1653/2024] kalarm: update to 21.04.0

---
 srcpkgs/kalarm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kalarm/template b/srcpkgs/kalarm/template
index c24d86bace8a..202f098f2ce1 100644
--- a/srcpkgs/kalarm/template
+++ b/srcpkgs/kalarm/template
@@ -1,6 +1,6 @@
 # Template file for 'kalarm'
 pkgname=kalarm
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools libxslt kdoctools
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kalarm"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=df542b1a9f1a3eb226c25060fa196a0eecce0ac621de2a16f6bc6d58ea4e795e
+checksum=2250a8fee91268be83bc5125858290e6a3239da5dd5810688f09364dad619efd

From 6576f03e06d1116798db2b386d53a6f840adf818 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 13:25:26 +0100
Subject: [PATCH 1654/2024] kget: update to 21.04.0

---
 srcpkgs/kget/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kget/template b/srcpkgs/kget/template
index 813a7446ac79..f6c35837d66e 100644
--- a/srcpkgs/kget/template
+++ b/srcpkgs/kget/template
@@ -1,6 +1,6 @@
 # Template file for 'kget'
 pkgname=kget
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -14,4 +14,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/network/kget"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=d4eed8f395262cfd94c2b8c9caea3523d78c68000d471c1d76ad1aecc6f6024e
+checksum=3b07ea59013a97704f1eaa3aa578770e611708ddc871c1bb6d13a0331e499a53

From a61b59cd6fdc2092ecfe2615cfc994090c6717aa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 13:26:09 +0100
Subject: [PATCH 1655/2024] knotes: update to 21.04.0

---
 srcpkgs/knotes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knotes/template b/srcpkgs/knotes/template
index 1b406cab784f..34ed06d2cc38 100644
--- a/srcpkgs/knotes/template
+++ b/srcpkgs/knotes/template
@@ -1,6 +1,6 @@
 # Template file for 'knotes'
 pkgname=knotes
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools libxslt
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://kde.org/applications/en/utilities/org.kde.knotes"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=06d6f3e444a29b03e6b8cee42b867f0373e71a5b94f65469cd163dcab114c4d8
+checksum=581858d55d85f43f88ca690aae039cc5f80c02516501388c916b66fbab02c17f

From f889d1a1986603f23426bd651412689a0c6403d7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 13:26:22 +0100
Subject: [PATCH 1656/2024] konqueror: update to 21.04.0

---
 srcpkgs/konqueror/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/konqueror/template b/srcpkgs/konqueror/template
index 0fdb0b8e36a9..9dad677f0a50 100644
--- a/srcpkgs/konqueror/template
+++ b/srcpkgs/konqueror/template
@@ -1,6 +1,6 @@
 # Template file for 'konqueror'
 pkgname=konqueror
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://kde.org/applications/internet/org.kde.konqueror"
 distfiles="${KDE_SITE}/release-service/${version}/src/konqueror-${version}.tar.xz"
-checksum=472491923e677815e11e6fe9cd8c8919dc52d37b7350eaad82adfbb203bed2f8
+checksum=e1fce3cf8f448d2657c3839f8f85c248b656e5a9307f546c746717b05b89b412
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen

From d9523b55850479a0453e18782d8c8e5a6ecfe3bf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 13:26:28 +0100
Subject: [PATCH 1657/2024] kontact: update to 21.04.0

---
 srcpkgs/kontact/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kontact/template b/srcpkgs/kontact/template
index ff5107e0cbd4..8ae5f6fb565f 100644
--- a/srcpkgs/kontact/template
+++ b/srcpkgs/kontact/template
@@ -1,6 +1,6 @@
 # Template file for 'kontact'
 pkgname=kontact
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kdoctools
@@ -13,4 +13,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/office/org.kde.kontact"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=b4c56888239f525af814172e221ee6f2cdea17d2ddc20e28fa5443168451da6f
+checksum=e92ccd70b3ba9f4533db615af37618b4c9ea7d28a35598ee430cb339cf40a121

From 98e11a722da97cc1d994dff99b867d3c2f899a80 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 13:26:36 +0100
Subject: [PATCH 1658/2024] korganizer: update to 21.04.0

---
 srcpkgs/korganizer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/korganizer/template b/srcpkgs/korganizer/template
index d2c8c969c7d2..c4060688636a 100644
--- a/srcpkgs/korganizer/template
+++ b/srcpkgs/korganizer/template
@@ -1,6 +1,6 @@
 # Template file for 'korganizer'
 pkgname=korganizer
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kdoctools
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/office/org.kde.korganizer"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=fc20c61e99778fce7e67c5514010e4436418a74de160191c95b417036b3ebf9a
+checksum=d0b04b6cab2c0498d30f3b59e51b7ae3e784376ef0d8246973049761bfe5cb7e

From b34335cce13b60ce8e8319b1535beb76f356edd3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 13:26:49 +0100
Subject: [PATCH 1659/2024] krdc: update to 21.04.0

---
 srcpkgs/krdc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/krdc/template b/srcpkgs/krdc/template
index 5db019fc2ec9..373d0325ef4d 100644
--- a/srcpkgs/krdc/template
+++ b/srcpkgs/krdc/template
@@ -1,6 +1,6 @@
 # Template file for 'krdc'
 pkgname=krdc
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -16,7 +16,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.2-only, LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/internet/org.kde.krdc"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=223e9efc636d752456aeb777523d556bd2d2b919a6729f5bf8e53ef643b8fc68
+checksum=8173c476dfec24fe12309b6726363c1a06566ec04e98330432cc53a375f33822
 
 krdc-devel_package() {
 	short_desc+=" - development files"

From a4286893859543e2c0b1e34846c3fb687f857a6e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 13:26:52 +0100
Subject: [PATCH 1660/2024] krfb: update to 21.04.0

---
 srcpkgs/krfb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/krfb/template b/srcpkgs/krfb/template
index 421988cf4f41..819314518582 100644
--- a/srcpkgs/krfb/template
+++ b/srcpkgs/krfb/template
@@ -1,6 +1,6 @@
 # Template file for 'krfb'
 pkgname=krfb
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 kdoctools
@@ -14,4 +14,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, GFDL-1.2-only, LGPL-2.1-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.krfb"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=8479b5ac9c955d06171b8ce4ec80ec178d7de263b441db3459fc1f307ed5e518
+checksum=8f1e9efb25d115a4b37037ff50d9123fc477318521a690db610b5bf41c084e6e

From 0af0937858a32f3b44a56dfda13004b59f40ee13 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 13:27:29 +0100
Subject: [PATCH 1661/2024] ktuberling: update to 21.04.0

---
 srcpkgs/ktuberling/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktuberling/template b/srcpkgs/ktuberling/template
index bb0527410a1d..86926be3140c 100644
--- a/srcpkgs/ktuberling/template
+++ b/srcpkgs/ktuberling/template
@@ -1,6 +1,6 @@
 # Template file for 'ktuberling'
 pkgname=ktuberling
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake kdoctools
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.ktuberling"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktuberling-${version}.tar.xz"
-checksum=06a949bf9eb07bdb42732e70c5cc0bdabc4aafedd257d58c5392b60de64c9f34
+checksum=518c00bbf363153b4948662c1299e0c24ce5258bbfc410efc383920adf1dcf93

From e81e866904434cbca3cf573e48b399f844d128b8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Mar 2021 13:28:02 +0100
Subject: [PATCH 1662/2024] libktorrent: update to 21.04.0

---
 srcpkgs/libktorrent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libktorrent/template b/srcpkgs/libktorrent/template
index e35c2cccb495..c1d402127f08 100644
--- a/srcpkgs/libktorrent/template
+++ b/srcpkgs/libktorrent/template
@@ -1,6 +1,6 @@
 # Template file for 'libktorrent'
 pkgname=libktorrent
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake python3 doxygen"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://apps.kde.org/en/ktorrent"
 distfiles="${KDE_SITE}/release-service/${version}/src/libktorrent-${version}.tar.xz"
-checksum=c31e083cf551e9b51a0641177469da6419c67182f61e4d1f2a000e7ef2767efa
+checksum=3b95d6ae91c416533129a3762742afdf7fea57526a12cded6e75ca2da65e1031
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons"

From 0b915563c2b4a68a74f2d11be663d52bb74a3a39 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 24 Apr 2021 14:51:22 +0200
Subject: [PATCH 1663/2024] mariadb: remove git from hostmakedepends

This caused a cyclic dep between git <> mariadb
git is only used in CMake if the source dir would actually be a git checkout
---
 srcpkgs/mariadb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index e6b8a8202770..db79671bf9dc 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -17,7 +17,7 @@ configure_args="-DBUILD_CONFIG=mysql_release
  -DWITH_EMBEDDED_SERVER=ON -DPLUGIN_TOKUDB=NO -DPLUGIN_BLACKHOLE=YES
  -DPLUGIN_PARTITION=YES -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF
  -DWITH_READLINE=ON -DWITH_SYSTEMD=no -DWITH_PCRE=system"
-hostmakedepends="bison perl flex pkg-config git"
+hostmakedepends="bison perl flex pkg-config"
 makedepends="ncurses-devel gnutls-devel libaio-devel boost-devel pam-devel zlib-devel
  pcre2-devel libatomic-devel"
 depends="mariadb-client"

From 3cae1f01d4e82eb3fde051d95db7e6c36ee374b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 24 Apr 2021 16:31:38 +0200
Subject: [PATCH 1664/2024] kcachegrind: update to 21.04.0.

---
 srcpkgs/kcachegrind/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcachegrind/template b/srcpkgs/kcachegrind/template
index 68c92d1033be..7d5d78937138 100644
--- a/srcpkgs/kcachegrind/template
+++ b/srcpkgs/kcachegrind/template
@@ -1,6 +1,6 @@
 # Template file for 'kcachegrind'
 pkgname=kcachegrind
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,5 +12,5 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/development/kcachegrind/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcachegrind-${version}.tar.xz"
-checksum=95e18b85ae69a522f1f0047960c2dbcc2553af284d18b45d5373746a7e5f69ea
+checksum=b91ce13625d1e0925fc27c8ec00e6b809d5765c6c612c7feda968454c6fdb4ad
 python_version=2

From 3f84ec05d02419418d1aa4956b705392660c808d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 24 Apr 2021 16:31:38 +0200
Subject: [PATCH 1665/2024] libkcddb: update to 21.04.0.

---
 srcpkgs/libkcddb/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libkcddb/template b/srcpkgs/libkcddb/template
index 6b68669db59c..736e1206be1f 100644
--- a/srcpkgs/libkcddb/template
+++ b/srcpkgs/libkcddb/template
@@ -1,6 +1,6 @@
 # Template file for 'libkcddb'
 pkgname=libkcddb
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -11,7 +11,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, BSD-3-Clause, GFDL-1.2-only"
 homepage="https://projects.kde.org/projects/kde/kdemultimedia/libkcddb"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkcddb-${version}.tar.xz"
-checksum=206229847e0fdde6d1cb36c7be87bd81e7723dd4774d06a872279a4b4390ee54
+checksum=997f61de1e98adf6d07eb51823bc7df3a9d686230e91e5e86bbd529b8185ebbb
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen
@@ -26,6 +26,6 @@ libkcddb-devel_package() {
 		vmove usr/include
 		vmove "usr/lib/*.so"
 		vmove usr/lib/qt5/mkspecs
-		vlicense cmake/COPYING-CMAKE-SCRIPTS
+		vlicense LICENSES/BSD-3-Clause.txt
 	}
 }

From 95e8e087dc7d4a83e5a449fc9b3d118b0e807acd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 24 Apr 2021 16:31:38 +0200
Subject: [PATCH 1666/2024] marble5: update to 21.04.0.

---
 srcpkgs/marble5/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/marble5/template b/srcpkgs/marble5/template
index 38d2b43fef46..7486faf0994b 100644
--- a/srcpkgs/marble5/template
+++ b/srcpkgs/marble5/template
@@ -1,6 +1,6 @@
 # Template file for 'marble5'
 pkgname=marble5
-version=20.12.3
+version=21.04.0
 revision=1
 wrksrc="marble-${version}"
 build_style=cmake
@@ -8,13 +8,14 @@ configure_args="-DBUILD_MARBLE_TESTS=NO -DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules kconfig-devel kcoreaddons-devel kdoctools
  kpackage-devel perl qt5-host-tools qt5-qmake gettext"
 makedepends="gpsd-devel knewstuff-devel kparts-devel krunner-devel phonon-qt5-devel
- qt5-location-devel qt5-serialport-devel qt5-webkit-devel shapelib-devel"
+ qt5-location-devel qt5-serialport-devel qt5-webkit-devel shapelib-devel
+ protobuf-devel"
 short_desc="Virtual globe and world atlas"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://marble.kde.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/marble-${version}.tar.xz"
-checksum=57b1b129dd0301c124ab5f930af9dfe044cedfcd42a6b180c6cf3c594fba7bc2
+checksum=187efcf9976f7e478a5420f5c4fd7ca73782b9bff58626e37e78c2efcae9c3b0
 
 pre_configure() {
 	vsed -i CMakeLists.txt -e 's/-Wcast-align//'

From df5817d779078e4fb7b0e2118bf4142653765f91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 24 Apr 2021 16:31:38 +0200
Subject: [PATCH 1667/2024] umbrello: update to 21.04.0.

---
 srcpkgs/umbrello/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/umbrello/template b/srcpkgs/umbrello/template
index cee0fe295258..0bfa4566c152 100644
--- a/srcpkgs/umbrello/template
+++ b/srcpkgs/umbrello/template
@@ -1,6 +1,6 @@
 # Template file for 'umbrello'
 pkgname=umbrello
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools qt5-host-tools qt5-qmake"
@@ -10,7 +10,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://umbrello.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/umbrello-${version}.tar.xz"
-checksum=57fb7d988e115be18514f807bab483a19877acc3f1910aeb952c4d8372f4d378
+checksum=1d5f7c637a59a68a1ee3c15f3c992a38f0a75671a407b299a64fc01b98d4bc9f
 python_version=2
 
 pre_configure() {

From ed7e13fc2fd84a51d2085517454127a045e278fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 24 Apr 2021 16:31:38 +0200
Subject: [PATCH 1668/2024] python3-PyICU: update to 2.7.2.

---
 srcpkgs/python3-PyICU/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-PyICU/template b/srcpkgs/python3-PyICU/template
index 6d2da03b0536..d6e94875a2b4 100644
--- a/srcpkgs/python3-PyICU/template
+++ b/srcpkgs/python3-PyICU/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-PyICU'
 pkgname=python3-PyICU
-version=2.7.1
+version=2.7.2
 revision=1
 wrksrc="pyicu-v${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://pypi.org/project/PyICU/"
 changelog="https://gitlab.pyicu.org/main/pyicu/-/raw/main/CHANGES"
 distfiles="https://gitlab.pyicu.org/main/pyicu/-/archive/v${version}/pyicu-v${version}.tar.bz2"
-checksum=c36114e39ab62a7c0fba56e8c5256c1eeae05d5207c766d3dd7ed422a8d877a3
+checksum=4cf32084652fefdbdef8b1f1e16cb3bd424eb72d816e0d7c22b3faa07029dd1c
 
 pre_check() {
 	export PYTHONPATH=$(cd build/lib* && pwd)

From 09001187ec2dc41b7c989c2ff3914427c50dc7fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 24 Apr 2021 16:31:39 +0200
Subject: [PATCH 1669/2024] python3-cheetah3: update to 3.2.6.post2.

---
 srcpkgs/python3-cheetah3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-cheetah3/template b/srcpkgs/python3-cheetah3/template
index fe46fbe09607..060110a29e1e 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.post1
+version=3.2.6.post2
 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=58b5d84e5fbff6cf8e117414b3ea49ef51654c02ee887d155113c5b91d761967
+checksum=63157d7a00a273b59676b5be5aa817c75c37efc88478231f1a160f4cfb7f7878
 conflicts="python-cheetah>=0"
 
 do_check() {

From ec93eb3dab093f902cbdbf811527780f520be7f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 24 Apr 2021 16:31:39 +0200
Subject: [PATCH 1670/2024] python3-jsondiff: update to 1.3.0.

---
 srcpkgs/python3-jsondiff/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-jsondiff/template b/srcpkgs/python3-jsondiff/template
index 7880b58ef06f..3ced80f96448 100644
--- a/srcpkgs/python3-jsondiff/template
+++ b/srcpkgs/python3-jsondiff/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-jsondiff'
 pkgname=python3-jsondiff
-version=1.2.0
-revision=3
+version=1.3.0
+revision=1
 wrksrc="jsondiff-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="MIT"
 homepage="https://github.com/ZoomerAnalytics/jsondiff"
 distfiles="${PYPI_SITE}/j/jsondiff/jsondiff-${version}.tar.gz"
-checksum=34941bc431d10aa15828afe1cbb644977a114e75eef6cc74fb58951312326303
+checksum=5122bf4708a031b02db029366184a87c5d0ddd5a327a5884ee6cf0193e599d71
 
 post_install() {
 	vlicense LICENSE

From e0b8e36721438cf090f3f8cbe6f67e8bd16df1e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 24 Apr 2021 16:31:39 +0200
Subject: [PATCH 1671/2024] python3-xxhash: update to 2.0.2.

---
 srcpkgs/python3-xxhash/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-xxhash/template b/srcpkgs/python3-xxhash/template
index 2d1658271cf8..e185a1163521 100644
--- a/srcpkgs/python3-xxhash/template
+++ b/srcpkgs/python3-xxhash/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-xxhash'
 pkgname=python3-xxhash
-version=2.0.0
-revision=2
+version=2.0.2
+revision=1
 wrksrc="xxhash-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="BSD-2-Clause"
 homepage="https://github.com/ifduyue/python-xxhash"
 distfiles="${PYPI_SITE}/x/xxhash/xxhash-${version}.tar.gz"
-checksum=58ca818554c1476fa1456f6cd4b87002e2294f09baf0f81e5a2a4968e62c423c
+checksum=b7bead8cf6210eadf9cecf356e17af794f57c0939a3d420a00d87ea652f87b49
 
 pre_build() {
 	export XXHASH_LINK_SO=1

From 6c8431c96de8da2ad79f7cbce24fd38a2b5c8b40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 23 Apr 2021 18:23:51 +0200
Subject: [PATCH 1672/2024] firefox: enable in i686

---
 srcpkgs/firefox/template | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index fdc688c6089e..338a2bb5b9e8 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -46,10 +46,6 @@ 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 f3d4dcdbc9d217c030b8dae6fbd7864c874f708d Mon Sep 17 00:00:00 2001
From: Will Springer <skirmisher@protonmail.com>
Date: Tue, 13 Apr 2021 01:17:10 -0700
Subject: [PATCH 1673/2024] OpenRCT2: fix build type

By default it produces a debug build, which crashes on assertions instead of
discarding them.
---
 srcpkgs/OpenRCT2/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index c5256b65287e..b36795aa9f76 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -5,7 +5,7 @@ pkgname=OpenRCT2
 _objects_version=1.0.21
 _titles_version=0.1.2c
 version=0.3.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="
  -DOPENRCT2_VERSION_TAG=${version}
@@ -37,6 +37,8 @@ skip_extraction="objects.zip title-sequences.zip"
 
 replaces="OpenRCT2-data>=0"
 
+CXXFLAGS="-DNDEBUG"
+
 build_options="multiplayer scripting"
 build_options_default="multiplayer scripting"
 desc_option_multiplayer="Enable multiplayer support"
@@ -48,7 +50,7 @@ fi
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" OpenRCT2"
-	CXXFLAGS="-DHAVE_IMMINTRIN_H=false -DSDL_DISABLE_IMMINTRIN_H=1"
+	CXXFLAGS+=" -DHAVE_IMMINTRIN_H=false -DSDL_DISABLE_IMMINTRIN_H=1"
 fi
 
 pre_configure() {

From 8e4bd6e4c6f5b4d0a4415ee35d9dfbbf2c82e884 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Sat, 24 Apr 2021 11:53:15 +1000
Subject: [PATCH 1674/2024] upmpdcli: update to 1.5.12

---
 srcpkgs/upmpdcli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/upmpdcli/template b/srcpkgs/upmpdcli/template
index 9aebe7b1e683..73fb2e4165ae 100644
--- a/srcpkgs/upmpdcli/template
+++ b/srcpkgs/upmpdcli/template
@@ -1,6 +1,6 @@
 # Template file for 'upmpdcli'
 pkgname=upmpdcli
-version=1.5.11
+version=1.5.12
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config tar"
@@ -10,7 +10,7 @@ maintainer="amak <amak.git@outlook.com>"
 license="LGPL-2.1-or-later"
 homepage="https://www.lesbonscomptes.com/upmpdcli"
 distfiles="https://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-${version}.tar.gz"
-checksum=7c8c6ab866114699405223c60457448dcce35fc13e1e374f68b60eefc55f4f04
+checksum=1d7b6ab360c2549a7e3eff4f261471761dd837e18327a3ca29de1981c090ff3b
 python_version=3
 
 system_accounts="_upmpdcli"

From 1542656e048ba4df91e5f7cc983a47ec001007e3 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Wed, 10 Mar 2021 10:23:22 +1100
Subject: [PATCH 1675/2024] New package: libinstpatch-1.1.6

---
 common/shlibs                 |  1 +
 srcpkgs/libinstpatch-devel    |  1 +
 srcpkgs/libinstpatch/template | 23 +++++++++++++++++++++++
 3 files changed, 25 insertions(+)
 create mode 120000 srcpkgs/libinstpatch-devel
 create mode 100644 srcpkgs/libinstpatch/template

diff --git a/common/shlibs b/common/shlibs
index a6895b823c6b..47a56de6dd87 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3927,3 +3927,4 @@ libldacBT_enc.so.2 ldacBT-2.0.2.3_1
 libgumbo.so.1 gumbo-parser-0.10.1_2
 libmariadb.so.3 libmariadbclient-10.5.9_1
 libmariadbd.so.19 libmariadbclient-10.5.9_1
+libinstpatch-1.0.so.2 libinstpatch-1.1.6_1
diff --git a/srcpkgs/libinstpatch-devel b/srcpkgs/libinstpatch-devel
new file mode 120000
index 000000000000..f2dc88bd2edd
--- /dev/null
+++ b/srcpkgs/libinstpatch-devel
@@ -0,0 +1 @@
+libinstpatch
\ No newline at end of file
diff --git a/srcpkgs/libinstpatch/template b/srcpkgs/libinstpatch/template
new file mode 100644
index 000000000000..76b23bb89d42
--- /dev/null
+++ b/srcpkgs/libinstpatch/template
@@ -0,0 +1,23 @@
+# Template file for 'libinstpatch'
+pkgname=libinstpatch
+version=1.1.6
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config glib-devel"
+makedepends="libglib-devel libsndfile-devel"
+short_desc="Instrument file software library"
+maintainer="Evgeny Ermakov <evgeny.v.ermakov@gmail.com>"
+license="LGPL-2.1-only"
+homepage="https://github.com/swami/libinstpatch"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=8e9861b04ede275d712242664dab6ffa9166c7940fea3b017638681d25e10299
+
+libinstpatch-devel_package() {
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From dc486b8c4caa4f36bf3a70fd89e5cac38f5931b0 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Mon, 12 Oct 2020 03:52:49 +1100
Subject: [PATCH 1676/2024] New package: muse-4.0.0

---
 srcpkgs/muse/template | 26 ++++++++++++++++++++++++++
 srcpkgs/muse/update   |  1 +
 2 files changed, 27 insertions(+)
 create mode 100644 srcpkgs/muse/template
 create mode 100644 srcpkgs/muse/update

diff --git a/srcpkgs/muse/template b/srcpkgs/muse/template
new file mode 100644
index 000000000000..51f5b4c37437
--- /dev/null
+++ b/srcpkgs/muse/template
@@ -0,0 +1,26 @@
+# Template file for 'muse'
+pkgname=muse
+version=4.0.0
+revision=1
+wrksrc="muse-${version}"
+build_wrksrc=src
+build_style=cmake
+build_helper=qmake
+configure_args="-DENABLE_RTAUDIO=OFF -DLIB_INSTALL_DIR=/usr/lib
+ $(vopt_bool alsa ENABLE_ALSA) $(vopt_bool python ENABLE_PYTHON)"
+hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
+makedepends="$(vopt_if alsa alsa-lib-devel) dssi-devel fluidsynth-devel
+ jack-devel ladish-devel ladspa-sdk libinstpatch-devel liblo-devel liblrdf-devel libsamplerate-devel
+ libsndfile-devel lilv-devel lv2 rubberband-devel qt5-svg-devel qt5-tools-devel
+ $(vopt_if python python3-devel)"
+depends="desktop-file-utils qt5-svg $(vopt_if python 'python3-six python3-Pyro4')"
+short_desc="MIDI/Audio sequencer with recording and editing capabilities"
+maintainer="Evgeny Ermakov <evgeny.v.ermakov@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://muse-sequencer.github.io"
+distfiles="https://github.com/muse-sequencer/muse/archive/${version/pre/-pre}.tar.gz"
+checksum=cdd4c76a19f5be2d72832f6ed0d22218647c58b33f2da45ab2223a4c04bddf96
+python_version=3
+
+build_options="alsa python"
+build_options_default="alsa python"
diff --git a/srcpkgs/muse/update b/srcpkgs/muse/update
new file mode 100644
index 000000000000..0dbd6ad5da4b
--- /dev/null
+++ b/srcpkgs/muse/update
@@ -0,0 +1 @@
+pattern="MusE \K[\d.]*\d"

From c7fc7a9c4cb6df4b53d141116dfefab12332e272 Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Sat, 24 Apr 2021 14:31:13 -0300
Subject: [PATCH 1677/2024] icewm: update to 2.3.2.

---
 srcpkgs/icewm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icewm/template b/srcpkgs/icewm/template
index 6b893aa533f8..1008bce045fe 100644
--- a/srcpkgs/icewm/template
+++ b/srcpkgs/icewm/template
@@ -1,6 +1,6 @@
 # Template file for 'icewm'
 pkgname=icewm
-version=2.3.1
+version=2.3.2
 revision=1
 build_style=cmake
 make_cmd=make
@@ -17,7 +17,7 @@ maintainer="Glaulher <glaulher.developer@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://ice-wm.org/"
 distfiles="https://github.com/ice-wm/icewm/archive/${version}.tar.gz"
-checksum=b44136a519fc2c5b8077879d1d13f2375646ff1580f3db54dd418dfc3b98e5fe
+checksum=42b6fd45c21ad2d106d4e6bebe62b628241c6209521a564eeef129c69cf23c41
 # broken tests
 make_check=no
 

From 10b7b5cd035ebe60f659177f2bdbec0ca06c13cb Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 24 Apr 2021 18:30:22 +0200
Subject: [PATCH 1678/2024] dbeaver: update to 21.0.3.

---
 .../patches/colortheme-plugin-update-url.patch      | 13 +++++++++++++
 srcpkgs/dbeaver/template                            |  4 ++--
 2 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/dbeaver/patches/colortheme-plugin-update-url.patch

diff --git a/srcpkgs/dbeaver/patches/colortheme-plugin-update-url.patch b/srcpkgs/dbeaver/patches/colortheme-plugin-update-url.patch
new file mode 100644
index 000000000000..c8c9b887c815
--- /dev/null
+++ b/srcpkgs/dbeaver/patches/colortheme-plugin-update-url.patch
@@ -0,0 +1,13 @@
+diff --git plugins/org.jkiss.dbeaver.ext.ui.colortheme/pom.xml plugins/org.jkiss.dbeaver.ext.ui.colortheme/pom.xml
+index 173322136b..6b9034eab5 100644
+--- plugins/org.jkiss.dbeaver.ext.ui.colortheme/pom.xml
++++ plugins/org.jkiss.dbeaver.ext.ui.colortheme/pom.xml
+@@ -16,7 +16,7 @@
+     <repositories>
+         <repository>
+             <id>eclipse-color-theme</id>
+-            <url>https://eclipse-color-theme.github.com/update</url>
++            <url>https://eclipse-color-theme.github.io/update/</url>
+             <layout>p2</layout>
+         </repository>
+     </repositories>
diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index 74249a296838..839984621cd2 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=21.0.2
+version=21.0.3
 revision=1
 # the build downloads binaries linked to glibc
 archs="x86_64"
@@ -11,7 +11,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="Apache-2.0"
 homepage="https://dbeaver.io"
 distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz"
-checksum=39f9d518d057884a2bfd2a4cee656190fe849b06fd7184b465d159c618a28837
+checksum=1573aee8642e6f65edc41b08376873765ddde72146c8b374d7e1e7e4cbbb0844
 nopie=true
 
 do_build() {

From fba6d603a0c2a7b474a0f40867c7bfa8475615f3 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 24 Apr 2021 20:30:46 +0200
Subject: [PATCH 1679/2024] electrum: update to 4.1.2.

---
 srcpkgs/electrum/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/electrum/template b/srcpkgs/electrum/template
index 5a7f44bcd334..b1a6a423ab55 100644
--- a/srcpkgs/electrum/template
+++ b/srcpkgs/electrum/template
@@ -1,6 +1,6 @@
 # Template file for 'electrum'
 pkgname=electrum
-version=4.1.1
+version=4.1.2
 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=359e14d91cdbeff4dd3c1c9973831c2d9dc3b95a84e795314705a73d72ecfbc8
+checksum=f1e0565a50e2f21a35a180f927239625f14e23a1d87be0a962bbb7895001ab82
 
 post_install() {
 	sed -i -e 's|electrum %u|electrum|' \

From d8fe26b23927706dc622d6dcac348de3c25009c1 Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Sat, 24 Apr 2021 00:05:28 +0200
Subject: [PATCH 1680/2024] freecad: update to 0.19.2

---
 srcpkgs/freecad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index 6c9f27c97df3..a11272680797 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,6 +1,6 @@
 # Template file for 'freecad'
 pkgname=freecad
-version=0.19.1
+version=0.19.2
 revision=1
 wrksrc="FreeCAD-${version}"
 build_style=cmake
@@ -36,7 +36,7 @@ maintainer="yopito <pierre.bourgin@free.fr>"
 license="LGPL-2.0-or-later"
 homepage="https://freecadweb.org/"
 distfiles="https://github.com/FreeCAD/FreeCAD/archive/${version}.tar.gz"
-checksum=5ec0003c18df204f7b449d4ac0a82f945b41613a0264127de3ef16f6b2efa60f
+checksum=47e39e3d6fcafe6e0c68923fb1b86acda16986268e5e6011694057b940139fba
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	makedepends+=" libexecinfo-devel"

From d6cc966703eddcbf280815d831cb81069a1acaa8 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 24 Apr 2021 16:16:20 +0300
Subject: [PATCH 1681/2024] libjpeg-turbo: update to 2.1.0.

---
 srcpkgs/libjpeg-turbo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libjpeg-turbo/template b/srcpkgs/libjpeg-turbo/template
index 777adf3c4de9..408b0c4fb929 100644
--- a/srcpkgs/libjpeg-turbo/template
+++ b/srcpkgs/libjpeg-turbo/template
@@ -1,6 +1,6 @@
 # Template file for 'libjpeg-turbo'
 pkgname=libjpeg-turbo
-version=2.0.6
+version=2.1.0
 revision=1
 build_style=cmake
 configure_args="-DWITH_JPEG8=1 -DCMAKE_INSTALL_LIBDIR=/usr/lib"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="IJG, BSD-3-Clause, Zlib"
 homepage="https://libjpeg-turbo.org/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=d74b92ac33b0e3657123ddcf6728788c90dc84dcb6a52013d758af3c4af481bb
+checksum=bef89803e506f27715c5627b1e3219c95b80fc31465d4452de2a909d382e4444
 
 provides="jpeg-8_1"
 replaces="jpeg>=0"

From 6a6ace6f458864dc8d9f9157a1ab6f2644881cd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Fri, 23 Apr 2021 00:56:15 +0200
Subject: [PATCH 1682/2024] podman: update to 3.1.2.

---
 srcpkgs/podman/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index 710f2352df44..0e2dd3ae025f 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,6 +1,6 @@
 # Template file for 'podman'
 pkgname=podman
-version=3.1.1
+version=3.1.2
 revision=1
 build_style=go
 go_import_path="github.com/containers/podman/v3"
@@ -14,7 +14,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://podman.io/"
 distfiles="https://github.com/containers/podman/archive/v${version}.tar.gz"
-checksum=4e6fb106c6363566b6edc4ac6caee0bdf6b788e01255c3b3bfcb64f4b6842229
+checksum=5a0d42e03d15e32c5c54a147da5ef1b8928ec00982ac9e3f1edc82c5e614b6d2
 
 if [ "$CROSS_BUILD" ]; then
 	go_build_tags+=" containers_image_openpgp"

From 476752c95eb2b379dd34186e400ace48823e271f Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 24 Apr 2021 09:43:45 +0300
Subject: [PATCH 1683/2024] tiff: update to 4.3.0.

---
 .../tiff/patches/CVE-2017-11613_part1.patch   | 40 -------------------
 .../tiff/patches/CVE-2017-11613_part2.patch   | 33 ---------------
 srcpkgs/tiff/template                         |  8 ++--
 3 files changed, 4 insertions(+), 77 deletions(-)
 delete mode 100644 srcpkgs/tiff/patches/CVE-2017-11613_part1.patch
 delete mode 100644 srcpkgs/tiff/patches/CVE-2017-11613_part2.patch

diff --git a/srcpkgs/tiff/patches/CVE-2017-11613_part1.patch b/srcpkgs/tiff/patches/CVE-2017-11613_part1.patch
deleted file mode 100644
index 12e20b21120f..000000000000
--- a/srcpkgs/tiff/patches/CVE-2017-11613_part1.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 3719385a3fac5cfb20b487619a5f08abbf967cf8 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Sun, 11 Mar 2018 11:14:01 +0100
-Subject: [PATCH] ChopUpSingleUncompressedStrip: avoid memory exhaustion (CVE-2017-11613)
-
-In ChopUpSingleUncompressedStrip(), if the computed number of strips is big
-enough and we are in read only mode, validate that the file size is consistent
-with that number of strips to avoid useless attempts at allocating a lot of
-memory for the td_stripbytecount and td_stripoffset arrays.
-
-Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2724
----
- libtiff/tif_dirread.c | 11 +++++++++++
- 1 file changed, 11 insertions(+)
-
-diff --git a/libtiff/tif_dirread.c b/libtiff/tif_dirread.c
-index 3fc0c8e..1a3259c 100644
---- libtiff/tif_dirread.c
-+++ libtiff/tif_dirread.c
-@@ -5698,6 +5698,17 @@ ChopUpSingleUncompressedStrip(TIFF* tif)
-         if( nstrips == 0 )
-             return;
- 
-+        /* If we are going to allocate a lot of memory, make sure that the */
-+        /* file is as big as needed */
-+        if( tif->tif_mode == O_RDONLY &&
-+            nstrips > 1000000 &&
-+            (tif->tif_dir.td_stripoffset[0] >= TIFFGetFileSize(tif) ||
-+             tif->tif_dir.td_stripbytecount[0] >
-+                    TIFFGetFileSize(tif) - tif->tif_dir.td_stripoffset[0]) )
-+        {
-+            return;
-+        }
-+
- 	newcounts = (uint64*) _TIFFCheckMalloc(tif, nstrips, sizeof (uint64),
- 				"for chopped \"StripByteCounts\" array");
- 	newoffsets = (uint64*) _TIFFCheckMalloc(tif, nstrips, sizeof (uint64),
---
-libgit2 0.27.0
-
diff --git a/srcpkgs/tiff/patches/CVE-2017-11613_part2.patch b/srcpkgs/tiff/patches/CVE-2017-11613_part2.patch
deleted file mode 100644
index bd3b13ed417c..000000000000
--- a/srcpkgs/tiff/patches/CVE-2017-11613_part2.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 7a092f8af2568d61993a8cc2e7a35a998d7d37be Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Sat, 17 Mar 2018 09:36:29 +0100
-Subject: [PATCH] ChopUpSingleUncompressedStrip: avoid memory exhaustion (CVE-2017-11613)
-
-Rework fix done in 3719385a3fac5cfb20b487619a5f08abbf967cf8 to work in more
-cases like https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=6979.
-Credit to OSS Fuzz
-
-Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2724
----
- libtiff/tif_dirread.c | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/libtiff/tif_dirread.c b/libtiff/tif_dirread.c
-index 1a3259c..6baa7b3 100644
---- libtiff/tif_dirread.c
-+++ libtiff/tif_dirread.c
-@@ -5702,9 +5702,8 @@ ChopUpSingleUncompressedStrip(TIFF* tif)
-         /* file is as big as needed */
-         if( tif->tif_mode == O_RDONLY &&
-             nstrips > 1000000 &&
--            (tif->tif_dir.td_stripoffset[0] >= TIFFGetFileSize(tif) ||
--             tif->tif_dir.td_stripbytecount[0] >
--                    TIFFGetFileSize(tif) - tif->tif_dir.td_stripoffset[0]) )
-+            (offset >= TIFFGetFileSize(tif) ||
-+             stripbytes > (TIFFGetFileSize(tif) - offset) / (nstrips - 1)) )
-         {
-             return;
-         }
---
-libgit2 0.27.0
-
diff --git a/srcpkgs/tiff/template b/srcpkgs/tiff/template
index e8531ee23d1c..4179cf8afc52 100644
--- a/srcpkgs/tiff/template
+++ b/srcpkgs/tiff/template
@@ -1,18 +1,18 @@
 # Template file for 'tiff'
 pkgname=tiff
-version=4.2.0
-revision=2
+version=4.3.0
+revision=1
 build_style=gnu-configure
 configure_args="--enable-cxx --without-x"
 hostmakedepends="automake libtool"
 makedepends="jbigkit-devel libjpeg-turbo-devel
  liblzma-devel libzstd-devel zlib-devel"
 short_desc="Library and tools for reading and writing TIFF data files"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="libtiff"
 homepage="http://libtiff.maptools.org/"
 distfiles="http://download.osgeo.org/libtiff/tiff-${version}.tar.gz"
-checksum=eb0484e568ead8fa23b513e9b0041df7e327f4ee2d22db5a533929dfc19633cb
+checksum=0e46e5acb087ce7d1ac53cf4f56a09b221537fc86dfc5daaad1c2e89e1b37ac8
 
 pre_configure() {
 	autoreconf -fi

From 82bf120c766c2adf84e71608d87ece13b608c39c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 23 Apr 2021 23:40:09 +0300
Subject: [PATCH 1684/2024] yoshimi: update to 2.0.1.

---
 srcpkgs/yoshimi/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/yoshimi/template b/srcpkgs/yoshimi/template
index 64a6c9ad433f..b836098f1c82 100644
--- a/srcpkgs/yoshimi/template
+++ b/srcpkgs/yoshimi/template
@@ -1,7 +1,7 @@
 # Template file for 'yoshimi'
 pkgname=yoshimi
-version=1.7.4
-revision=2
+version=2.0.1
+revision=1
 build_wrksrc=src
 build_style=cmake
 configure_args="-DCMAKE_INSTALL_DATAROOTDIR=/usr/share"
@@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="https://yoshimi.github.io/"
 distfiles="https://github.com/Yoshimi/$pkgname/archive/$version.tar.gz"
-checksum=27a8e33bda72aafae604e14841bed6373fc9e00ff70c98f1e13215d6a8808318
+checksum=b80a8b49bdf0e1f6c382627afc46c82d03219b7e45cdecd933e6fc046a939967
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) makedepends+=" argp-standalone";;

From ccf6bbf78d6274a67221f4dfc5ee8e57697cc760 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sat, 24 Apr 2021 00:13:56 +0200
Subject: [PATCH 1685/2024] python3: remove obsolete --with-threads configure
 option

Thread-less builds became unsupported in upstream commit a6a4dc816d68
("bpo-31370: Remove support for threads-less builds (#3385)"), and as
such this config option has been unrecognized since python3.7.
---
 srcpkgs/python3-tkinter/template | 2 +-
 srcpkgs/python3/template         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-tkinter/template b/srcpkgs/python3-tkinter/template
index d52b5cdb66ec..bb0f962c486d 100644
--- a/srcpkgs/python3-tkinter/template
+++ b/srcpkgs/python3-tkinter/template
@@ -47,7 +47,7 @@ do_configure() {
 	fi
 	./configure ${configure_args} ${_args} \
 		--enable-shared --enable-ipv6 --enable-loadable-sqlite-extensions \
-		--with-threads --with-computed-gotos --with-dbmliborder=gdbm:ndbm \
+		--with-computed-gotos --with-dbmliborder=gdbm:ndbm \
 		--with-system-expat --with-system-ffi --without-ensurepip
 }
 
diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index 223a28dc1288..96a4a9dfd7e2 100644
--- a/srcpkgs/python3/template
+++ b/srcpkgs/python3/template
@@ -48,7 +48,7 @@ do_configure() {
 	fi
 	./configure ${configure_args} ${_args} \
 		--enable-shared --enable-ipv6 --enable-loadable-sqlite-extensions \
-		--with-threads --with-computed-gotos --with-dbmliborder=gdbm:ndbm \
+		--with-computed-gotos --with-dbmliborder=gdbm:ndbm \
 		--with-system-expat --with-system-ffi --without-ensurepip
 }
 

From 462f819d6cee1e0feaed58fdb1aabd23ce512f58 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 24 Apr 2021 00:35:56 +0300
Subject: [PATCH 1686/2024] inxi: update to 3.3.04.

---
 srcpkgs/inxi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/inxi/template b/srcpkgs/inxi/template
index 98b00dde3391..87ebbdb9ff3a 100644
--- a/srcpkgs/inxi/template
+++ b/srcpkgs/inxi/template
@@ -1,6 +1,6 @@
 # Template file for 'inxi'
 pkgname=inxi
-version=3.2.01
+version=3.3.04
 revision=1
 wrksrc="inxi-${version}-1"
 depends="dmidecode file glxinfo pciutils perl usbutils xdpyinfo xprop xrandr
@@ -11,7 +11,7 @@ license="GPL-3.0-or-later"
 homepage="https://smxi.org/docs/inxi.htm"
 changelog="https://raw.githubusercontent.com/smxi/inxi/master/inxi.changelog"
 distfiles="https://github.com/smxi/inxi/archive/${version}-1.tar.gz"
-checksum=5949170421249ef9c88abe577cca0487ad77195b8b0bea4a6ade1211efee85e5
+checksum=1f029f5f667e0396ab9f6ba2c51cf7937ea38bf504d1621a8c50e19205a7a671
 
 do_install() {
 	vbin inxi

From ce951b87c17cd2fe71f6e23b05aa3634c0869a5f Mon Sep 17 00:00:00 2001
From: eater <=@eater.me>
Date: Thu, 22 Apr 2021 14:19:28 +0200
Subject: [PATCH 1687/2024] terraform: update to 0.15.0

---
 srcpkgs/terraform/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template
index b6c3a4e641ec..ee187a2a91cb 100644
--- a/srcpkgs/terraform/template
+++ b/srcpkgs/terraform/template
@@ -1,6 +1,6 @@
 # Template file for 'terraform'
 pkgname=terraform
-version=0.14.7
+version=0.15.0
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/$pkgname"
@@ -9,4 +9,4 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MPL-2.0"
 homepage="https://www.terraform.io/"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=8d411d067d35660f7e2622dacb5be87e108929321b6732c6770ec89ebe07231d
+checksum=89e1d82ee6f02bb9c280f1d9ab0c0edc6061c4442bf43af0f4e4f1001730188e

From 693f4f45e711ee5f8cd33572795e8411333baba1 Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Sat, 24 Apr 2021 23:22:05 +0200
Subject: [PATCH 1688/2024] okteta: update to 0.26.6

---
 .../patches/cmake.testing.working_dir.patch   | 26 +++++++++++++++++++
 srcpkgs/okteta/template                       |  6 ++---
 2 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/okteta/patches/cmake.testing.working_dir.patch

diff --git a/srcpkgs/okteta/patches/cmake.testing.working_dir.patch b/srcpkgs/okteta/patches/cmake.testing.working_dir.patch
new file mode 100644
index 000000000000..7a5dc935288b
--- /dev/null
+++ b/srcpkgs/okteta/patches/cmake.testing.working_dir.patch
@@ -0,0 +1,26 @@
+upstream bug: https://bugs.kde.org/show_bug.cgi?id=436128
+
+--- kasten/controllers/CMakeLists.txt.ORIG	2021-03-29 13:51:56.000000000 +0200
++++ kasten/controllers/CMakeLists.txt	2021-04-24 23:12:17.358195447 +0200
+@@ -584,15 +584,12 @@
+     LINK_LIBRARIES structureview-tested-srcs Qt5::Test poddecoder-typeeditors
+   )
+ 
+-  # remove useless default definition of QT_TESTCASE_BUILDDIR in interface from imported target Qt5::Test
+-  get_target_property(qttestdefs Qt5::Test INTERFACE_COMPILE_DEFINITIONS)
+-  list(FILTER qttestdefs EXCLUDE REGEX [[^QT_TESTCASE_BUILDDIR=]])
+-  set_property(TARGET Qt5::Test PROPERTY INTERFACE_COMPILE_DEFINITIONS ${qttestdefs})
+-  # set the definition as needed for our tests
+-  target_compile_definitions(customtostringtest PRIVATE QT_TESTCASE_BUILDDIR="${CMAKE_CURRENT_BINARY_DIR}")
+-  target_compile_definitions(jsparsertest       PRIVATE QT_TESTCASE_BUILDDIR="${CMAKE_CURRENT_BINARY_DIR}")
+-  # TODO: still fragile once __FILE__ is neither absolute or full relative path to this build dir
+-  # look into using custom code intead of simple QFINDTESTDATA usage
++  # The tests below are using data files that are pointed via QFINDTESTDATA macro,
++  # that is related to cmake WORKING_DIRECTORY. WORKING_DIRECTORY points the current
++  # directory, while data files are stored in test/ subdirectory.
++  # So set WORKING_DIRECTORY correctly.
++  target_compile_definitions(customtostringtest PRIVATE WORKING_DIRECTORY="${CMAKE_CURRENT_SOURCE_DIR}/test")
++  target_compile_definitions(jsparsertest       PRIVATE WORKING_DIRECTORY="${CMAKE_CURRENT_SOURCE_DIR}/test")
+ 
+   #replace tool unit tests
+   ecm_add_test(
diff --git a/srcpkgs/okteta/template b/srcpkgs/okteta/template
index 6cef4e659fe5..a8c011b83522 100644
--- a/srcpkgs/okteta/template
+++ b/srcpkgs/okteta/template
@@ -1,7 +1,7 @@
 # Template file for 'okteta'
 pkgname=okteta
 reverts="4.14.3_1"
-version=0.26.5
+version=0.26.6
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext python qt5-qmake qt5-host-tools
@@ -13,9 +13,9 @@ checkdepends="AppStream"
 short_desc="Hexadecimal editor for binary files"
 maintainer="yopito <pierre.bourgin@free.fr>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
-homepage="https://kde.org/applications/utilities/org.kde.okteta"
+homepage="https://apps.kde.org/okteta/"
 distfiles="${KDE_SITE}/okteta/${version}/src/okteta-${version}.tar.xz"
-checksum=9fc7edfff73e7b0583af540b0c052f9221ca3f11ea3fc3604c2bcedb09c29a97
+checksum=c569cd5b55503e46df1a5b5c9162b08888c426aa52c6f3f2f926c658bee0144c
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen

From 79e6859b2326efdfd016ae72cbd67714b256adc7 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 20 Apr 2021 12:30:39 +0200
Subject: [PATCH 1689/2024] elogind: update to 246.10.

---
 srcpkgs/elogind/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elogind/template b/srcpkgs/elogind/template
index d4bfe499bc55..59824140e885 100644
--- a/srcpkgs/elogind/template
+++ b/srcpkgs/elogind/template
@@ -1,6 +1,6 @@
 # Template file for 'elogind'
 pkgname=elogind
-version=246.9.2
+version=246.10
 revision=1
 build_style=meson
 configure_args="-Dcgroup-controller=elogind -Dhalt-path=/usr/bin/halt
@@ -17,7 +17,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://github.com/elogind/elogind"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz"
-checksum=dd2fcf22a89a078cad22e633d2f14a4cc9f4a9c8bae25c0e39fc4aec3e273bc9
+checksum=c490dc158c8f5bca8d00ecfcc7ad5af24d1c7b9e59990a0b3b1323996221a922
 conf_files="/etc/elogind/*.conf"
 # tests fail differently due to containerization and kernel features
 make_check=extended

From 5d22f1948154d0db6355457f696659217dd50e79 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 25 Apr 2021 07:26:41 +0200
Subject: [PATCH 1690/2024] Revert "elogind: update to 246.10."

This reverts commit 2342012e9efa637fb4c29ad0ef611649867ceecc.

elogind breaks libseatd backend with this error message:

  00:00:00.006 [ERROR] [wlr] [libseat] [libseat/backend/logind.c:267] Could not activate session: Permission denied
---
 srcpkgs/elogind/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/elogind/template b/srcpkgs/elogind/template
index 59824140e885..72f4aa18f421 100644
--- a/srcpkgs/elogind/template
+++ b/srcpkgs/elogind/template
@@ -1,7 +1,8 @@
 # Template file for 'elogind'
 pkgname=elogind
-version=246.10
-revision=1
+reverts="246.10_1"
+version=246.9.2
+revision=2
 build_style=meson
 configure_args="-Dcgroup-controller=elogind -Dhalt-path=/usr/bin/halt
  -Drootlibexecdir=/usr/libexec/elogind -Dreboot-path=/usr/bin/reboot
@@ -17,7 +18,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://github.com/elogind/elogind"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz"
-checksum=c490dc158c8f5bca8d00ecfcc7ad5af24d1c7b9e59990a0b3b1323996221a922
+checksum=dd2fcf22a89a078cad22e633d2f14a4cc9f4a9c8bae25c0e39fc4aec3e273bc9
 conf_files="/etc/elogind/*.conf"
 # tests fail differently due to containerization and kernel features
 make_check=extended

From a7b91d7ff990b02e3d176c2ffbb09ab094eb3200 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 25 Apr 2021 01:29:15 -0300
Subject: [PATCH 1691/2024] ZMusic: stop dlopening deps.

Force it to link against libfluidsynth and libsndfile (which fixes a
bug, because it only tried dlopening libfluidsynth.so.{1,2} and we ship .3).

Also add mpg123 as a bonus and remove the unused openal (not mentioned
at all) and gme (their version fixes bugs still present in upstream)
deps.
---
 srcpkgs/ZMusic/template | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/ZMusic/template b/srcpkgs/ZMusic/template
index 3eb79a261c03..5d630d1aa3f5 100644
--- a/srcpkgs/ZMusic/template
+++ b/srcpkgs/ZMusic/template
@@ -1,13 +1,11 @@
 # Template file for 'ZMusic'
 pkgname=ZMusic
 version=1.1.6
-revision=1
+revision=2
 build_style=cmake
-configure_args="-DGME_INCLUDE_DIR=/usr/include -DGME_LIBRARIES=gme"
+configure_args="-DDYN_SNDFILE=OFF -DDYN_FLUIDSYNTH=OFF -DDYN_MPG123=OFF"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel alsa-lib-devel libgme-devel libopenal-devel libsndfile-devel"
-# these are dlopened
-depends="libfluidsynth libopenal libsndfile"
+makedepends="zlib-devel alsa-lib-devel libsndfile-devel fluidsynth-devel mpg123-devel"
 short_desc="GZDoom's music system"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later"

From c9a944381ba6e206a466050962b890658d6e0a08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 25 Apr 2021 01:36:09 -0300
Subject: [PATCH 1692/2024] gzdoom: update to 4.5.0, adopt.

Force linking to gtk and openal instead of dlopening.
Clean up unused deps.

Thanks nbm for initial update diff and prompting.
---
 srcpkgs/gzdoom/template | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template
index 8ee85e031747..ce1204db0d01 100644
--- a/srcpkgs/gzdoom/template
+++ b/srcpkgs/gzdoom/template
@@ -1,23 +1,25 @@
 # Template file for 'gzdoom'
 pkgname=gzdoom
-version=4.4.2
+version=4.5.0
 revision=1
-_tagdate=2020-06-16
+_tagdate=2021-10-31
+_widepix_commit=f4bb3541edd570cbccb58e5cdaba3dc0979208b9
 wrksrc="${pkgname}-g${version}"
 build_style=cmake
-configure_args="-DINSTALL_PK3_PATH=share/gzdoom"
+configure_args="-DINSTALL_PK3_PATH=share/gzdoom -DDYN_GTK=OFF -DDYN_OPENAL=OFF"
 hostmakedepends="pkg-config tar xz"
-makedepends="SDL2-devel gtk+3-devel fluidsynth-devel libgme-devel libgomp-devel
- ppl-devel ZMusic-devel"
-depends="gtk+3"
+makedepends="SDL2-devel gtk+3-devel libgomp-devel ZMusic-devel libopenal-devel"
 short_desc="Advanced Doom source port with OpenGL support"
-maintainer="Michael Straube <straubem@gmx.de>"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.zdoom.org"
-distfiles="https://github.com/coelckers/${pkgname}/archive/g${version}.tar.gz
- https://github.com/coelckers/${pkgname}/releases/download/g${version}/${pkgname}_${version}_amd64.deb"
-checksum="d0ede9aefa8834b6d97a8a5336e57077475f43c297447f75b37550ee93010674
- ccff299967bd47c8154d3af835fe514df29fc0560831437074a4b5ada674e6ba"
+# WARNING: watch out for new submodules
+distfiles="https://github.com/coelckers/gzdoom/archive/g${version}.tar.gz
+ https://github.com/coelckers/gzdoom/releases/download/g${version}/gzdoom_${version}_amd64.deb
+ https://github.com/nashmuhandes/WidePix/archive/${_widepix_commit}.tar.gz"
+checksum="21eb1a221dae532a6c29f243584be3d5454f8eb4da85a67e405115f89666611d
+ 2f07795728940fca07aa9771d5a8bb77f7764862b96cc5a4126a5b8db7a357b8
+ e0b85ca089a3714968f56acc9525f352dbec14f15e88e0aef1cdece64c4f3cbf"
 skip_extraction="${pkgname}_${version}_amd64.deb"
 nocross=yes
 
@@ -33,6 +35,11 @@ post_extract() {
 	bsdtar xOf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}_${version}_amd64.deb data.tar.xz |
 	tar --strip-components=4 -xJf - ./usr/share/{pixmaps/gzdoom.png,applications/gzdoom.desktop}
 
+	rmdir wadsrc_widescreen/static
+	mv ../WidePix-${_widepix_commit} wadsrc_widescreen/static
+}
+
+post_patch() {
 	vsed -e "s|GIT_DESCRIPTION|\"${version}\"|g" -i src/gitinfo.cpp
 	vsed -e "s|VERSIONSTR|\"${version}\"|g" -i src/gitinfo.cpp
 	vsed -e "s|GIT_TIME|\"${_tagdate}\"|g" -i src/gitinfo.cpp

From 769b6dc57742b48993269b6a26bba01c329f454d Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 25 Apr 2021 11:51:14 +0200
Subject: [PATCH 1693/2024] wine: update to 6.7.

---
 srcpkgs/wine/patches/musl-ns_name_skip.patch | 4 ++--
 srcpkgs/wine/template                        | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/wine/patches/musl-ns_name_skip.patch b/srcpkgs/wine/patches/musl-ns_name_skip.patch
index 3246959f9bbb..9ddf5fd665e1 100644
--- a/srcpkgs/wine/patches/musl-ns_name_skip.patch
+++ b/srcpkgs/wine/patches/musl-ns_name_skip.patch
@@ -1,7 +1,7 @@
 diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c
 index ac52147..0f8c2ef 100644
---- wine-6.6/dlls/dnsapi/libresolv.c
-+++ wine-6.6/dlls/dnsapi/libresolv.c
+--- wine-6.7/dlls/dnsapi/libresolv.c
++++ wine-6.7/dlls/dnsapi/libresolv.c
 @@ -57,6 +57,43 @@
  
  WINE_DEFAULT_DEBUG_CHANNEL(dnsapi);
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 5b0d64f18e2e..a88ba370500f 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=6.6
+version=6.7
 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="99e522c6dcc0ac1d53d201bf3054891fdf11864257473c3eb341e37671fd84ad
- c3fbcce35388b917981d72533d7d66ccc57b2b1e5af01435af0cb9b054744206"
+checksum="c30514b7761d4611514ae021cb1e354128d77eff54a283f1401ee702277bbea4
+ e539bde0f7ffcb9f70c5474f0f397bdbbc3b48a1922d2abf0a32dc2d6f994694"
 
 build_options="mingw staging"
 build_options_default="mingw"

From a265ee83322eb94d1b77421914439e67a08833c9 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 25 Apr 2021 11:52:47 +0200
Subject: [PATCH 1694/2024] gscan2pdf: update to 2.12.1.

---
 srcpkgs/gscan2pdf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gscan2pdf/template b/srcpkgs/gscan2pdf/template
index cbd283882433..9c137da14b8b 100644
--- a/srcpkgs/gscan2pdf/template
+++ b/srcpkgs/gscan2pdf/template
@@ -1,6 +1,6 @@
 # Template file for 'gscan2pdf'.
 pkgname=gscan2pdf
-version=2.12.0
+version=2.12.1
 revision=1
 build_style=perl-module
 hostmakedepends="perl gettext"
@@ -16,7 +16,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-3.0-or-later"
 homepage="http://gscan2pdf.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=a3c4666546e1a6346c906a24d547833f2293c7d3a3663f48daa1ec7c9539d103
+checksum=e5c10a9e695674308d29fe8661c5bb7230e25dfbc098716c26a3188ef1e54074
 nocross=yes
 
 do_check() {

From 5bf0ef2aceab3dccb34ea1965f9f6ed50f64f903 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 25 Apr 2021 11:56:12 +0200
Subject: [PATCH 1695/2024] linux5.4: update to 5.4.114.

---
 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 7393717ae68f..b1e8f6aeafcc 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.113
+version=5.4.114
 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=30cde92463c474b75f9eb197654570dd6dbb32ec20695544c5469f292662da47
+checksum=be98f087cb58f23bc5edb8ee80a4794a569d48049d75b1a8eaef9f80fede9557
 python_version=3
 patch_args="-Np1"
 

From ccb5e68d409bf3197f68c88c82214936911dbaa3 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 25 Apr 2021 12:00:19 +0200
Subject: [PATCH 1696/2024] libkdcraw5: update to 20.04.0.

---
 srcpkgs/libkdcraw5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkdcraw5/template b/srcpkgs/libkdcraw5/template
index dcdac1921070..34a2e432eee4 100644
--- a/srcpkgs/libkdcraw5/template
+++ b/srcpkgs/libkdcraw5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdcraw5'
 pkgname=libkdcraw5
-version=20.12.3
+version=20.04.0
 revision=1
 wrksrc="libkdcraw-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdcraw-${version}.tar.xz"
-checksum=4f12042ea57547cf03d5c82c5adb31b8df3c6b7c6b0fd4eb195885f109c88def
+checksum=a8abe962fc739abcc2efeb97472a366c6c3c47b7398e61660e71febe9aedfe5a
 
 libkdcraw5-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 254bdb3dfc2172a387246d8579f8711ecdf6d2ef Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 25 Apr 2021 12:47:39 +0200
Subject: [PATCH 1697/2024] gwenview: update to 20.04.0.

---
 srcpkgs/gwenview/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gwenview/template b/srcpkgs/gwenview/template
index 30718e233b4b..b771d3e490ad 100644
--- a/srcpkgs/gwenview/template
+++ b/srcpkgs/gwenview/template
@@ -1,6 +1,6 @@
 # Template file for 'gwenview'
 pkgname=gwenview
-version=20.12.3
+version=20.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
@@ -14,7 +14,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/gwenview"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=68234a515f0870c295020a4a7495f42e785e4ad1cce536c77f108a41561b41a2
+checksum=420671703565f5d2824d430589cd104e6030fd2ffd13ba6453af92d897c9a574
 patch_args="-Np1"
 
 pre_configure() {

From 3153c71d7cb51ac1f8f8d570494963caa60fde71 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 25 Apr 2021 12:52:10 +0200
Subject: [PATCH 1698/2024] lxqt-powermanagement: update to 0.17.1.

---
 srcpkgs/lxqt-powermanagement/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lxqt-powermanagement/template b/srcpkgs/lxqt-powermanagement/template
index 827218fc19f1..e68666dddab4 100644
--- a/srcpkgs/lxqt-powermanagement/template
+++ b/srcpkgs/lxqt-powermanagement/template
@@ -1,6 +1,6 @@
 # Template file for 'lxqt-powermanagement'
 pkgname=lxqt-powermanagement
-version=0.17.0
+version=0.17.1
 revision=1
 build_style=cmake
 hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools perl"
@@ -10,4 +10,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://lxqt.org/"
 distfiles="https://github.com/lxqt/lxqt-powermanagement/releases/download/${version}/lxqt-powermanagement-${version}.tar.xz"
-checksum=b74abdc3294c109e3cd2316ae2fbea305a799141e225c5e1a229920f295690b1
+checksum=93e14720571c6c9f30abb507df3cf0249e69824c0ca374fefd1f688614ead202

From e2f3b0803be4dcaf81b7875169ff4b337484206d Mon Sep 17 00:00:00 2001
From: Domenico Panella <pandom79@gmail.com>
Date: Sun, 25 Apr 2021 11:51:13 +0200
Subject: [PATCH 1699/2024] dolphin-plugins: update to 21.04.0

---
 srcpkgs/dolphin-plugins/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dolphin-plugins/template b/srcpkgs/dolphin-plugins/template
index 26452a19baa4..415a419f040e 100644
--- a/srcpkgs/dolphin-plugins/template
+++ b/srcpkgs/dolphin-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin-plugins'
 pkgname=dolphin-plugins
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-qmake qt5-host-tools kcoreaddons kconfig"
@@ -10,4 +10,4 @@ maintainer="Domenico Panella <pandom79@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin_plugins"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=fcb2ca9acf2ef3b7aaa8d5bf66920fc79983952cda7223416d172802ad9a5e80
+checksum=9fb395bfc62b726a4feae87b89d97294262cdadbeadf69706d7f314b1ff488d2

From 29bdf018bbf01ae9bd27e5e2925add5de94994c3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Apr 2021 14:02:44 +0200
Subject: [PATCH 1700/2024] wireguard-dkms: update to 1.0.20210424.

---
 srcpkgs/wireguard-dkms/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wireguard-dkms/template b/srcpkgs/wireguard-dkms/template
index 48b237c45378..f80865965f47 100644
--- a/srcpkgs/wireguard-dkms/template
+++ b/srcpkgs/wireguard-dkms/template
@@ -1,6 +1,6 @@
 # Template file for 'wireguard-dkms'
 pkgname=wireguard-dkms
-version=1.0.20210219
+version=1.0.20210424
 revision=1
 wrksrc="wireguard-linux-compat-${version}"
 build_wrksrc="src"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://www.wireguard.com/"
 distfiles="https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz"
-checksum=99d35296b8d847a0d4db97a4dda96b464311a6354e75fe0bef6e7c4578690f00
+checksum=8839139a53733bd20602e39cfc679a8176747dae8fe9f9c7fce28f8fba71abde
 
 dkms_modules="wireguard ${version}"
 

From b8fa554eff4d645a893a96da3a127503785acd19 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Apr 2021 14:04:01 +0200
Subject: [PATCH 1701/2024] wireguard-tools: update to 1.0.20210424.

---
 srcpkgs/wireguard-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wireguard-tools/template b/srcpkgs/wireguard-tools/template
index a089ff234b1a..fdff0618751c 100644
--- a/srcpkgs/wireguard-tools/template
+++ b/srcpkgs/wireguard-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'wireguard-tools'
 pkgname=wireguard-tools
-version=1.0.20210315
+version=1.0.20210424
 revision=1
 build_wrksrc="src"
 build_style=gnu-makefile
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://www.wireguard.com/"
 distfiles="https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-${version}.tar.xz"
-checksum=af001d5492be6bf58ef0bebe04b446b6f50eb53e1226fab679cc34af40733a22
+checksum=b288b0c43871d919629d7e77846ef0b47f8eeaa9ebc9cedeee8233fc6cc376ad
 make_dirs="/etc/wireguard 0700 root root"
 
 post_extract() {

From 2a3712bdeeaf177de52792678cb54f20627813a5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 25 Apr 2021 14:05:45 +0200
Subject: [PATCH 1702/2024] scite: update to 5.0.2.

---
 srcpkgs/scite/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scite/template b/srcpkgs/scite/template
index e56284d0f4f7..5ea146beafb9 100644
--- a/srcpkgs/scite/template
+++ b/srcpkgs/scite/template
@@ -1,6 +1,6 @@
 # Template file for 'scite'
 pkgname=scite
-version=5.0.1
+version=5.0.2
 revision=1
 create_wrksrc=yes
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://www.scintilla.org/SciTEDownload.html"
 distfiles="https://www.scintilla.org/scite${version//./}.tgz"
-checksum=6d5d7b9caa895a3b72245e4b7459a678b9325d497c28bc92bc92f21fd65329b7
+checksum=56dd05fccc199bd8853f3554dab0c9909a0bacb1bf8122c4ddf3b812527ec202
 
 post_extract() {
 	sed -i 's/gthread-2.0/& lua/' scite/gtk/makefile

From 81949be717a4bc70fc94c752bdeaaf4e180519ce Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 24 Apr 2021 11:18:26 -0400
Subject: [PATCH 1703/2024] xpra: update to 4.1.3.

---
 srcpkgs/xpra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template
index 302effb9ded3..a67db644e15f 100644
--- a/srcpkgs/xpra/template
+++ b/srcpkgs/xpra/template
@@ -1,6 +1,6 @@
 # Template file for 'xpra'
 pkgname=xpra
-version=4.1.2
+version=4.1.3
 revision=1
 build_style=python3-module
 make_install_args="$(vopt_with docs)"
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later"
 homepage="https://xpra.org/"
 changelog="https://raw.githubusercontent.com/Xpra-org/xpra/master/docs/CHANGELOG.md"
 distfiles="https://github.com/Xpra-org/xpra/archive/v${version}.tar.gz"
-checksum=2b7b05ec77ee0c16a8312e231d8429699b5b2aada7b549c72f5521a5f8563dfe
+checksum=1afaec02bb283361b4b9b0902726612d14d1a25ea9bca913e448a3190f7c6dca
 conf_files="/etc/xpra/xpra.conf /etc/xpra/xorg.conf /etc/xpra/conf.d/*"
 
 system_groups="xpra"

From 3a26eae3db04caaee799f7ceabebca311bb18ed3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 24 Apr 2021 11:20:03 -0400
Subject: [PATCH 1704/2024] python3-pytools: update to 2021.2.5.

---
 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 e1c2bd5f80d9..dcff93248267 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.3
+version=2021.2.5
 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=5f953063afe8218ef42d71dd461ce8f9587899ea561db19c64f2701a08eee57e
+checksum=a96eae85aad86fe63cefa06e6cd9f6dcf8e85bd9aab0fd00b7f381a6366c5776
 
 post_install() {
 	vlicense LICENSE

From aec640239a41c15d125897ab956561f2def06167 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 24 Apr 2021 11:28:03 -0400
Subject: [PATCH 1705/2024] python3-hypothesis: update to 6.10.0.

---
 srcpkgs/python3-hypothesis/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-hypothesis/template b/srcpkgs/python3-hypothesis/template
index f66e8e3ddc19..b30cf143d996 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.9.0
+version=6.10.0
 revision=1
 wrksrc="hypothesis-hypothesis-python-${version}"
 build_wrksrc=hypothesis-python
@@ -15,7 +15,7 @@ license="MPL-2.0"
 homepage="https://hypothesis.works/"
 changelog="https://hypothesis.readthedocs.io/en/latest/changes.html"
 distfiles="https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-${version}.tar.gz"
-checksum=c44ee0355477012d4fad8650aff95bfcb6346a21ea8248010ee915c30eff462a
+checksum=26e01da7c57768e0c3a69bac6789a505a69fe1f4696953c587d827806108c931
 
 do_check() {
 	# Manually run the tests that tox considers part of the "full" suite,

From 70335163abc0ebbdf89d7ec3f6203f7883bfe24d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 24 Apr 2021 11:30:40 -0400
Subject: [PATCH 1706/2024] python3-breathe: update to 4.29.1.

---
 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 2c041b141f2a..59f8adea7ccb 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.29.0
+version=4.29.1
 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=5fc965cfd248c01909a4ba78f3d7130d85e08b6f373b5224f4fc682cbfd760b4
+checksum=72cf9ade88f3e9163e0730e4089fde7b92464f691d29250019983457a977df44
 
 post_install() {
 	vlicense LICENSE

From 2306bffbd6889dd4bdf81c19102a44a6100597a2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 24 Apr 2021 14:59:32 +0200
Subject: [PATCH 1707/2024] electron10: update to 10.4.3.

---
 .../files/patches/electron-exclude-content-test-patches.patch | 2 +-
 srcpkgs/electron10/template                                   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/electron10/files/patches/electron-exclude-content-test-patches.patch b/srcpkgs/electron10/files/patches/electron-exclude-content-test-patches.patch
index ccc17a0f303f..456223644278 100644
--- a/srcpkgs/electron10/files/patches/electron-exclude-content-test-patches.patch
+++ b/srcpkgs/electron10/files/patches/electron-exclude-content-test-patches.patch
@@ -4,7 +4,7 @@
    for patch_dir, repo in dirs.items():
      git.import_patches(repo=repo, patch_data=patch_from_dir(patch_dir),
        threeway=threeway is not None,
-+      exclude=['test/mjsunit/**', 'content/test/**', 'test/cctest/**', 'test/unittests/**'],
++      exclude=['test/mjsunit/**', 'content/test/**', 'test/cctest/**', 'test/unittests/**', 'third_party/blink/web_tests/**'],
        committer_name="Electron Scripts", committer_email="scripts@electron")
  
  
diff --git a/srcpkgs/electron10/template b/srcpkgs/electron10/template
index aecda9043c4f..66f1c7cad0b6 100644
--- a/srcpkgs/electron10/template
+++ b/srcpkgs/electron10/template
@@ -1,6 +1,6 @@
 # Template file for 'electron10'
 pkgname=electron10
-version=10.4.0
+version=10.4.3
 _nodever=12.16.3
 _chromiumver=85.0.4183.121
 revision=1
@@ -30,7 +30,7 @@ homepage="https://electronjs.org"
 distfiles="https://github.com/electron/electron/archive/v$version.tar.gz>electron-${version}.tar.gz
  https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$_chromiumver.tar.xz
  https://github.com/nodejs/node/archive/v$_nodever.tar.gz>node-$_nodever.tar.gz"
-checksum="83dfdc6921ab0263c08168536570720b19eb251a1655715fc5b9b100efecde38
+checksum="8482357505daee86201c147c268ac073db44c3b5474e8e223431535186f60892
  e018547e54566410fb365d9f3dae10037c30fca5debe6ba8baceef3ad3b03d28
  dcd0a1e619ff326399ca8fd87f61c255f4d1e9bff47860064993f01e4ff37fe1"
 

From 6e756968c4bdd2db3db6ea56d53c6337f19ceb68 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Sun, 25 Apr 2021 17:47:04 +0300
Subject: [PATCH 1708/2024] lmdb: update to 0.9.28

---
 srcpkgs/lmdb/template | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/lmdb/template b/srcpkgs/lmdb/template
index 2dd36d13f5a4..61f1b8a60755 100644
--- a/srcpkgs/lmdb/template
+++ b/srcpkgs/lmdb/template
@@ -1,6 +1,6 @@
 # Template file for 'lmdb'
 pkgname=lmdb
-version=0.9.24
+version=0.9.28
 revision=1
 wrksrc="lmdb-LMDB_${version}"
 short_desc="Lightning Memory-Mapped Database Manager"
@@ -8,11 +8,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="OLDAP-2.8"
 homepage="http://symas.com/mdb/"
 distfiles="https://github.com/LMDB/lmdb/archive/LMDB_${version}.tar.gz"
-checksum=44602436c52c29d4f301f55f6fd8115f945469b868348e3cddaf91ab2473ea26
+checksum=47457d3d3ae2c489b52078a07e9f55ec6e094b48c2204029c7754e2972fe1882
 
-post_extract() {
-	sed -i 's,man/man1,share/&,' libraries/liblmdb/Makefile
-}
 do_build() {
 	cd libraries/liblmdb
 	make ${makejobs} XCFLAGS="$CFLAGS" CC="$CC"

From 3aa21682ff68c6f34f2461db022d2e098f94ebfd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 25 Apr 2021 09:57:01 -0400
Subject: [PATCH 1709/2024] python3-pip: update to 21.1.

Install entrypoint script as `pip3` and make `pip` a symlink.

Closes #30075.
---
 .../patches/no-versioned-pip.patch            | 24 +++++++++----------
 srcpkgs/python3-pip/template                  | 11 ++++-----
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/srcpkgs/python3-pip/patches/no-versioned-pip.patch b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
index b3a50bb2c138..7fb56fda667f 100644
--- a/srcpkgs/python3-pip/patches/no-versioned-pip.patch
+++ b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
@@ -1,13 +1,11 @@
---- setup.py.orig	2021-01-30 17:47:39.874134606 -0500
-+++ setup.py	2021-01-30 17:47:54.435139352 -0500
-@@ -74,10 +74,6 @@
-     entry_points={
-         "console_scripts": [
-             "pip=pip._internal.cli.main:main",
--            "pip{}=pip._internal.cli.main:main".format(sys.version_info[0]),
--            "pip{}.{}=pip._internal.cli.main:main".format(
--                *sys.version_info[:2]
--            ),
-         ],
-     },
- 
+--- setup.py
++++ setup.py
+@@ -70,8 +70,6 @@
+     entry_points={
+         "console_scripts": [
+-            "pip=pip._internal.cli.main:main",
+             "pip{}=pip._internal.cli.main:main".format(sys.version_info[0]),
+-            "pip{}.{}=pip._internal.cli.main:main".format(*sys.version_info[:2]),
+         ],
+     },
+     zip_safe=False,
diff --git a/srcpkgs/python3-pip/template b/srcpkgs/python3-pip/template
index d0a3a1d7516a..0e885d68f040 100644
--- a/srcpkgs/python3-pip/template
+++ b/srcpkgs/python3-pip/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pip'
 pkgname=python3-pip
-version=21.0.1
+version=21.1
 revision=1
 wrksrc="pip-${version}"
 build_style=python3-module
@@ -12,12 +12,11 @@ license="MIT"
 homepage="https://pip.pypa.io/"
 changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
 distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
-checksum=99bbde183ec5ec037318e774b0d8ae0a64352fe53b2c7fd630be1d07e94f41e5
-
-do_check() {
-	: tests have unpackaged dependencies
-}
+checksum=a810bf07c3723a28621c29abe8e34429fa082c337f89aea9a795865416b66d3e
+# Tests have unpackaged dependencies
+make_check=no
 
 post_install() {
 	vlicense LICENSE.txt
+	ln -s pip3 "${DESTDIR}/usr/bin/pip"
 }

From 0fdb839daf4be5513b1da5a562284cf49fe9078b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 25 Apr 2021 10:05:04 -0400
Subject: [PATCH 1710/2024] python3-setuptools: update to 56.0.0.

---
 srcpkgs/python3-setuptools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-setuptools/template b/srcpkgs/python3-setuptools/template
index 07655e0d2f3c..9eef05df33e6 100644
--- a/srcpkgs/python3-setuptools/template
+++ b/srcpkgs/python3-setuptools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-setuptools'
 pkgname=python3-setuptools
-version=54.1.1
+version=56.0.0
 revision=1
 wrksrc="setuptools-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://github.com/pypa/setuptools"
 changelog="https://raw.githubusercontent.com/pypa/setuptools/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/s/setuptools/setuptools-${version}.tar.gz"
-checksum=1ce82798848a978696465866bb3aaab356003c42d6143e1111fcf069ac838274
+checksum=08a1c0f99455307c48690f00d5c2ac2c1ccfab04df00454fef854ec145b81302
 provides="python3-distribute-${version}_1"
 replaces="python3-distribute>=0"
 # Tests rely on jaraco.path, which relies on singledispatch, both unpackaged;

From 297cee29b84820006e4864c4f654412b3a511cdc Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 25 Apr 2021 10:11:26 -0400
Subject: [PATCH 1711/2024] python3-networkx: update to 2.5.1.

---
 srcpkgs/python3-networkx/template | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/python3-networkx/template b/srcpkgs/python3-networkx/template
index e0c7b03fe59f..2e132b432577 100644
--- a/srcpkgs/python3-networkx/template
+++ b/srcpkgs/python3-networkx/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-networkx'
 pkgname=python3-networkx
-version=2.5
-revision=2
+version=2.5.1
+revision=1
 wrksrc="networkx-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools unzip"
@@ -12,11 +12,7 @@ maintainer="Peter Bui <pbui@github.bx612.space>"
 license="BSD-3-Clause"
 homepage="https://networkx.github.io/"
 distfiles="${PYPI_SITE}/n/networkx/networkx-${version}.tar.gz"
-checksum=7978955423fbc9639c10498878be59caf99b44dc304c2286162fd24b458c1602
-
-do_check() {
-	pytest
-}
+checksum=109cd585cac41297f71103c3c42ac6ef7379f29788eb54cb751be5a663bb235a
 
 post_install() {
 	vlicense LICENSE.txt

From cf5ed937b2a25d99b01ba4b6f7871558f98c5896 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 25 Apr 2021 10:20:26 -0400
Subject: [PATCH 1712/2024] python-Cython: update to 0.29.23.

---
 srcpkgs/python-Cython/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python-Cython/template b/srcpkgs/python-Cython/template
index 00c790ce5d32..fe4a8c9d5c72 100644
--- a/srcpkgs/python-Cython/template
+++ b/srcpkgs/python-Cython/template
@@ -1,7 +1,7 @@
 # Template file for 'python-Cython'
 pkgname=python-Cython
-version=0.29.22
-revision=3
+version=0.29.23
+revision=1
 wrksrc="Cython-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"
@@ -13,7 +13,9 @@ license="Apache-2.0"
 homepage="https://cython.org/"
 changelog="https://raw.githubusercontent.com/cython/cython/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/C/Cython/Cython-${version}.tar.gz"
-checksum=df6b83c7a6d1d967ea89a2903e4a931377634a297459652e4551734c48195406
+checksum=6a0d31452f0245daacb14c979c77e093eb1a546c760816b5eed0047686baad8e
+# Tests are flaky
+make_check=no
 
 alternatives="
  cython:cygdb:/usr/bin/cygdb2

From 0f271ef413d3aad10223e426b55635b3fa7f96df Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 25 Apr 2021 10:21:56 -0400
Subject: [PATCH 1713/2024] python3-pandas: update to 1.2.4.

---
 srcpkgs/python3-pandas/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pandas/template b/srcpkgs/python3-pandas/template
index c8a7de702c09..1416f2d2bcc5 100644
--- a/srcpkgs/python3-pandas/template
+++ b/srcpkgs/python3-pandas/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pandas'
 pkgname=python3-pandas
-version=1.2.3
+version=1.2.4
 revision=1
 wrksrc="pandas-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
 homepage="https://pandas.pydata.org/"
 changelog="https://pandas.pydata.org/pandas-docs/stable/whatsnew/index.html"
 distfiles="https://github.com/pandas-dev/pandas/archive/v${version}.tar.gz"
-checksum=89df1a3cabd86e5dd3c7a5fdd7ec5338b2613e7a7d60f30254a4e7b08902dade
+checksum=544aac5ad33db4fcb091f9b99603e30c049fc4c3622949c1c807d597eceb82bb
 
 pre_build() {
 	# setup.py allows a -j argument to parallelize builds

From 78c4bfee4e88db576f8d987e5c54ba8c183f50c8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 25 Apr 2021 11:31:18 -0400
Subject: [PATCH 1714/2024] Solaar: update to 1.0.6.

---
 srcpkgs/Solaar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Solaar/template b/srcpkgs/Solaar/template
index 718e672cb21b..393cede0f0ae 100644
--- a/srcpkgs/Solaar/template
+++ b/srcpkgs/Solaar/template
@@ -1,6 +1,6 @@
 # Template file for 'Solaar'
 pkgname=Solaar
-version=1.0.5
+version=1.0.6
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -10,6 +10,6 @@ maintainer="Young Jin Park <youngjinpark20@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://pwr-solaar.github.io/Solaar/"
 distfiles="https://github.com/pwr-Solaar/Solaar/archive/${version}.tar.gz"
-checksum=6514f278da3f3a96dda6f254b786a2b106e1a5c20e0c20e61c8273b3e5c33973
+checksum=fb879136911978f8f0183262a86f2b47a50b1816516599ae9a6681ad1d9a4e49
 # Package provides no tests
 make_check=no

From 7b51e3d812c8a3619892a8e6ae95d8f260eee206 Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Fri, 23 Apr 2021 22:36:25 -0400
Subject: [PATCH 1715/2024] chromium: update to 90.0.4430.85.

- Built for x86_64, x86_64-musl.
- Tested on x86_64.
---
 srcpkgs/chromium/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index 75b1c48613bb..3276f5b667df 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,7 +1,7 @@
 # Template file for 'chromium'
 pkgname=chromium
 # See http://www.chromium.org/developers/calendar for the latest version
-version=90.0.4430.72
+version=90.0.4430.85
 revision=1
 archs="i686* x86_64* aarch64* armv7l* ppc64le*"
 short_desc="Google's attempt at creating a safer, faster, and more stable browser"
@@ -9,7 +9,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://www.chromium.org/"
 distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz"
-checksum=a5cc88ca8fffac21ec4d1646980f698dfb6f388a225dd7a2c5a3d252a4098943
+checksum=01c5594d4b7eaa67e00b4fa16ae0c9d35ec5917467abd387ba1b5cc332d44922
 nocross=yes
 
 lib32disabled=yes

From 2fd1767b9c0ab30961074c3888229f15abc8eaf4 Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Sat, 24 Apr 2021 09:54:14 -0400
Subject: [PATCH 1716/2024] chromium-widevine: update to 90.0.4430.85.

---
 srcpkgs/chromium-widevine/INSTALL  | 2 +-
 srcpkgs/chromium-widevine/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chromium-widevine/INSTALL b/srcpkgs/chromium-widevine/INSTALL
index fed7323d9dbc..3f5b65d3fc64 100644
--- a/srcpkgs/chromium-widevine/INSTALL
+++ b/srcpkgs/chromium-widevine/INSTALL
@@ -1,6 +1,6 @@
 # INSTALL
 
-checksum=43f141970ab61d9c5a993dcf094625d9a7a1d24212a3c2443e7092b40c3a354c
+checksum=39de976ede3d759fd696e59bd7ac3447093ab67b65972a41caa557edbee12952
 _baseUrl="https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable"
 _filename="google-chrome-stable_${VERSION%_*}-1_amd64.deb"
 DISTFILE="${_baseUrl}/${_filename}"
diff --git a/srcpkgs/chromium-widevine/template b/srcpkgs/chromium-widevine/template
index cac7cca3dd56..c8b624d2819c 100644
--- a/srcpkgs/chromium-widevine/template
+++ b/srcpkgs/chromium-widevine/template
@@ -6,7 +6,7 @@ _chromeVersion="current"
 _channel="stable"
 
 pkgname=chromium-widevine
-version=90.0.4430.72
+version=90.0.4430.85
 revision=1
 archs="x86_64"
 create_wrksrc=yes

From b74e5389937e6531696d069db0b7d57dff556e03 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 22 Apr 2021 21:54:34 +0300
Subject: [PATCH 1717/2024] qt5ct: update to 1.2.

---
 srcpkgs/qt5ct/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt5ct/template b/srcpkgs/qt5ct/template
index 02f6e9442fee..3cd4cf713430 100644
--- a/srcpkgs/qt5ct/template
+++ b/srcpkgs/qt5ct/template
@@ -1,6 +1,6 @@
 # Template file for 'qt5ct'
 pkgname=qt5ct
-version=1.1
+version=1.2
 revision=1
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-tools qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="Yuusha Spacewolf <xyuusha@paranoici.org>"
 license="BSD-2-Clause"
 homepage="https://sourceforge.net/projects/qt5ct/"
 distfiles="${SOURCEFORGE_SITE}/project/qt5ct/qt5ct-${version}.tar.bz2"
-checksum=af77c4dbf7f9ba97fe0218648167395bca7bcb2b9c1886a9c98b1e343127ddd2
+checksum=1de3f06e6d5d0746bf19a949e56cc04b53bdbc18294f38cb20759f35006b872e
 
 post_install() {
 	vlicense COPYING

From a5bf1d754ff5672b500247563ac7a259bdc087c3 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 22 Apr 2021 22:39:52 +0300
Subject: [PATCH 1718/2024] hydrogen: update to 1.0.2.

---
 srcpkgs/hydrogen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hydrogen/template b/srcpkgs/hydrogen/template
index 2f4005fd1257..f2ee7cca7051 100644
--- a/srcpkgs/hydrogen/template
+++ b/srcpkgs/hydrogen/template
@@ -1,6 +1,6 @@
 # Template file for 'hydrogen'
 pkgname=hydrogen
-version=1.0.1
+version=1.0.2
 revision=1
 build_style=cmake
 # Our flags has -g already, DEBUG=ON will add -O0
@@ -15,7 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.hydrogen-music.org/"
 distfiles="https://github.com/hydrogen-music/hydrogen/archive/${version}.tar.gz"
-checksum=de6e8ba259ff340037f24e80f8b34592138603b080b02cfa3214ef9b0d66ac63
+checksum=de1ce64da8ae7a84d7fbd789e84010d6a837378bc9811acb282c30b9ee8042f5
 
 post_patch() {
 	vsed -i '/INSTALL/s,"data,"/usr/share/hydrogen/data,' \

From 207c0826114b89c2f725c7bf093d7dc83eae30cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Sun, 25 Apr 2021 18:54:35 +0200
Subject: [PATCH 1719/2024] gcsf: update to 0.1.28.

---
 srcpkgs/gcsf/template | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/gcsf/template b/srcpkgs/gcsf/template
index 7d4cc54bb192..201c3cbd2998 100644
--- a/srcpkgs/gcsf/template
+++ b/srcpkgs/gcsf/template
@@ -1,7 +1,7 @@
 # Template file for 'gcsf'
 pkgname=gcsf
-version=0.1.25
-revision=4
+version=0.1.28
+revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
 makedepends="fuse-devel openssl-devel"
@@ -10,16 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"
 homepage="https://github.com/harababurel/gcsf"
 distfiles="https://github.com/harababurel/gcsf/archive/${version}.tar.gz"
-checksum=10d2d612da4e6738d10744dd4e22acdf7a94cf492c71e079e6cf52112f761187
-
-case "$XBPS_TARGET_MACHINE" in
-	aarch64-musl) broken="https://github.com/nix-rust/nix/issues/951" ;;
-esac
-
-pre_build() {
-	cargo update --package openssl-sys --precise 0.9.58
-	cargo update --package openssl --precise 0.10.22
-}
+checksum=8bc7f94630eefda55ac8851a4071d7782385b711ea8f6313e2e64be05f686592
 
 post_install() {
 	vlicense LICENSE

From 530ad330695585ef3ecc24d2b2fa2183e3a992bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Sun, 25 Apr 2021 18:05:26 +0200
Subject: [PATCH 1720/2024] exiftool: update to 12.25.

---
 srcpkgs/exiftool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template
index b8bf1d7970e8..13f2008dbef8 100644
--- a/srcpkgs/exiftool/template
+++ b/srcpkgs/exiftool/template
@@ -1,6 +1,6 @@
 # Template file for 'exiftool'
 pkgname=exiftool
-version=12.24
+version=12.25
 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=4bbc925eda0072426ffb3b0a6dcedeff173da798fde1efff846a7579854a2f98
+checksum=97821df046ef24c04e1dd5855847a9db768193c9e6471fbd5145e1e6e3a37887

From bcd4fe04b4c6139894de7db15611379f4736cfa9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Sun, 25 Apr 2021 17:58:00 +0200
Subject: [PATCH 1721/2024] gifski: update to 1.4.3.

---
 srcpkgs/gifski/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gifski/template b/srcpkgs/gifski/template
index 3e2537f258dc..b7733d3608f5 100644
--- a/srcpkgs/gifski/template
+++ b/srcpkgs/gifski/template
@@ -1,6 +1,6 @@
 # Template file for 'gifski'
 pkgname=gifski
-version=1.4.0
+version=1.4.3
 revision=1
 build_style=cargo
 configure_args="--features=openmp"
@@ -10,7 +10,7 @@ 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=8a82b9e6a8bb376049018bc7fa3dd21c68e5bceb44b385948e761ccdfd73830d
+checksum=74b98ede664e3da420ead70e3da1dfeb1a6e33545a618124e6b49da8f399902f
 
 post_install() {
 	vlicense LICENSE

From cb88b4aecdb5d69d2cde4c67789e55243c02d46c Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Sun, 25 Apr 2021 10:34:06 +0200
Subject: [PATCH 1722/2024] gajim: update to 1.3.2.

---
 srcpkgs/gajim/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gajim/template b/srcpkgs/gajim/template
index 848542981dce..4067251e1134 100644
--- a/srcpkgs/gajim/template
+++ b/srcpkgs/gajim/template
@@ -1,8 +1,7 @@
 # Template file for 'gajim'
 pkgname=gajim
-version=1.3.1
+version=1.3.2
 revision=1
-wrksrc=gajim-gajim-${version}
 build_style=python3-module
 hostmakedepends="gettext python3-setuptools"
 depends="python3-gobject python3-nbxmpp python3-pyasn1 python3-setuptools
@@ -14,7 +13,7 @@ license="GPL-3.0-only"
 homepage="https://www.gajim.org"
 changelog="https://dev.gajim.org/gajim/gajim/raw/gajim-${version}/ChangeLog"
 distfiles="https://gajim.org/downloads/${version%.*}/gajim-${version}.tar.gz"
-checksum=6a051d51fb45b80b19ccc47a2fb4c3eee948e598f49e63a9f929e158870d101c
+checksum=70ea462b3f3c3b3c0b8d3129fae912d24062e77a8cce80781f69e8f43eda5fee
 # Does not find gdk, introspection typelib
 # even wtih gdk-pixbuf in checkdepends
 make_check=no

From 0bb4fd86acd08bb7bde94ea0b8d3fcee19e1bd8e Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Sun, 25 Apr 2021 17:12:09 +0200
Subject: [PATCH 1723/2024] shellcheck: update to 0.7.2.

---
 srcpkgs/shellcheck/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/shellcheck/template b/srcpkgs/shellcheck/template
index 83bcd922ab70..33381c2dac8f 100644
--- a/srcpkgs/shellcheck/template
+++ b/srcpkgs/shellcheck/template
@@ -1,7 +1,7 @@
 # Template file for 'shellcheck'
 pkgname=shellcheck
-version=0.7.1
-revision=3
+version=0.7.2
+revision=1
 build_style=haskell-stack
 stackage="lts-16.13"
 hostmakedepends="pandoc"
@@ -10,7 +10,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.shellcheck.net/"
 distfiles="https://github.com/koalaman/shellcheck/archive/v${version}.tar.gz"
-checksum=50a219bde5c16fc0a40e2e3725b6c192ff589bc8a2569c32b62dcaece0495896
+checksum=5911f6133951d0ba6d643025bc50f2afb6c6f66d7225dc3d42e8845bfdf74c3c
 nocross=yes
 nopie_files="/usr/bin/shellcheck"
 

From e63e20a3c3d0065f57e7e9826a2c5ca2925faf0a Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 20 Apr 2021 13:21:08 +0200
Subject: [PATCH 1724/2024] gnome-photos: update to 40.0.

---
 .../patches/fix-double-declaration.diff       |   11 +
 srcpkgs/gnome-photos/patches/tracker3.patch   | 4151 -----------------
 srcpkgs/gnome-photos/template                 |    7 +-
 3 files changed, 14 insertions(+), 4155 deletions(-)
 create mode 100644 srcpkgs/gnome-photos/patches/fix-double-declaration.diff
 delete mode 100644 srcpkgs/gnome-photos/patches/tracker3.patch

diff --git a/srcpkgs/gnome-photos/patches/fix-double-declaration.diff b/srcpkgs/gnome-photos/patches/fix-double-declaration.diff
new file mode 100644
index 000000000000..0162e13db42d
--- /dev/null
+++ b/srcpkgs/gnome-photos/patches/fix-double-declaration.diff
@@ -0,0 +1,11 @@
+--- src/photos-base-manager.h.orig	2021-04-20 13:16:07.042348375 +0200
++++ src/photos-base-manager.h	2021-04-20 13:16:16.974347953 +0200
+@@ -78,8 +78,6 @@ guint               photos_base_manager_
+ 
+ GObject            *photos_base_manager_get_previous_object      (PhotosBaseManager *self, GObject *object);
+ 
+-PhotosSparqlTemplate *photos_base_manager_get_sparql_template    (PhotosBaseManager *self, gint flags);
+-
+ const gchar        *photos_base_manager_get_title                (PhotosBaseManager *self);
+ 
+ gchar              *photos_base_manager_get_where                (PhotosBaseManager *self, gint flags);
diff --git a/srcpkgs/gnome-photos/patches/tracker3.patch b/srcpkgs/gnome-photos/patches/tracker3.patch
deleted file mode 100644
index 6062fac2b263..000000000000
--- a/srcpkgs/gnome-photos/patches/tracker3.patch
+++ /dev/null
@@ -1,4151 +0,0 @@
-From 4673c40a7c006ccb6de203ec2b25ca39a74782d9 Mon Sep 17 00:00:00 2001
-From: Sam Thursfield <sam@afuera.me.uk>
-Date: Wed, 27 May 2020 13:07:58 +0200
-Subject: [PATCH 1/3] Fix build failure due to undefined M_PI constant
-
-The <math.h> header needs to be included.
-
-Previously I suppose libtracker-sparql.h pulled this in.
----
- src/photos-utils.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/photos-utils.c b/src/photos-utils.c
-index 1d7be577..d659b47d 100644
---- a/src/photos-utils.c
-+++ b/src/photos-utils.c
-@@ -32,6 +32,7 @@
- #include <glib.h>
- #include <tracker-sparql.h>
- #include <libgd/gd.h>
-+#include <math.h>
- 
- #include "photos-application.h"
- #include "photos-device-item.h"
--- 
-GitLab
-
-
-From 18f126a67a37d1f6efe546e42eef22ae15da7642 Mon Sep 17 00:00:00 2001
-From: Sam Thursfield <sam@afuera.me.uk>
-Date: Sun, 7 Jun 2020 21:53:20 +0200
-Subject: [PATCH 2/3] Generate queries using SPARQL templates
-
-The code to generate SPARQL queries was split across many different
-source files, making it difficult to make big changes. Now the
-queries are written out as templates and we use template substitution
-to build the SPARQL that we send to Tracker.
----
- src/meson.build                             |   5 +
- src/photos-base-manager.c                   |  15 ++
- src/photos-base-manager.h                   |   4 +
- src/photos-filterable.c                     |   8 -
- src/photos-filterable.h                     |   3 -
- src/photos-query-builder.c                  | 207 +++++++++-----------
- src/photos-search-type-manager.c            |  59 +-----
- src/photos-search-type.c                    |  67 +++----
- src/photos-search-type.h                    |   6 +-
- src/photos-sparql-template.c                | 187 ++++++++++++++++++
- src/photos-sparql-template.h                |  38 ++++
- src/photos.gresource.xml                    |   4 +
- src/queries/all.sparql.template             |  31 +++
- src/queries/collections.sparql.template     |  14 ++
- src/queries/favorite-photos.sparql.template |  12 ++
- src/queries/photos.sparql.template          |  11 ++
- 16 files changed, 446 insertions(+), 225 deletions(-)
- create mode 100644 src/photos-sparql-template.c
- create mode 100644 src/photos-sparql-template.h
- create mode 100644 src/queries/all.sparql.template
- create mode 100644 src/queries/collections.sparql.template
- create mode 100644 src/queries/favorite-photos.sparql.template
- create mode 100644 src/queries/photos.sparql.template
-
-diff --git a/src/meson.build b/src/meson.build
-index 9919f0cf..b5b2759c 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -195,6 +195,7 @@ sources = common_sources + files(
-   'photos-source.c',
-   'photos-source-manager.c',
-   'photos-source-notification.c',
-+  'photos-sparql-template.c',
-   'photos-spinner-box.c',
-   'photos-thumbnail-factory.c',
-   'photos-tool.c',
-@@ -290,6 +291,10 @@ resource_data = files(
-   'photos-selection-toolbar.ui',
-   'photos-share-dialog.ui',
-   'photos-zoom-controls.ui',
-+  'queries/all.sparql.template',
-+  'queries/collections.sparql.template',
-+  'queries/favorite-photos.sparql.template',
-+  'queries/photos.sparql.template',
- )
- 
- sources += gnome.compile_resources(
-diff --git a/src/photos-base-manager.c b/src/photos-base-manager.c
-index d49d19a5..052638d5 100644
---- a/src/photos-base-manager.c
-+++ b/src/photos-base-manager.c
-@@ -250,6 +250,12 @@ photos_base_manager_default_get_where (PhotosBaseManager *self, gint flags)
- }
- 
- 
-+static PhotosSparqlTemplate *
-+photos_base_manager_default_get_sparql_template (PhotosBaseManager *self, gint flags)
-+{
-+  return NULL;
-+}
-+
- static void
- photos_base_manager_default_remove_object_by_id (PhotosBaseManager *self, const gchar *id)
- {
-@@ -438,6 +444,7 @@ photos_base_manager_class_init (PhotosBaseManagerClass *class)
-   class->get_object_by_id = photos_base_manager_default_get_object_by_id;
-   class->get_previous_object = photos_base_manager_default_get_previous_object;
-   class->get_where = photos_base_manager_default_get_where;
-+  class->get_sparql_template = photos_base_manager_default_get_sparql_template;
-   class->remove_object_by_id = photos_base_manager_default_remove_object_by_id;
-   class->set_active_object = photos_base_manager_default_set_active_object;
- 
-@@ -714,6 +721,14 @@ photos_base_manager_get_where (PhotosBaseManager *self, gint flags)
- }
- 
- 
-+PhotosSparqlTemplate *
-+photos_base_manager_get_sparql_template (PhotosBaseManager *self, gint flags)
-+{
-+  g_return_val_if_fail (PHOTOS_IS_BASE_MANAGER (self), NULL);
-+  return PHOTOS_BASE_MANAGER_GET_CLASS (self)->get_sparql_template (self, flags);
-+}
-+
-+
- void
- photos_base_manager_process_new_objects (PhotosBaseManager *self, GHashTable *new_objects)
- {
-diff --git a/src/photos-base-manager.h b/src/photos-base-manager.h
-index 99d203e9..04cfa7db 100644
---- a/src/photos-base-manager.h
-+++ b/src/photos-base-manager.h
-@@ -24,6 +24,7 @@
- #define PHOTOS_BASE_MANAGER_H
- 
- #include <glib-object.h>
-+#include "photos-sparql-template.h"
- 
- G_BEGIN_DECLS
- 
-@@ -46,6 +47,7 @@ struct _PhotosBaseManagerClass
-   gchar         *(*get_where)              (PhotosBaseManager *self, gint flags);
-   void           (*remove_object_by_id)    (PhotosBaseManager *self, const gchar *id);
-   gboolean       (*set_active_object)      (PhotosBaseManager *self, GObject *object);
-+  PhotosSparqlTemplate *(*get_sparql_template) (PhotosBaseManager *self, gint flags);
- 
-   /* signals */
-   void           (*active_changed)         (PhotosBaseManager *self, GObject *object);
-@@ -80,6 +82,8 @@ const gchar        *photos_base_manager_get_title                (PhotosBaseMana
- 
- gchar              *photos_base_manager_get_where                (PhotosBaseManager *self, gint flags);
- 
-+PhotosSparqlTemplate *photos_base_manager_get_sparql_template    (PhotosBaseManager *self, gint flags);
-+
- void                photos_base_manager_process_new_objects      (PhotosBaseManager *self, GHashTable *new_objects);
- 
- void                photos_base_manager_remove_object            (PhotosBaseManager *self, GObject *object);
-diff --git a/src/photos-filterable.c b/src/photos-filterable.c
-index 361b1c29..aaa4109c 100644
---- a/src/photos-filterable.c
-+++ b/src/photos-filterable.c
-@@ -69,14 +69,6 @@ photos_filterable_get_id (PhotosFilterable *self)
- }
- 
- 
--gchar *
--photos_filterable_get_where (PhotosFilterable *self)
--{
--  g_return_val_if_fail (PHOTOS_IS_FILTERABLE (self), NULL);
--  return PHOTOS_FILTERABLE_GET_IFACE (self)->get_where (self);
--}
--
--
- gboolean
- photos_filterable_is_search_criterion (PhotosFilterable *self)
- {
-diff --git a/src/photos-filterable.h b/src/photos-filterable.h
-index e768bca0..8a3415fc 100644
---- a/src/photos-filterable.h
-+++ b/src/photos-filterable.h
-@@ -37,7 +37,6 @@ struct _PhotosFilterableInterface
-   gboolean (*get_builtin) (PhotosFilterable *self);
-   gchar *(*get_filter) (PhotosFilterable *self);
-   const gchar *(*get_id) (PhotosFilterable *self);
--  gchar *(*get_where) (PhotosFilterable *self);
-   gboolean (*is_search_criterion) (PhotosFilterable *self);
- };
- 
-@@ -47,8 +46,6 @@ gchar              *photos_filterable_get_filter         (PhotosFilterable *self
- 
- const gchar        *photos_filterable_get_id             (PhotosFilterable *self);
- 
--gchar              *photos_filterable_get_where          (PhotosFilterable *self);
--
- gboolean            photos_filterable_is_search_criterion  (PhotosFilterable *self);
- 
- G_END_DECLS
-diff --git a/src/photos-query-builder.c b/src/photos-query-builder.c
-index 2c52a130..5d9d8a5a 100644
---- a/src/photos-query-builder.c
-+++ b/src/photos-query-builder.c
-@@ -26,112 +26,76 @@
- #include <string.h>
- 
- #include "photos-base-manager.h"
-+#include "photos-query.h"
- #include "photos-query-builder.h"
- #include "photos-search-type.h"
- #include "photos-source-manager.h"
- #include "photos-search-match-manager.h"
- #include "photos-search-type-manager.h"
- 
-+#define PHOTOS_QUERY_COLLECTIONS_IDENTIFIER "photos:collection:"
-+#define PHOTOS_QUERY_LOCAL_COLLECTIONS_IDENTIFIER "photos:collection:local:"
- 
--static gchar *
--photos_query_builder_filter (PhotosSearchContextState *state, gint flags)
--{
--  gchar *sparql;
--  g_autofree gchar *src_mngr_filter = NULL;
--  g_autofree gchar *srch_mtch_mngr_filter = NULL;
--  g_autofree gchar *srch_typ_mngr_filter = NULL;
-+const gchar *collections_default_filter = \
-+  "(fn:starts-with (nao:identifier (?urn), '" PHOTOS_QUERY_COLLECTIONS_IDENTIFIER "')"
-+  "   || (?urn = nfo:image-category-screenshot))";
- 
--  src_mngr_filter = photos_base_manager_get_filter (state->src_mngr, flags);
--  srch_mtch_mngr_filter = photos_base_manager_get_filter (state->srch_mtch_mngr, flags);
--  srch_typ_mngr_filter = photos_base_manager_get_filter (state->srch_typ_mngr, flags);
- 
--  sparql = g_strdup_printf ("FILTER (%s && %s && %s)",
--                            src_mngr_filter,
--                            srch_mtch_mngr_filter,
--                            srch_typ_mngr_filter);
--
--  return sparql;
--}
-+/* This includes mimetype blocklist */
-+const gchar *photos_default_filter = \
-+  "(nie:mimeType(?urn) != 'image/gif' && nie:mimeType(?urn) != 'image/x-eps')";
- 
- 
- static gchar *
--photos_query_builder_optional (void)
--{
--  return g_strdup ("OPTIONAL { ?urn nco:creator ?creator . } "
--                   "OPTIONAL { ?urn nco:publisher ?publisher . }");
--}
--
--
--static gchar *
--photos_query_builder_inner_where (PhotosSearchContextState *state, gboolean global, gint flags)
-+photos_query_builder_query (PhotosSearchContextState *state,
-+                            gboolean global,
-+                            gint flags,
-+                            PhotosOffsetController *offset_cntrlr)
- {
--  g_autofree gchar *item_mngr_where = NULL;
-+  PhotosSparqlTemplate *template;
-+  const gchar *projection = NULL;
-+  g_autofree gchar *item_pattern = NULL;
-+  g_autofree gchar *search_filter = NULL;
-+  g_autofree gchar *source_filter = NULL;
-+  const gchar *order = NULL;
-+  g_autofree gchar *offset_limit = NULL;
-   gchar *sparql;
--  g_autofree gchar *srch_typ_mngr_where = NULL;
- 
--  srch_typ_mngr_where = photos_base_manager_get_where (state->srch_typ_mngr, flags);
-+  template = photos_base_manager_get_sparql_template (state->srch_typ_mngr, flags);
-+
-+  projection = "?urn "
-+               "nie:url (?urn) "
-+               "nfo:fileName (?urn) "
-+               "nie:mimeType (?urn) "
-+               "nie:title (?urn) "
-+               "tracker:coalesce (nco:fullname (?creator), nco:fullname (?publisher), '') "
-+               "tracker:coalesce (nfo:fileLastModified (?urn), nie:contentLastModified (?urn)) AS ?mtime "
-+               "nao:identifier (?urn) "
-+               "rdf:type (?urn) "
-+               "nie:dataSource(?urn) "
-+               "( EXISTS { ?urn nao:hasTag nao:predefined-tag-favorite } ) "
-+               "( EXISTS { ?urn nco:contributor ?contributor FILTER ( ?contributor != ?creator ) } ) "
-+               "tracker:coalesce(nfo:fileCreated (?urn), nie:contentCreated (?urn)) "
-+               "nfo:width (?urn) "
-+               "nfo:height (?urn) "
-+               "nfo:equipment (?urn) "
-+               "nfo:orientation (?urn) "
-+               "nmm:exposureTime (?urn) "
-+               "nmm:fnumber (?urn) "
-+               "nmm:focalLength (?urn) "
-+               "nmm:isoSpeed (?urn) "
-+               "nmm:flash (?urn) "
-+               "slo:location (?urn) ";
-+
-+  item_pattern = photos_base_manager_get_where (state->item_mngr, flags);
- 
-   if (!(flags & PHOTOS_QUERY_FLAGS_UNFILTERED))
-     {
--      if (global)
--        {
--          /* TODO: SearchCategoryManager */
--
--          item_mngr_where = photos_base_manager_get_where (state->item_mngr, flags);
--        }
-+      source_filter = photos_base_manager_get_filter (state->src_mngr, flags);
-+      search_filter = photos_base_manager_get_filter (state->srch_mtch_mngr, flags);
-     }
- 
--  sparql = g_strdup_printf ("WHERE { %s %s }",
--                            srch_typ_mngr_where,
--                            (item_mngr_where != NULL) ? item_mngr_where : "");
--
--  return sparql;
--}
--
--
--static gchar *
--photos_query_builder_where (PhotosSearchContextState *state, gboolean global, gint flags)
--{
--  const gchar *count_items = "COUNT (?item) AS ?count";
--  gboolean item_defined;
--  g_autofree gchar *filter = NULL;
--  g_autofree gchar *optional = NULL;
--  gchar *sparql;
--  g_autofree gchar *where_sparql = NULL;
--
--  where_sparql = photos_query_builder_inner_where (state, global, flags);
--  item_defined = strstr (where_sparql, "?item") != NULL;
--
--  optional = photos_query_builder_optional ();
--
--  if (!(flags & PHOTOS_QUERY_FLAGS_UNFILTERED))
--    filter = photos_query_builder_filter (state, flags);
--
--  sparql = g_strdup_printf ("WHERE {{"
--                            "    SELECT ?urn rdf:type (?urn) AS ?type %s %s GROUP BY (?urn)"
--                            "  }"
--                            "  %s %s"
--                            "}",
--                            item_defined ? count_items : "",
--                            where_sparql,
--                            optional,
--                            (filter != NULL) ? filter : "");
--
--  return sparql;
--}
--
--
--static gchar *
--photos_query_builder_query (PhotosSearchContextState *state,
--                            gboolean global,
--                            gint flags,
--                            PhotosOffsetController *offset_cntrlr)
--{
--  gchar *sparql;
--  g_autofree gchar *tail_sparql = NULL;
--  g_autofree gchar *where_sparql = NULL;
--
--  where_sparql = photos_query_builder_where (state, global, flags);
-+  order = "ORDER BY DESC (?mtime)";
- 
-   if (global && (flags & PHOTOS_QUERY_FLAGS_UNLIMITED) == 0)
-     {
-@@ -144,35 +108,19 @@ photos_query_builder_query (PhotosSearchContextState *state,
-           step = photos_offset_controller_get_step (offset_cntrlr);
-         }
- 
--      tail_sparql = g_strdup_printf ("ORDER BY DESC (?mtime) LIMIT %d OFFSET %d", step, offset);
-+      offset_limit = g_strdup_printf ("LIMIT %d OFFSET %d", step, offset);
-     }
- 
--  sparql = g_strconcat ("SELECT ?urn "
--                        "nie:url (?urn) "
--                        "nfo:fileName (?urn) "
--                        "nie:mimeType (?urn) "
--                        "nie:title (?urn) "
--                        "tracker:coalesce (nco:fullname (?creator), nco:fullname (?publisher), '') "
--                        "tracker:coalesce (nfo:fileLastModified (?urn), nie:contentLastModified (?urn)) AS ?mtime "
--                        "nao:identifier (?urn) "
--                        "rdf:type (?urn) "
--                        "nie:dataSource(?urn) "
--                        "( EXISTS { ?urn nao:hasTag nao:predefined-tag-favorite } ) "
--                        "( EXISTS { ?urn nco:contributor ?contributor FILTER ( ?contributor != ?creator ) } ) "
--                        "tracker:coalesce(nfo:fileCreated (?urn), nie:contentCreated (?urn)) "
--                        "nfo:width (?urn) "
--                        "nfo:height (?urn) "
--                        "nfo:equipment (?urn) "
--                        "nfo:orientation (?urn) "
--                        "nmm:exposureTime (?urn) "
--                        "nmm:fnumber (?urn) "
--                        "nmm:focalLength (?urn) "
--                        "nmm:isoSpeed (?urn) "
--                        "nmm:flash (?urn) "
--                        "slo:location (?urn) ",
--                        where_sparql,
--                        tail_sparql,
--                        NULL);
-+  sparql = photos_sparql_template_get_sparql (template,
-+                                              "projection", projection,
-+                                              "collections_default_filter", collections_default_filter,
-+                                              "item_pattern", item_pattern,
-+                                              "photos_default_filter", photos_default_filter,
-+                                              "source_filter", source_filter ? source_filter : "",
-+                                              "search_filter", search_filter ? search_filter : "",
-+                                              "order", order,
-+                                              "offset_limit", offset_limit ? offset_limit : "",
-+                                              NULL);
- 
-   return sparql;
- }
-@@ -234,12 +182,37 @@ photos_query_builder_collection_icon_query (PhotosSearchContextState *state, con
- PhotosQuery *
- photos_query_builder_count_query (PhotosSearchContextState *state, gint flags)
- {
--  PhotosQuery *query;
-+  PhotosSparqlTemplate *template;
-+  const gchar *projection = NULL;
-+  g_autofree gchar *item_pattern = NULL;
-+  g_autofree gchar *search_filter = NULL;
-+  g_autofree gchar *source_filter = NULL;
-   g_autofree gchar *sparql = NULL;
--  g_autofree gchar *where_sparql = NULL;
-+  PhotosQuery *query;
-+
-+  template = photos_base_manager_get_sparql_template (state->srch_typ_mngr, flags);
-+
-+  projection = "COUNT(?urn) ";
-+
-+  item_pattern = photos_base_manager_get_where (state->item_mngr, flags);
-+
-+  if (! (flags & PHOTOS_QUERY_FLAGS_UNFILTERED))
-+    {
-+      source_filter = photos_base_manager_get_filter (state->src_mngr, flags);
-+      search_filter = photos_base_manager_get_filter (state->srch_mtch_mngr, flags);
-+    }
-+
-+  sparql = photos_sparql_template_get_sparql (template,
-+                                              "projection", projection,
-+                                              "collections_default_filter", collections_default_filter,
-+                                              "item_pattern", item_pattern,
-+                                              "photos_default_filter", photos_default_filter,
-+                                              "source_filter", source_filter ? source_filter : "",
-+                                              "search_filter", search_filter ? search_filter : "",
-+                                              "order", "",
-+                                              "offset_limit", "",
-+                                              NULL);
- 
--  where_sparql = photos_query_builder_where (state, TRUE, flags);
--  sparql = g_strconcat ("SELECT DISTINCT COUNT(?urn) ", where_sparql, NULL);
-   query = photos_query_new (state, sparql);
- 
-   return query;
-diff --git a/src/photos-search-type-manager.c b/src/photos-search-type-manager.c
-index 87f441ed..5c87d4a4 100644
---- a/src/photos-search-type-manager.c
-+++ b/src/photos-search-type-manager.c
-@@ -41,13 +41,6 @@ struct _PhotosSearchTypeManager
- G_DEFINE_TYPE (PhotosSearchTypeManager, photos_search_type_manager, PHOTOS_TYPE_BASE_MANAGER);
- 
- 
--static const gchar *BLACKLISTED_MIME_TYPES[] =
--{
--  "image/gif",
--  "image/x-eps"
--};
--
--
- static gchar *
- photos_search_type_manager_get_filter (PhotosBaseManager *mngr, gint flags)
- {
-@@ -69,9 +62,8 @@ photos_search_type_manager_get_filter (PhotosBaseManager *mngr, gint flags)
-   return filter;
- }
- 
--
--static gchar *
--photos_search_type_manager_get_where (PhotosBaseManager *mngr, gint flags)
-+static PhotosSparqlTemplate *
-+photos_search_type_manager_get_sparql_template (PhotosBaseManager *mngr, gint flags)
- {
-   GObject *search_type;
- 
-@@ -86,74 +78,39 @@ photos_search_type_manager_get_where (PhotosBaseManager *mngr, gint flags)
-   else
-     search_type = photos_base_manager_get_object_by_id (mngr, PHOTOS_SEARCH_TYPE_STOCK_ALL);
- 
--  return photos_filterable_get_where (PHOTOS_FILTERABLE (search_type));
-+  return photos_search_type_get_sparql_template (PHOTOS_SEARCH_TYPE (search_type));
- }
- 
--
- static void
- photos_search_type_manager_init (PhotosSearchTypeManager *self)
- {
-   PhotosSearchType *search_type;
--  gchar *item_filter;
--  gchar *all_filter;
--  gchar *blacklisted_mime_types_filter;
--  gchar *col_filter;
--  gchar **strv;
--  guint i;
--  guint n_elements;
--
--  n_elements = G_N_ELEMENTS (BLACKLISTED_MIME_TYPES);
--  strv = (gchar **) g_malloc0_n (n_elements + 1, sizeof (gchar *));
--  for (i = 0; i < n_elements; i++)
--    strv[i] = g_strdup_printf ("nie:mimeType(?urn) != '%s'", BLACKLISTED_MIME_TYPES[i]);
--
--  blacklisted_mime_types_filter = g_strjoinv (" && ", strv);
--
--  item_filter = g_strdup_printf ("(fn:contains (?type, 'nmm#Photo') && %s)", blacklisted_mime_types_filter);
--  col_filter = g_strdup_printf ("(fn:contains (?type, 'nfo#DataContainer')"
--                                " && ?count > 0"
--                                " && (fn:starts-with (nao:identifier (?urn), '%s')"
--                                "     || (?urn = nfo:image-category-screenshot)))",
--                                PHOTOS_QUERY_COLLECTIONS_IDENTIFIER);
--  all_filter = g_strdup_printf ("(%s || %s)", col_filter, item_filter);
- 
-   search_type = photos_search_type_new_full (PHOTOS_SEARCH_TYPE_STOCK_ALL,
-                                              _("All"),
--                                             "?urn a rdfs:Resource. "
--                                             "OPTIONAL {?item a nmm:Photo; nie:isPartOf ?urn}",
--                                             all_filter);
-+                                             "resource:///org/gnome/Photos/all.sparql.template");
-   photos_base_manager_add_object (PHOTOS_BASE_MANAGER (self), G_OBJECT (search_type));
-   g_object_unref (search_type);
- 
-   search_type = photos_search_type_new_full (PHOTOS_SEARCH_TYPE_STOCK_COLLECTIONS,
-                                              _("Albums"),
--                                             "?urn a nfo:DataContainer. "
--                                             "?item a nmm:Photo; nie:isPartOf ?urn.",
--                                             col_filter);
-+                                             "resource:///org/gnome/Photos/collections.sparql.template");
-   photos_base_manager_add_object (PHOTOS_BASE_MANAGER (self), G_OBJECT (search_type));
-   g_object_unref (search_type);
- 
-   search_type = photos_search_type_new_full (PHOTOS_SEARCH_TYPE_STOCK_FAVORITES,
-                                              _("Favorites"),
--                                             "?urn a nmm:Photo; nao:hasTag nao:predefined-tag-favorite. ",
--                                             blacklisted_mime_types_filter);
-+                                             "resource:///org/gnome/Photos/favorite-photos.sparql.template");
-   photos_base_manager_add_object (PHOTOS_BASE_MANAGER (self), G_OBJECT (search_type));
-   g_object_unref (search_type);
- 
-   search_type = photos_search_type_new_full (PHOTOS_SEARCH_TYPE_STOCK_PHOTOS,
-                                              _("Photos"),
--                                             "?urn a nmm:Photo",
--                                             blacklisted_mime_types_filter);
-+                                             "resource:///org/gnome/Photos/photos.sparql.template");
-   photos_base_manager_add_object (PHOTOS_BASE_MANAGER (self), G_OBJECT (search_type));
-   g_object_unref (search_type);
- 
-   photos_base_manager_set_active_object_by_id (PHOTOS_BASE_MANAGER (self), PHOTOS_SEARCH_TYPE_STOCK_ALL);
--
--  g_free (item_filter);
--  g_free (all_filter);
--  g_free (blacklisted_mime_types_filter);
--  g_free (col_filter);
--  g_strfreev (strv);
- }
- 
- 
-@@ -163,7 +120,7 @@ photos_search_type_manager_class_init (PhotosSearchTypeManagerClass *class)
-   PhotosBaseManagerClass *base_manager_class = PHOTOS_BASE_MANAGER_CLASS (class);
- 
-   base_manager_class->get_filter = photos_search_type_manager_get_filter;
--  base_manager_class->get_where = photos_search_type_manager_get_where;
-+  base_manager_class->get_sparql_template = photos_search_type_manager_get_sparql_template;
- }
- 
- 
-diff --git a/src/photos-search-type.c b/src/photos-search-type.c
-index 44dc60eb..f3bbae15 100644
---- a/src/photos-search-type.c
-+++ b/src/photos-search-type.c
-@@ -25,24 +25,23 @@
- 
- #include "photos-filterable.h"
- #include "photos-search-type.h"
-+#include "photos-sparql-template.h"
- 
- 
- struct _PhotosSearchType
- {
-   GObject parent_instance;
--  gchar *filter;
-   gchar *id;
-   gchar *name;
--  gchar *where;
-+  PhotosSparqlTemplate *sparql_template;
- };
- 
- enum
- {
-   PROP_0,
--  PROP_FILTER,
-   PROP_ID,
-   PROP_NAME,
--  PROP_WHERE,
-+  PROP_SPARQL_TEMPLATE,
- };
- 
- static void photos_search_type_filterable_iface_init (PhotosFilterableInterface *iface);
-@@ -53,14 +52,6 @@ G_DEFINE_TYPE_WITH_CODE (PhotosSearchType, photos_search_type, G_TYPE_OBJECT,
-                                                 photos_search_type_filterable_iface_init));
- 
- 
--static gchar *
--photos_search_type_get_filter (PhotosFilterable *iface)
--{
--  PhotosSearchType *self = PHOTOS_SEARCH_TYPE (iface);
--  return g_strdup (self->filter);
--}
--
--
- static const gchar *
- photos_search_type_get_id (PhotosFilterable *filterable)
- {
-@@ -69,14 +60,6 @@ photos_search_type_get_id (PhotosFilterable *filterable)
- }
- 
- 
--static gchar *
--photos_search_type_get_where (PhotosFilterable *iface)
--{
--  PhotosSearchType *self = PHOTOS_SEARCH_TYPE (iface);
--  return g_strdup (self->where);
--}
--
--
- static gboolean
- photos_search_type_is_search_criterion (PhotosFilterable *iface)
- {
-@@ -84,15 +67,20 @@ photos_search_type_is_search_criterion (PhotosFilterable *iface)
- }
- 
- 
-+PhotosSparqlTemplate *
-+photos_search_type_get_sparql_template (PhotosSearchType *self)
-+{
-+  return self->sparql_template;
-+}
-+
- static void
- photos_search_type_finalize (GObject *object)
- {
-   PhotosSearchType *self = PHOTOS_SEARCH_TYPE (object);
- 
--  g_free (self->filter);
-   g_free (self->id);
-   g_free (self->name);
--  g_free (self->where);
-+  g_clear_object (&self->sparql_template);
- 
-   G_OBJECT_CLASS (photos_search_type_parent_class)->finalize (object);
- }
-@@ -113,6 +101,10 @@ photos_search_type_get_property (GObject *object, guint prop_id, GValue *value,
-       g_value_set_string (value, self->name);
-       break;
- 
-+    case PROP_SPARQL_TEMPLATE:
-+      g_value_set_object (value, self->sparql_template);
-+      break;
-+
-     default:
-       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-       break;
-@@ -127,10 +119,6 @@ photos_search_type_set_property (GObject *object, guint prop_id, const GValue *v
- 
-   switch (prop_id)
-     {
--    case PROP_FILTER:
--      self->filter = g_value_dup_string (value);
--      break;
--
-     case PROP_ID:
-       self->id = g_value_dup_string (value);
-       break;
-@@ -139,8 +127,8 @@ photos_search_type_set_property (GObject *object, guint prop_id, const GValue *v
-       self->name = g_value_dup_string (value);
-       break;
- 
--    case PROP_WHERE:
--      self->where = g_value_dup_string (value);
-+    case PROP_SPARQL_TEMPLATE:
-+      self->sparql_template = g_object_ref (g_value_get_object (value));
-       break;
- 
-     default:
-@@ -165,14 +153,6 @@ photos_search_type_class_init (PhotosSearchTypeClass *class)
-   object_class->get_property = photos_search_type_get_property;
-   object_class->set_property = photos_search_type_set_property;
- 
--  g_object_class_install_property (object_class,
--                                   PROP_FILTER,
--                                   g_param_spec_string ("filter",
--                                                        "",
--                                                        "",
--                                                        "(true)",
--                                                        G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE));
--
-   g_object_class_install_property (object_class,
-                                    PROP_ID,
-                                    g_param_spec_string ("id",
-@@ -190,11 +170,11 @@ photos_search_type_class_init (PhotosSearchTypeClass *class)
-                                                         G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE));
- 
-   g_object_class_install_property (object_class,
--                                   PROP_WHERE,
--                                   g_param_spec_string ("where",
--                                                        "",
-+                                   PROP_SPARQL_TEMPLATE,
-+                                   g_param_spec_object ("sparql-template",
-                                                         "",
-                                                         "",
-+                                                        PHOTOS_TYPE_SPARQL_TEMPLATE,
-                                                         G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE));
- }
- 
-@@ -202,9 +182,7 @@ photos_search_type_class_init (PhotosSearchTypeClass *class)
- static void
- photos_search_type_filterable_iface_init (PhotosFilterableInterface *iface)
- {
--  iface->get_filter = photos_search_type_get_filter;
-   iface->get_id = photos_search_type_get_id;
--  iface->get_where = photos_search_type_get_where;
-   iface->is_search_criterion = photos_search_type_is_search_criterion;
- }
- 
-@@ -217,12 +195,13 @@ photos_search_type_new (const gchar *id, const gchar *name)
- 
- 
- PhotosSearchType *
--photos_search_type_new_full (const gchar *id, const gchar *name, const gchar *where, const gchar *filter)
-+photos_search_type_new_full (const gchar *id, const gchar *name, const gchar *template_path)
- {
-+  g_autoptr (PhotosSparqlTemplate) template = photos_sparql_template_new (template_path);
-+
-   return g_object_new (PHOTOS_TYPE_SEARCH_TYPE,
-                        "id", id,
-                        "name", name,
--                       "filter", filter,
--                       "where", where,
-+                       "sparql-template", template,
-                        NULL);
- }
-diff --git a/src/photos-search-type.h b/src/photos-search-type.h
-index 2f7135bd..7d699dd4 100644
---- a/src/photos-search-type.h
-+++ b/src/photos-search-type.h
-@@ -24,6 +24,7 @@
- #define PHOTOS_SEARCH_TYPE_H
- 
- #include <glib-object.h>
-+#include "photos-sparql-template.h"
- 
- G_BEGIN_DECLS
- 
-@@ -39,8 +40,9 @@ PhotosSearchType    *photos_search_type_new                (const gchar *id, con
- 
- PhotosSearchType    *photos_search_type_new_full           (const gchar *id,
-                                                             const gchar *name,
--                                                            const gchar *where,
--                                                            const gchar *filter);
-+                                                            const gchar *template_path);
-+
-+PhotosSparqlTemplate *photos_search_type_get_sparql_template (PhotosSearchType *self);
- 
- G_END_DECLS
- 
-diff --git a/src/photos-sparql-template.c b/src/photos-sparql-template.c
-new file mode 100644
-index 00000000..b32437c0
---- /dev/null
-+++ b/src/photos-sparql-template.c
-@@ -0,0 +1,187 @@
-+/*
-+ * Photos - access, organize and share your photos on GNOME
-+ * Copyright © 2020 Sam Thursfield <sam@afuera.me.uk>
-+ *
-+ * This program is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation, either version 3 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#include <gio/gio.h>
-+
-+#include "photos-sparql-template.h"
-+
-+#define MAX_SPARQL_TEMPLATE_SIZE (1024 * 10)
-+
-+struct _PhotosSparqlTemplate {
-+  GObject parent_instance;
-+  gchar *template_path;
-+  gchar *template_text;
-+};
-+
-+G_DEFINE_TYPE (PhotosSparqlTemplate, photos_sparql_template, G_TYPE_OBJECT)
-+
-+enum {
-+  PROP_0,
-+  PROP_TEMPLATE_PATH,
-+  N_PROPS
-+};
-+
-+PhotosSparqlTemplate *
-+photos_sparql_template_new (const gchar *template_path)
-+{
-+  return g_object_new (PHOTOS_TYPE_SPARQL_TEMPLATE, "template-path", template_path, NULL);
-+}
-+
-+static void
-+photos_sparql_template_constructed (GObject *object)
-+{
-+  PhotosSparqlTemplate *self = PHOTOS_SPARQL_TEMPLATE (object);
-+  g_autoptr (GFile) file = NULL;
-+  g_autoptr (GFileInputStream) stream = NULL;
-+  gchar buffer[MAX_SPARQL_TEMPLATE_SIZE + 1];
-+  gsize bytes_read;
-+  g_autoptr (GError) error = NULL;
-+
-+  G_OBJECT_CLASS (photos_sparql_template_parent_class)->constructed (object);
-+
-+  file = g_file_new_for_uri (self->template_path);
-+
-+  stream = g_file_read (file, NULL, &error);
-+
-+  if (!stream)
-+    {
-+      g_critical ("Failed to open template %s: %s", self->template_path, error->message);
-+    }
-+
-+  g_input_stream_read_all (G_INPUT_STREAM (stream), buffer, MAX_SPARQL_TEMPLATE_SIZE, &bytes_read, NULL, &error);
-+
-+  if (error)
-+    {
-+      g_critical ("Failed to read template %s: %s", self->template_path, error->message);
-+    }
-+
-+  buffer[bytes_read] = '\0';
-+
-+  self->template_text  = g_strdup (buffer);
-+}
-+
-+static void
-+photos_sparql_template_finalize (GObject *object)
-+{
-+  G_OBJECT_CLASS (photos_sparql_template_parent_class)->finalize (object);
-+}
-+
-+static void
-+photos_sparql_template_get_property (GObject    *object,
-+                                     guint       prop_id,
-+                                     GValue     *value,
-+                                     GParamSpec *pspec)
-+{
-+  PhotosSparqlTemplate *self = PHOTOS_SPARQL_TEMPLATE (object);
-+
-+  switch (prop_id)
-+    {
-+    case PROP_TEMPLATE_PATH:
-+      g_value_set_string (value, self->template_path);
-+      break;
-+
-+    default:
-+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-+    }
-+}
-+
-+static void
-+photos_sparql_template_set_property (GObject      *object,
-+                                     guint         prop_id,
-+                                     const GValue *value,
-+                                     GParamSpec   *pspec)
-+{
-+  PhotosSparqlTemplate *self = PHOTOS_SPARQL_TEMPLATE (object);
-+
-+  switch (prop_id)
-+    {
-+    case PROP_TEMPLATE_PATH:
-+      self->template_path = g_value_dup_string (value);
-+      break;
-+
-+    default:
-+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-+    }
-+}
-+
-+static void
-+photos_sparql_template_class_init (PhotosSparqlTemplateClass *klass)
-+{
-+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-+
-+  object_class->constructed = photos_sparql_template_constructed;
-+  object_class->finalize = photos_sparql_template_finalize;
-+  object_class->get_property = photos_sparql_template_get_property;
-+  object_class->set_property = photos_sparql_template_set_property;
-+
-+  g_object_class_install_property (object_class,
-+                                   PROP_TEMPLATE_PATH,
-+                                   g_param_spec_string ("template-path",
-+                                                        "Template path",
-+                                                        "Path to the template file.",
-+                                                        NULL,
-+                                                        G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE));
-+}
-+
-+static void
-+photos_sparql_template_init (PhotosSparqlTemplate *self)
-+{
-+}
-+
-+
-+gchar *
-+photos_sparql_template_get_sparql (PhotosSparqlTemplate *self,
-+                                   const gchar          *first_binding_name, ...)
-+{
-+  va_list va;
-+  gchar *sparql;
-+
-+  sparql = self->template_text;
-+
-+  /* FIXME: this is an inefficent way to do template substitutions
-+   * because we allocate and free a copy of the string for each binding.
-+   * We should check https://gitlab.gnome.org/GNOME/template-glib/
-+   */
-+  if (first_binding_name)
-+    {
-+      GRegex *regex;
-+      gchar *name_regex;
-+      const gchar *name;
-+      const gchar *value;
-+
-+      va_start (va, first_binding_name);
-+      name = first_binding_name;
-+      do {
-+        value = va_arg (va, const gchar *);
-+
-+        if (value == NULL)
-+          {
-+            g_critical ("Missing value for argument \"%s\"", name);
-+            break;
-+          }
-+
-+        name_regex = g_strdup_printf ("{{\\s?%s\\s?}}", name);
-+        regex = g_regex_new (name_regex, 0, 0, NULL);
-+        sparql = g_regex_replace_literal (regex, sparql, -1, 0, value, 0, NULL) ;
-+      } while ((name = va_arg (va, const gchar *)));
-+
-+      va_end (va);
-+    }
-+
-+  return sparql;
-+}
-diff --git a/src/photos-sparql-template.h b/src/photos-sparql-template.h
-new file mode 100644
-index 00000000..66351b38
---- /dev/null
-+++ b/src/photos-sparql-template.h
-@@ -0,0 +1,38 @@
-+/*
-+ * Photos - access, organize and share your photos on GNOME
-+ * Copyright © 2020 Sam Thursfield <sam@afuera.me.uk>
-+ *
-+ * This program is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation, either version 3 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#pragma once
-+
-+#include <glib-object.h>
-+
-+G_BEGIN_DECLS
-+
-+#define PHOTOS_TYPE_SPARQL_TEMPLATE (photos_sparql_template_get_type())
-+
-+G_DECLARE_FINAL_TYPE (PhotosSparqlTemplate, photos_sparql_template, PHOTOS, SPARQL_TEMPLATE, GObject)
-+
-+struct _PhotosSparqlTemplateClass
-+{
-+  GObjectClass parent_class;
-+};
-+
-+PhotosSparqlTemplate *photos_sparql_template_new (const gchar *template_path);
-+
-+gchar *photos_sparql_template_get_sparql (PhotosSparqlTemplate *self, const gchar *first_binding_name, ...)  G_GNUC_NULL_TERMINATED;
-+
-+G_END_DECLS
-diff --git a/src/photos.gresource.xml b/src/photos.gresource.xml
-index 1015b11d..39e6d842 100644
---- a/src/photos.gresource.xml
-+++ b/src/photos.gresource.xml
-@@ -35,6 +35,10 @@
-     <file alias="selection-toolbar.ui" preprocess="xml-stripblanks" compressed="true">photos-selection-toolbar.ui</file>
-     <file alias="share-dialog.ui" preprocess="xml-stripblanks" compressed="true">photos-share-dialog.ui</file>
-     <file alias="zoom-controls.ui" preprocess="xml-stripblanks" compressed="true">photos-zoom-controls.ui</file>
-+    <file alias="all.sparql.template">queries/all.sparql.template</file>
-+    <file alias="collections.sparql.template">queries/collections.sparql.template</file>
-+    <file alias="favorite-photos.sparql.template">queries/favorite-photos.sparql.template</file>
-+    <file alias="photos.sparql.template">queries/photos.sparql.template</file>
-   </gresource>
- 
-   <gresource prefix="/org/gnome/Photos/gtk">
-diff --git a/src/queries/all.sparql.template b/src/queries/all.sparql.template
-new file mode 100644
-index 00000000..1cef98e8
---- /dev/null
-+++ b/src/queries/all.sparql.template
-@@ -0,0 +1,31 @@
-+SELECT {{projection}}
-+{
-+    {
-+        SELECT {{projection}}
-+        {
-+            {
-+                SELECT ?urn COUNT(?item) AS ?count
-+                {
-+                    ?urn a nfo:DataContainer.
-+                    ?item a nmm:Photo; nie:isPartOf ?urn.
-+                } GROUP BY ?urn
-+            }
-+            FILTER (?count > 0 && {{collections_default_filter}} && {{search_filter}})
-+        }
-+        GROUP BY ?urn
-+    }
-+    UNION
-+    {
-+        SELECT {{projection}}
-+        {
-+            ?urn a nmm:Photo .
-+            OPTIONAL { ?urn nco:creator ?creator . }
-+            OPTIONAL { ?urn nco:publisher ?publisher . }
-+            {{item_pattern}}
-+            FILTER ({{photos_default_filter}} && {{source_filter}} && {{search_filter}})
-+        }
-+        GROUP BY ?urn
-+    }
-+}
-+{{order}}
-+{{offset_limit}}
-diff --git a/src/queries/collections.sparql.template b/src/queries/collections.sparql.template
-new file mode 100644
-index 00000000..20b35cd6
---- /dev/null
-+++ b/src/queries/collections.sparql.template
-@@ -0,0 +1,14 @@
-+SELECT {{projection}}
-+{
-+    {
-+        SELECT ?urn COUNT(?item) AS ?count
-+        {
-+            ?urn a nfo:DataContainer.
-+            ?item a nmm:Photo; nie:isPartOf ?urn.
-+        } GROUP BY ?urn
-+    }
-+    FILTER (?count > 0 && {{collections_default_filter}} && {{search_filter}})
-+}
-+GROUP BY ?urn
-+{{order}}
-+{{offset_limit}}
-diff --git a/src/queries/favorite-photos.sparql.template b/src/queries/favorite-photos.sparql.template
-new file mode 100644
-index 00000000..0885a08a
---- /dev/null
-+++ b/src/queries/favorite-photos.sparql.template
-@@ -0,0 +1,12 @@
-+SELECT {{projection}}
-+{
-+    ?urn a nmm:Photo .
-+    ?urn a nmm:Photo; nao:hasTag nao:predefined-tag-favorite .
-+    OPTIONAL { ?urn nco:creator ?creator . }
-+    OPTIONAL { ?urn nco:publisher ?publisher . }
-+    {{item_pattern}}
-+    FILTER ({{photos_default_filter}} && {{source_filter}} && {{search_filter}})
-+}
-+GROUP BY ?urn
-+{{order}}
-+{{offset_limit}}
-diff --git a/src/queries/photos.sparql.template b/src/queries/photos.sparql.template
-new file mode 100644
-index 00000000..4eb10b74
---- /dev/null
-+++ b/src/queries/photos.sparql.template
-@@ -0,0 +1,11 @@
-+SELECT {{projection}}
-+{
-+    ?urn a nmm:Photo .
-+    OPTIONAL { ?urn nco:creator ?creator . }
-+    OPTIONAL { ?urn nco:publisher ?publisher . }
-+    {{item_pattern}}
-+    FILTER ({{photos_default_filter}} && {{source_filter}} && {{search_filter}})
-+}
-+GROUP BY ?urn
-+{{order}}
-+{{offset_limit}}
--- 
-GitLab
-
-
-From dbbb76f228bad33334e0574784c34efb7071f950 Mon Sep 17 00:00:00 2001
-From: Sam Thursfield <sam@afuera.me.uk>
-Date: Sat, 23 May 2020 13:36:25 +0200
-Subject: [PATCH 3/3] Port to Tracker 3
-
-Notable changes:
-
-  * User data (favourites, albums) is now stored in a private database in
-    ~/.local/share/gnome-photos. This is combined with the Tracker Miner
-    FS index of photos at query time.
-  * Inside Flatpak, the app connects to Tracker via the new
-    xdg-tracker-portal instead of talking directly over D-Bus. Access is
-    limited by the portal so the app can only see the Pictures graph.
-  * The Flatpak build can use a bundled version of Tracker Miners, if a
-    suitable version is not available on the host.
-  * Change detection is done using TrackerNotifier instead of watching
-    the GraphUpdated D-Bus signal directly.
-
-Closes https://gitlab.gnome.org/GNOME/gnome-photos/-/issues/59
-Closes https://gitlab.gnome.org/GNOME/gnome-photos/-/issues/152
----
- data/meson.build                              |   2 +
- data/tracker/meson.build                      |  33 ++
- ...e.Photos.Tracker3.Miner.Extract.service.in |   7 +
- ...ome.Photos.Tracker3.Miner.Files.service.in |   7 +
- data/tracker/org.gnome.Photos.domain.rule.in  |  20 +
- flatpak/org.gnome.Photos.json                 |  49 +-
- meson.build                                   |   3 +-
- src/meson.build                               |  19 +-
- ...freedesktop.Tracker3.Miner.Files.Index.xml |  11 +
- src/org.freedesktop.Tracker3.Miner.xml        |  56 +++
- src/photos-application.c                      | 176 ++-----
- src/photos-base-item.c                        |  10 +
- src/photos-indexing-notification.c            |  53 +-
- src/photos-item-manager.c                     |  69 +--
- src/photos-quarks.c                           |  20 +-
- src/photos-query-builder.c                    | 148 ++++--
- src/photos-search-context.c                   |   3 +
- src/photos-search-context.h                   |   1 +
- src/photos-search-match-manager.c             |   2 +-
- src/photos-source.c                           |  14 +-
- src/photos-tracker-change-event.c             | 136 -----
- src/photos-tracker-change-event.h             |  64 ---
- src/photos-tracker-change-monitor.c           | 468 ------------------
- src/photos-tracker-change-monitor.h           |  42 --
- src/photos-tracker-controller.c               |  12 +-
- src/photos-tracker-extract-priority.xml       |   2 +-
- src/photos-tracker-import-controller.c        |  85 ++--
- src/photos-tracker-queue.c                    | 206 +++++++-
- src/photos-tracker-queue.h                    |   7 +
- src/photos-tracker-resources.xml              |  31 --
- src/photos-utils.c                            |  24 +-
- src/photos-utils.h                            |   2 +-
- src/queries/all.sparql.template               |  34 +-
- src/queries/collections.sparql.template       |  20 +-
- src/queries/favorite-photos.sparql.template   |  20 +-
- src/queries/photos.sparql.template            |  22 +-
- 36 files changed, 736 insertions(+), 1142 deletions(-)
- create mode 100644 data/tracker/meson.build
- create mode 100644 data/tracker/org.gnome.Photos.Tracker3.Miner.Extract.service.in
- create mode 100644 data/tracker/org.gnome.Photos.Tracker3.Miner.Files.service.in
- create mode 100644 data/tracker/org.gnome.Photos.domain.rule.in
- create mode 100644 src/org.freedesktop.Tracker3.Miner.Files.Index.xml
- create mode 100644 src/org.freedesktop.Tracker3.Miner.xml
- delete mode 100644 src/photos-tracker-change-event.c
- delete mode 100644 src/photos-tracker-change-event.h
- delete mode 100644 src/photos-tracker-change-monitor.c
- delete mode 100644 src/photos-tracker-change-monitor.h
- delete mode 100644 src/photos-tracker-resources.xml
-
-diff --git a/data/meson.build b/data/meson.build
-index f51a4511..9b528c96 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -83,3 +83,5 @@ install_data(
-   photos_namespace.to_lower() + '.gschema.xml',
-   install_dir: join_paths(photos_datadir, 'glib-2.0', 'schemas'),
- )
-+
-+subdir('tracker')
-diff --git a/data/tracker/meson.build b/data/tracker/meson.build
-new file mode 100644
-index 00000000..accc99c2
---- /dev/null
-+++ b/data/tracker/meson.build
-@@ -0,0 +1,33 @@
-+# Files needed for running Tracker inside the Flatpak sandbox, for systems
-+# which don't have a suitable version of Tracker in the host OS.
-+#
-+# We must export the .service files from the sandbox so they work on the
-+# session bus. This means the Tracker domain name must correspond with the
-+# application ID.
-+
-+
-+domain_ontologies_dir = get_option('datadir') / 'tracker3' / 'domain-ontologies'
-+dbus_services_dir = get_option('datadir') / 'dbus-1' / 'services'
-+
-+tracker_domain_config = configuration_data()
-+tracker_domain_config.set('application_id', photos_namespace)
-+tracker_domain_config.set('domain_rule', get_option('prefix') / domain_ontologies_dir / photos_namespace + '.domain.rule')
-+
-+configure_file(
-+  input: 'org.gnome.Photos.domain.rule.in',
-+  output: photos_namespace + '.domain.rule',
-+  configuration: tracker_domain_config,
-+  install_dir: domain_ontologies_dir)
-+
-+configure_file(
-+  input: 'org.gnome.Photos.Tracker3.Miner.Extract.service.in',
-+  output: photos_namespace + '.Tracker3.Miner.Extract.service',
-+  configuration: tracker_domain_config,
-+  install_dir: dbus_services_dir)
-+
-+configure_file(
-+  input: 'org.gnome.Photos.Tracker3.Miner.Files.service.in',
-+  output: photos_namespace + '.Tracker3.Miner.Files.service',
-+  configuration: tracker_domain_config,
-+  install_dir: dbus_services_dir)
-+
-diff --git a/data/tracker/org.gnome.Photos.Tracker3.Miner.Extract.service.in b/data/tracker/org.gnome.Photos.Tracker3.Miner.Extract.service.in
-new file mode 100644
-index 00000000..eb7a87aa
---- /dev/null
-+++ b/data/tracker/org.gnome.Photos.Tracker3.Miner.Extract.service.in
-@@ -0,0 +1,7 @@
-+[D-BUS Service]
-+Name=@application_id@.Tracker3.Miner.Extract
-+Exec=/app/libexec/tracker-extract-3 --domain-ontology @domain_rule@
-+
-+# Miner details needed for tracker-control
-+Path=/org/freedesktop/Tracker3/Miner/Extract
-+NameSuffix=Miner.Files
-diff --git a/data/tracker/org.gnome.Photos.Tracker3.Miner.Files.service.in b/data/tracker/org.gnome.Photos.Tracker3.Miner.Files.service.in
-new file mode 100644
-index 00000000..4fa7371d
---- /dev/null
-+++ b/data/tracker/org.gnome.Photos.Tracker3.Miner.Files.service.in
-@@ -0,0 +1,7 @@
-+[D-BUS Service]
-+Name=@application_id@.Tracker3.Miner.Files
-+Exec=/app/libexec/tracker-miner-fs-3 --domain-ontology @domain_rule@ --initial-sleep 0
-+
-+# Miner details needed for tracker-control
-+Path=/org/freedesktop/Tracker3/Miner/Files
-+NameSuffix=Miner.Files
-diff --git a/data/tracker/org.gnome.Photos.domain.rule.in b/data/tracker/org.gnome.Photos.domain.rule.in
-new file mode 100644
-index 00000000..8f5fc4a1
---- /dev/null
-+++ b/data/tracker/org.gnome.Photos.domain.rule.in
-@@ -0,0 +1,20 @@
-+# This defines a private Tracker domain for GNOME Photos.
-+#
-+# It's used to run the Tracker indexer inside a Flatpak sandbox, when Photos is
-+# running on a host that doesn't have a suitable version of Tracker installed.
-+
-+[DomainOntology]
-+# Location for the Tracker database
-+CacheLocation=$XDG_CACHE_HOME/gnome-photos/miner/files
-+
-+# Name of the ontology to use, must be one located in
-+# $(sharedir)/tracker/ontologies
-+OntologyName=nepomuk
-+
-+# DBus name for the owner (not optional). Tracker will use
-+# the domain as the prefix of the DBus name for all the
-+# services related to this domain ontology.
-+Domain=@application_id@
-+
-+# List of miners we expect to run in this domain.
-+Miners=Miner.Files;Miner.Extract
-diff --git a/flatpak/org.gnome.Photos.json b/flatpak/org.gnome.Photos.json
-index 4d3ac2a8..adfdaf34 100644
---- a/flatpak/org.gnome.Photos.json
-+++ b/flatpak/org.gnome.Photos.json
-@@ -7,7 +7,7 @@
-     "tags": [ "nightly" ],
-     "desktop-file-name-prefix": "(Nightly) ",
-     "finish-args": [
--        "--env=TRACKER_SPARQL_BACKEND=bus",
-+        "--add-policy=Tracker3.dbus:org.freedesktop.Tracker3.Miner.Files=tracker:Pictures",
-         "--filesystem=xdg-download",
-         "--filesystem=xdg-pictures",
-         "--metadata=X-DConf=migrate-path=/org/gnome/photos/",
-@@ -17,8 +17,8 @@
-         "--socket=wayland",
-         "--socket=x11",
-         "--talk-name=org.freedesktop.FileManager1",
--        "--talk-name=org.freedesktop.Tracker1",
--        "--talk-name=org.freedesktop.Tracker1.Miner.Extract",
-+        "--talk-name=org.freedesktop.Tracker3.Miner.Files",
-+        "--talk-name=org.freedesktop.Tracker3.Miner.Files.Index",
-         "--talk-name=com.intel.dleyna-renderer",
-         "--talk-name=org.gnome.ControlCenter",
-         "--talk-name=org.gnome.SettingsDaemon",
-@@ -248,50 +248,22 @@
-                 }
-             ]
-         },
--        {
--            "name": "tracker",
--            "buildsystem": "meson",
--            "cleanup": [ "/bin", "/etc", "/lib/girepository-1.0", "/share/dbus-1", "/share/gir-1.0" ],
--            "config-opts": [ "-Dbash_completion=no", "-Ddocs=false", "-Dsystemd_user_services=no" ],
--            "sources": [
--                {
--                    "type": "git",
--                    "url": "https://gitlab.gnome.org/GNOME/tracker.git",
--                    "branch": "tracker-2.3"
--                }
--            ]
--        },
--        {
--            "name": "intltool",
--            "cleanup": [ "*" ],
--            "sources": [
--                {
--                    "type": "archive",
--                    "url": "https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz",
--                    "sha256": "67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd"
--                }
--            ]
--        },
-         {
-             "name": "tracker-miners",
-             "buildsystem": "meson",
--            "cleanup": [ "/etc",
--                         "/share/dbus-1/services/org.freedesktop.Tracker1.Miner.Extract.service",
--                         "/share/dbus-1/services/org.freedesktop.Tracker1.Writeback.service",
--                         "/share/tracker/miners/org.freedesktop.Tracker1.Miner.Applications.service",
--                         "/share/tracker/miners/org.freedesktop.Tracker1.Miner.Extract.service",
--                         "/share/tracker/miners/org.freedesktop.Tracker1.Miner.RSS.service",
--                         "/share/glib-2.0/schemas/org.freedesktop.Tracker.Writeback.gschema.xml" ],
--            "config-opts": [ "-Dextract=true",
-+            "cleanup": [ "/share/dbus-1/services/org.freedesktop.Tracker3.Miner.Extract.service",
-+                         "/share/dbus-1/services/org.freedesktop.Tracker3.Miner.Files.service",
-+                         "/share/dbus-1/services/org.freedesktop.Tracker3.Writeback.service" ],
-+            "config-opts": [ "-Dman=false",
-                              "-Dminer_fs=true",
-                              "-Dminer_rss=false",
--                             "-Dsystemd_user_services=no",
-+                             "-Dsystemd_user_services=false",
-                              "-Dwriteback=false" ],
-             "sources": [
-                 {
-                     "type": "git",
-                     "url": "https://gitlab.gnome.org/GNOME/tracker-miners.git",
--                    "branch": "tracker-miners-2.3"
-+                    "branch": "master"
-                 }
-             ]
-         },
-@@ -303,7 +275,8 @@
-                 {
-                     "type": "git",
-                     "url": "https://gitlab.gnome.org/GNOME/gnome-photos.git",
--                    "disable-shallow-clone": "true"
-+                    "disable-shallow-clone": "true",
-+                    "branch": "sam/tracker3"
-                 }
-             ]
-         }
-diff --git a/meson.build b/meson.build
-index ead63250..d20e1289 100644
---- a/meson.build
-+++ b/meson.build
-@@ -172,8 +172,7 @@ libgdata_dep = dependency('libgdata', version: '>= 0.15.2')
- libgfgraph_dep = dependency('libgfbgraph-0.2', version: '>= 0.2.1')
- libjpeg_dep = dependency('libjpeg')
- libpng_dep = dependency('libpng16')
--tracker_control_dep = dependency('tracker-control-2.0')
--tracker_sparql_dep = dependency('tracker-sparql-2.0')
-+tracker_sparql_dep = dependency('tracker-sparql-3.0')
- 
- dbus_dep = dependency('dbus-1')
- dbus_services_dir = dbus_dep.get_pkgconfig_variable(
-diff --git a/src/meson.build b/src/meson.build
-index b5b2759c..6b3b7f01 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -205,8 +205,6 @@ sources = common_sources + files(
-   'photos-tool-enhance.c',
-   'photos-tool-filter-button.c',
-   'photos-tool-filters.c',
--  'photos-tracker-change-event.c',
--  'photos-tracker-change-monitor.c',
-   'photos-tracker-collection-view-controller.c',
-   'photos-tracker-collections-controller.c',
-   'photos-tracker-controller.c',
-@@ -367,22 +365,18 @@ sources += gnome.gdbus_codegen(
-   autocleanup: 'all',
- )
- 
--tracker_extract_priority = 'photos-tracker-extract-priority'
--
- sources += gnome.gdbus_codegen(
--  tracker_extract_priority,
--  tracker_extract_priority + '.xml',
--  interface_prefix: 'org.freedesktop.Tracker1.',
-+  'photos-tracker-miner',
-+  'org.freedesktop.Tracker3.Miner.xml',
-+  interface_prefix: 'org.freedesktop.Tracker3.',
-   namespace: 'Tracker',
-   autocleanup: 'all',
- )
- 
--tracker_resources = 'photos-tracker-resources'
--
- sources += gnome.gdbus_codegen(
--  tracker_resources,
--  tracker_resources + '.xml',
--  interface_prefix: 'org.freedesktop.Tracker1.',
-+  'photos-tracker-miner-index',
-+  'org.freedesktop.Tracker3.Miner.Files.Index.xml',
-+  interface_prefix: 'org.freedesktop.Tracker3.',
-   namespace: 'Tracker',
-   autocleanup: 'all',
- )
-@@ -401,7 +395,6 @@ deps = common_deps + [
-   libgdata_dep,
-   libgfgraph_dep,
-   m_dep,
--  tracker_control_dep,
-   tracker_sparql_dep,
- ]
- 
-diff --git a/src/org.freedesktop.Tracker3.Miner.Files.Index.xml b/src/org.freedesktop.Tracker3.Miner.Files.Index.xml
-new file mode 100644
-index 00000000..e368f1e2
---- /dev/null
-+++ b/src/org.freedesktop.Tracker3.Miner.Files.Index.xml
-@@ -0,0 +1,11 @@
-+<node>
-+  <interface name='org.freedesktop.Tracker3.Miner.Files.Index'>
-+    <method name='IndexLocation'>
-+      <arg type='s' name='file_uri' direction='in' />
-+      <arg type='as' name='graphs' direction='in' />
-+      <arg type='as' name='flags' direction='in'>"
-+        <doc:doc><doc:summary>Extension flags, no allowed values at the moment</doc:summary></doc:doc>
-+      </arg>
-+    </method>
-+  </interface>
-+</node>
-diff --git a/src/org.freedesktop.Tracker3.Miner.xml b/src/org.freedesktop.Tracker3.Miner.xml
-new file mode 100644
-index 00000000..6fe09c84
---- /dev/null
-+++ b/src/org.freedesktop.Tracker3.Miner.xml
-@@ -0,0 +1,56 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+
-+<node name="/">
-+  <interface name="org.freedesktop.Tracker3.Miner">
-+    <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="_tracker_miner_dbus"/>
-+    <method name="Start">
-+      <annotation name="org.freedesktop.DBus.GLib.Async"  value="true"/>
-+    </method>
-+    <method name="GetStatus">
-+      <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
-+      <arg type="s" name="status" direction="out" />
-+    </method>
-+    <method name="GetProgress">
-+      <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
-+      <arg type="d" name="progress" direction="out" />
-+    </method>
-+    <method name="GetRemainingTime">
-+      <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
-+      <arg type="i" name="remaining_time" direction="out" />
-+    </method>
-+    <method name="GetPauseDetails">
-+      <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
-+      <arg type="as" name="pause_applications" direction="out" />
-+      <arg type="as" name="pause_reasons" direction="out" />
-+    </method>
-+    <method name="Pause">
-+      <annotation name="org.freedesktop.DBus.GLib.Async"  value="true"/>
-+      <arg type="s" name="application" direction="in" />
-+      <arg type="s" name="reason" direction="in" />
-+      <arg type="i" name="cookie" direction="out" />
-+    </method>
-+    <method name="PauseForProcess">
-+      <annotation name="org.freedesktop.DBus.GLib.Async"  value="true"/>
-+      <arg type="s" name="application" direction="in" />
-+      <arg type="s" name="reason" direction="in" />
-+      <arg type="i" name="cookie" direction="out" />
-+    </method>
-+    <method name="Resume">
-+      <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
-+      <arg type="i" name="cookie" direction="in" />
-+    </method>
-+
-+    <!-- Signals -->
-+    <signal name="Started" />
-+    <signal name="Stopped">
-+      <arg type="b" name="interrupted" />
-+    </signal>
-+    <signal name="Paused" />
-+    <signal name="Resumed" />
-+    <signal name="Progress">
-+      <arg type="s" name="status" />
-+      <arg type="d" name="progress" />
-+      <arg type="i" name="remaining_time" />
-+    </signal>
-+  </interface>
-+</node>
-diff --git a/src/photos-application.c b/src/photos-application.c
-index f7b4b56e..7d6758cd 100644
---- a/src/photos-application.c
-+++ b/src/photos-application.c
-@@ -36,7 +36,6 @@
- #include <glib.h>
- #include <glib/gi18n.h>
- #include <grilo.h>
--#include <libtracker-control/tracker-control.h>
- 
- #include "photos-application.h"
- #include "photos-base-item.h"
-@@ -68,7 +67,8 @@
- #include "photos-share-notification.h"
- #include "photos-share-point-manager.h"
- #include "photos-thumbnail-factory.h"
--#include "photos-tracker-extract-priority.h"
-+#include "photos-tracker-miner-index.h"
-+#include "photos-tracker-queue.h"
- #include "photos-utils.h"
- 
- 
-@@ -127,8 +127,7 @@ struct _PhotosApplication
-   PhotosSearchProvider *search_provider;
-   PhotosSelectionController *sel_cntrlr;
-   PhotosThumbnailFactory *factory;
--  TrackerMinerManager *miner_manager;
--  TrackerExtractPriority *extract_priority;
-+  TrackerMinerFilesIndex *miner_control_proxy;
-   gboolean empty_results;
-   gboolean main_window_deleted;
-   guint create_miners_count;
-@@ -149,7 +148,6 @@ static guint signals[LAST_SIGNAL] = { 0 };
- 
- static void photos_application_search_context_iface_init (PhotosSearchContextInterface *iface);
- 
--
- G_DEFINE_TYPE_WITH_CODE (PhotosApplication, photos_application, GTK_TYPE_APPLICATION,
-                          G_IMPLEMENT_INTERFACE (PHOTOS_TYPE_SEARCH_CONTEXT,
-                                                 photos_application_search_context_iface_init));
-@@ -174,7 +172,6 @@ static const gchar *DESKTOP_KEY_PICTURE_OPTIONS = "picture-options";
- static const gchar *DESKTOP_KEY_COLOR_SHADING_TYPE = "color-shading-type";
- static const gchar *DESKTOP_KEY_PRIMARY_COLOR = "primary-color";
- static const gchar *DESKTOP_KEY_SECONDARY_COLOR = "secondary-color";
--static const gchar *MINER_FILES = "org.gnome.Photos.Tracker1.Miner.Files";
- 
- typedef struct _PhotosApplicationCreateData PhotosApplicationCreateData;
- typedef struct _PhotosApplicationImportData PhotosApplicationImportData;
-@@ -582,27 +579,6 @@ photos_application_actions_update (PhotosApplication *self)
- }
- 
- 
--static void
--photos_application_tracker_clear_rdf_types (GObject *source_object, GAsyncResult *res, gpointer user_data)
--{
--  PhotosApplication *self = PHOTOS_APPLICATION (user_data);
--  TrackerExtractPriority *extract_priority = TRACKER_EXTRACT_PRIORITY (source_object);
--
--  {
--    g_autoptr (GError) error = NULL;
--
--    if (!tracker_extract_priority_call_clear_rdf_types_finish (extract_priority, res, &error))
--      {
--        g_warning ("Unable to call ClearRdfTypes: %s", error->message);
--        goto out;
--      }
--  }
--
-- out:
--  g_application_release (G_APPLICATION (self));
--}
--
--
- static gboolean
- photos_application_delete_event (PhotosApplication *self)
- {
-@@ -639,16 +615,6 @@ photos_application_destroy (PhotosApplication *self)
-   self->create_window_cancellable = g_cancellable_new ();
- 
-   photos_application_stop_miners (self);
--
--  if (self->extract_priority != NULL)
--    {
--      g_application_hold (G_APPLICATION (self));
--      tracker_extract_priority_call_clear_rdf_types (self->extract_priority,
--                                                     NULL,
--                                                     photos_application_tracker_clear_rdf_types,
--                                                     self);
--      g_clear_object (&self->extract_priority);
--    }
- }
- 
- 
-@@ -738,57 +704,34 @@ photos_application_gegl_init_fishes_idle (gpointer user_data)
- }
- 
- 
--static void
--photos_application_tracker_set_rdf_types (GObject *source_object, GAsyncResult *res, gpointer user_data)
-+static TrackerMinerFilesIndex *
-+photos_application_get_miner_fs_control_proxy (GCancellable *cancellable)
- {
--  PhotosApplication *self = PHOTOS_APPLICATION (user_data);
--  TrackerExtractPriority *extract_priority = TRACKER_EXTRACT_PRIORITY (source_object);
--
--  {
--    g_autoptr (GError) error = NULL;
-+  g_autoptr (PhotosTrackerQueue) tracker_queue = NULL;
-+  const gchar *miner_fs_control_busname;
-+  g_autoptr (GError) error = NULL;
-+  TrackerMinerFilesIndex *miner_control_proxy;
- 
--    if (!tracker_extract_priority_call_set_rdf_types_finish (extract_priority, res, &error))
--      {
--        if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
--          g_warning ("Unable to call SetRdfTypes: %s", error->message);
-+  tracker_queue = photos_tracker_queue_dup_singleton (cancellable, &error);
- 
--        goto out;
--      }
-+  if (!tracker_queue) {
-+    g_warning ("Error getting Tracker queue: %s. Import will not work.", error->message);
-+    return NULL;
-   }
- 
-- out:
--  g_application_release (G_APPLICATION (self));
--}
--
--
--static void
--photos_application_tracker_extract_priority (GObject *source_object, GAsyncResult *res, gpointer user_data)
--{
--  PhotosApplication *self = PHOTOS_APPLICATION (user_data);
--  const gchar *const rdf_types[] = {"nfo:Image", NULL};
--
--  {
--    g_autoptr (GError) error = NULL;
--
--    self->extract_priority = tracker_extract_priority_proxy_new_for_bus_finish (res, &error);
--    if (error != NULL)
--      {
--        if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
--          g_warning ("Unable to create TrackerExtractPriority proxy: %s", error->message);
--
--        goto out;
--      }
-+  miner_fs_control_busname = photos_tracker_queue_get_miner_fs_control_busname (tracker_queue);
-+  miner_control_proxy = tracker_miner_files_index_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
-+                                                                          G_DBUS_PROXY_FLAGS_NONE,
-+                                                                          miner_fs_control_busname,
-+                                                                          "/org/freedesktop/Tracker3/Miner/Files/Control",
-+                                                                          NULL,
-+                                                                          &error);
-+  if (!miner_control_proxy) {
-+    g_warning ("Error getting Tracker Miner FS control proxy: %s. Import will not work", error->message);
-+    return NULL;
-   }
- 
--  g_application_hold (G_APPLICATION (self));
--  tracker_extract_priority_call_set_rdf_types (self->extract_priority,
--                                               rdf_types,
--                                               self->create_window_cancellable,
--                                               photos_application_tracker_set_rdf_types,
--                                               self);
--
-- out:
--  g_application_release (G_APPLICATION (self));
-+  return miner_control_proxy;
- }
- 
- 
-@@ -826,15 +769,10 @@ photos_application_create_window (PhotosApplication *self)
-     self->init_fishes_id = g_idle_add (photos_application_gegl_init_fishes_idle, self);
- 
-   g_application_hold (G_APPLICATION (self));
--  tracker_extract_priority_proxy_new_for_bus (G_BUS_TYPE_SESSION,
--                                              G_DBUS_PROXY_FLAGS_NONE,
--                                              "org.gnome.Photos.Tracker1.Miner.Extract",
--                                              "/org/freedesktop/Tracker1/Extract/Priority",
--                                              self->create_window_cancellable,
--                                              photos_application_tracker_extract_priority,
--                                              self);
- 
-   photos_application_start_miners (self);
-+
-+  self->miner_control_proxy = photos_application_get_miner_fs_control_proxy (NULL);
-   return TRUE;
- }
- 
-@@ -1111,18 +1049,18 @@ photos_application_get_state (PhotosSearchContext *context)
- 
- 
- static void
--photos_application_import_index_file (GObject *source_object, GAsyncResult *res, gpointer user_data)
-+photos_application_import_index_location (GObject *source_object, GAsyncResult *res, gpointer user_data)
- {
-   PhotosApplication *self;
-   g_autoptr (GFile) file = G_FILE (user_data);
--  TrackerMinerManager *manager = TRACKER_MINER_MANAGER (source_object);
-+  TrackerMinerFilesIndex *miner_control_proxy = TRACKER_MINER_FILES_INDEX (source_object);
- 
-   self = PHOTOS_APPLICATION (g_application_get_default ());
- 
-   {
-     g_autoptr (GError) error = NULL;
- 
--    if (!tracker_miner_manager_index_file_for_process_finish (manager, res, &error))
-+    if (!tracker_miner_files_index_call_index_location_finish (miner_control_proxy, res, &error))
-       {
-         g_autofree gchar *uri = NULL;
- 
-@@ -1345,6 +1283,8 @@ photos_application_import_file_copy (GObject *source_object, GAsyncResult *res,
-   else
-     {
-       g_autofree gchar *destination_uri = NULL;
-+      const gchar *tracker_priority_graphs[] = { TRACKER_PICTURES_GRAPH };
-+      const gchar *tracker_index_location_flags[] = { "for-process" };
- 
-       g_assert_true (G_IS_FILE (destination));
-       g_set_object (&data->destination, destination);
-@@ -1361,11 +1301,13 @@ photos_application_import_file_copy (GObject *source_object, GAsyncResult *res,
- 
-       g_application_hold (G_APPLICATION (self));
-       g_application_mark_busy (G_APPLICATION (self));
--      tracker_miner_manager_index_file_for_process_async (self->miner_manager,
--                                                          destination,
--                                                          NULL,
--                                                          photos_application_import_index_file,
--                                                          g_object_ref (destination));
-+      tracker_miner_files_index_call_index_location (self->miner_control_proxy,
-+                                                     destination_uri,
-+                                                     tracker_priority_graphs,
-+                                                     tracker_index_location_flags,
-+                                                     NULL,
-+                                                     photos_application_import_index_location,
-+                                                     g_object_ref (destination));
-     }
- 
-  out:
-@@ -1529,9 +1471,9 @@ photos_application_import (PhotosApplication *self)
-   selection = photos_selection_controller_get_selection (self->sel_cntrlr);
-   g_return_if_fail (selection != NULL);
- 
--  if (self->miner_manager == NULL)
-+  if (!self->miner_control_proxy)
-     {
--      g_warning ("No TrackerMinerManager, importing from attached devices won't work");
-+      g_warning ("No Tracker3.Miner.Files.Index proxy, importing from attached devices won't work");
-       goto out;
-     }
- 
-@@ -1563,6 +1505,7 @@ photos_application_import (PhotosApplication *self)
-   gtk_widget_show_all (dialog);
- 
-   data = photos_application_import_data_new (self, files, ctime_latest);
-+
-   g_signal_connect (dialog,
-                     "response",
-                     G_CALLBACK (photos_application_import_response),
-@@ -2234,35 +2177,7 @@ photos_application_share_current (PhotosApplication *self)
- static void
- photos_application_start_miners (PhotosApplication *self)
- {
--  {
--    g_autoptr (GError) error = NULL;
--
--    self->miner_manager = tracker_miner_manager_new_full (TRUE, &error);
--    if (error != NULL)
--      g_warning ("Unable to create a TrackerMinerManager: %s", error->message);
--  }
--
--  if (self->miner_manager != NULL)
--    {
--      GSList *available = NULL;
--      GSList *miner_files = NULL;
--
--      available = tracker_miner_manager_get_available (self->miner_manager);
--      miner_files = g_slist_find_custom (available, MINER_FILES, (GCompareFunc) strcmp);
--      if (miner_files == NULL)
--        {
--          g_warning ("Unable to find miner %s", MINER_FILES);
--        }
--      else
--        {
--          if (!tracker_miner_manager_is_active (self->miner_manager, MINER_FILES))
--            g_warning ("Unable to activate miner %s", MINER_FILES);
--        }
--
--      g_slist_free_full (available, g_free);
--    }
--
-- photos_application_create_online_miners (self);
-+  photos_application_create_online_miners (self);
- }
- 
- 
-@@ -2991,6 +2906,7 @@ photos_application_dispose (GObject *object)
-   g_clear_object (&self->insta_action);
-   g_clear_object (&self->load_next_action);
-   g_clear_object (&self->load_previous_action);
-+  g_clear_object (&self->miner_control_proxy);
-   g_clear_object (&self->open_action);
-   g_clear_object (&self->preview_menu_action);
-   g_clear_object (&self->primary_menu_action);
-@@ -3019,8 +2935,7 @@ photos_application_dispose (GObject *object)
-   g_clear_object (&self->camera_cache);
-   g_clear_object (&self->sel_cntrlr);
-   g_clear_object (&self->factory);
--  g_clear_object (&self->extract_priority);
--  g_clear_object (&self->miner_manager);
-+  g_clear_object (&self->miner_control_proxy);
- 
-   if (self->state != NULL)
-     {
-@@ -3148,8 +3063,7 @@ photos_application_get_miners_running (PhotosApplication *self)
-   return self->miners_running;
- }
- 
--
--gint
-+int
- photos_application_get_scale_factor (PhotosApplication *self)
- {
-   GList *windows;
-diff --git a/src/photos-base-item.c b/src/photos-base-item.c
-index 0d72f9c5..4ef69224 100644
---- a/src/photos-base-item.c
-+++ b/src/photos-base-item.c
-@@ -2756,6 +2756,16 @@ photos_base_item_update_info_from_type (PhotosBaseItem *self)
- }
- 
- 
-+static gdouble
-+get_double_with_default (TrackerSparqlCursor *cursor, PhotosQueryColumns column, gdouble default_value)
-+{
-+  if (tracker_sparql_cursor_is_bound (cursor, column)) {
-+    return tracker_sparql_cursor_get_double (cursor, column);
-+  } else {
-+    return default_value;
-+  }
-+}
-+
- static void
- photos_base_item_populate_from_cursor (PhotosBaseItem *self, TrackerSparqlCursor *cursor)
- {
-diff --git a/src/photos-indexing-notification.c b/src/photos-indexing-notification.c
-index 72394983..122d0d91 100644
---- a/src/photos-indexing-notification.c
-+++ b/src/photos-indexing-notification.c
-@@ -26,12 +26,13 @@
- #include <gio/gio.h>
- #include <glib.h>
- #include <glib/gi18n.h>
--#include <libtracker-control/tracker-control.h>
- 
- #include "photos-application.h"
- #include "photos-gom-miner.h"
- #include "photos-indexing-notification.h"
- #include "photos-notification-manager.h"
-+#include "photos-tracker-queue.h"
-+#include "photos-tracker-miner.h"
- 
- 
- struct _PhotosIndexingNotification
-@@ -41,7 +42,7 @@ struct _PhotosIndexingNotification
-   GtkWidget *primary_label;
-   GtkWidget *secondary_label;
-   GtkWidget *spinner;
--  TrackerMinerManager *manager;
-+  TrackerMiner *miner_fs_proxy;
-   gboolean closed;
-   gboolean on_display;
-   guint timeout_id;
-@@ -56,8 +57,6 @@ enum
-   REMOTE_MINER_TIMEOUT = 10 /* s */
- };
- 
--static const gchar *MINER_FILES = "org.gnome.Photos.Tracker1.Miner.Files";
--
- 
- static void
- photos_indexing_notification_remove_timeout (PhotosIndexingNotification *self)
-@@ -180,16 +179,18 @@ photos_indexing_notification_check_notification (PhotosIndexingNotification *sel
-   GSList *running = NULL;
-   gboolean is_indexing_local = FALSE;
-   gboolean is_indexing_remote = FALSE;
-+  GError *error = NULL;
-+  gdouble progress;
- 
--  running = tracker_miner_manager_get_running (self->manager);
--  if (g_slist_find_custom (running, (gconstpointer) MINER_FILES, (GCompareFunc) g_strcmp0) != NULL)
--    {
--      gdouble progress;
-+  tracker_miner_call_get_progress_sync (self->miner_fs_proxy, &progress, NULL, &error);
-+  if (error) {
-+    g_warning ("Couldn't get indexing progress from Tracker Miner FS: %s", error->message);
- 
--      tracker_miner_manager_get_status (self->manager, MINER_FILES, NULL, &progress, NULL);
--      if (progress < 1)
--        is_indexing_local = TRUE;
--    }
-+    g_clear_error (&error);
-+  } else {
-+    if (progress < 1)
-+      is_indexing_local = TRUE;
-+  }
- 
-   app = g_application_get_default ();
-   miners_running = photos_application_get_miners_running (PHOTOS_APPLICATION (app));
-@@ -222,7 +223,6 @@ photos_indexing_notification_dispose (GObject *object)
-   photos_indexing_notification_remove_timeout (self);
- 
-   g_clear_object (&self->ntfctn_mngr);
--  g_clear_object (&self->manager);
- 
-   G_OBJECT_CLASS (photos_indexing_notification_parent_class)->dispose (object);
- }
-@@ -240,13 +240,25 @@ photos_indexing_notification_init (PhotosIndexingNotification *self)
-   app = g_application_get_default ();
- 
-   {
-+    g_autoptr (PhotosTrackerQueue) tracker_queue;
-     g_autoptr (GError) error = NULL;
-+    const gchar *miner_fs_busname;
-+
-+    tracker_queue = photos_tracker_queue_dup_singleton (NULL, &error);
-+
-+    if (tracker_queue) {
-+      miner_fs_busname = photos_tracker_queue_get_miner_fs_busname (tracker_queue);
-+      self->miner_fs_proxy = tracker_miner_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
-+                                                                   G_DBUS_PROXY_FLAGS_NONE,
-+                                                                   miner_fs_busname,
-+                                                                   "/org/freedesktop/Tracker3/Miner/Files",
-+                                                                   NULL,
-+                                                                   &error);
-+    }
- 
--    self->manager = tracker_miner_manager_new_full (TRUE, &error);
-     if (error != NULL)
-       {
--        g_warning ("Unable to create a TrackerMinerManager, indexing progress notification won't work: %s",
--                   error->message);
-+        g_warning ("Unable to create proxy for Tracker Miner FS, indexing progress notification won't work");
-         return;
-       }
-   }
-@@ -293,10 +305,11 @@ photos_indexing_notification_init (PhotosIndexingNotification *self)
-                            self,
-                            G_CONNECT_SWAPPED);
- 
--  g_signal_connect_swapped (self->manager,
--                            "miner-progress",
--                            G_CALLBACK (photos_indexing_notification_check_notification),
--                            self);
-+  g_signal_connect_object (self->miner_fs_proxy,
-+                           "progress",
-+                           G_CALLBACK (photos_indexing_notification_check_notification),
-+                           self,
-+                           G_CONNECT_SWAPPED);
- }
- 
- 
-diff --git a/src/photos-item-manager.c b/src/photos-item-manager.c
-index 337891c1..4dfe3c7e 100644
---- a/src/photos-item-manager.c
-+++ b/src/photos-item-manager.c
-@@ -41,12 +41,9 @@
- #include "photos-query.h"
- #include "photos-search-context.h"
- #include "photos-single-item-job.h"
--#include "photos-tracker-change-event.h"
--#include "photos-tracker-change-monitor.h"
- #include "photos-tracker-queue.h"
- #include "photos-utils.h"
- 
--
- struct _PhotosItemManager
- {
-   PhotosBaseManager parent_instance;
-@@ -60,7 +57,7 @@ struct _PhotosItemManager
-   PhotosBaseItem *active_collection;
-   PhotosBaseManager **item_mngr_chldrn;
-   PhotosLoadState load_state;
--  PhotosTrackerChangeMonitor *monitor;
-+  TrackerNotifier *notifier;
-   PhotosTrackerQueue *queue;
-   PhotosWindowMode mode;
-   gboolean fullscreen;
-@@ -311,7 +308,7 @@ photos_item_manager_add_cursor_for_mode (PhotosItemManager *self,
-   g_return_if_fail (base_item_type == G_TYPE_NONE
-                     || (base_item_type != PHOTOS_TYPE_BASE_ITEM
-                         && g_type_is_a (base_item_type, PHOTOS_TYPE_BASE_ITEM)));
--  g_return_if_fail (TRACKER_SPARQL_IS_CURSOR (cursor));
-+  g_return_if_fail (TRACKER_IS_SPARQL_CURSOR (cursor));
-   g_return_if_fail (mode != PHOTOS_WINDOW_MODE_NONE);
-   g_return_if_fail (mode != PHOTOS_WINDOW_MODE_EDIT);
-   g_return_if_fail (mode != PHOTOS_WINDOW_MODE_PREVIEW);
-@@ -529,21 +526,23 @@ photos_item_manager_item_created (PhotosItemManager *self, const gchar *urn)
- 
- 
- static void
--photos_item_manager_changes_pending_foreach (gpointer key, gpointer value, gpointer user_data)
-+photos_item_manager_changes_pending_foreach (gpointer data,
-+                                             gpointer user_data)
- {
-   PhotosItemManager *self = PHOTOS_ITEM_MANAGER (user_data);
--  PhotosTrackerChangeEvent *change_event = (PhotosTrackerChangeEvent *) value;
--  PhotosTrackerChangeEventType change_type;
-+  TrackerNotifierEvent *event = (TrackerNotifierEvent *) data;
-+  TrackerNotifierEventType change_type;
-   const gchar *change_urn;
- 
--  change_type = photos_tracker_change_event_get_type (change_event);
--  change_urn = photos_tracker_change_event_get_urn (change_event);
-+  change_type = tracker_notifier_event_get_event_type (event);
-+  change_urn = tracker_notifier_event_get_urn (event);
- 
--  if (change_type == PHOTOS_TRACKER_CHANGE_EVENT_CHANGED)
-+  if (change_type == TRACKER_NOTIFIER_EVENT_UPDATE)
-     {
-       GObject *object;
- 
-       object = photos_base_manager_get_object_by_id (PHOTOS_BASE_MANAGER (self), change_urn);
-+      g_message ("UPDATE event for %s, object %p", change_urn, object);
-       if (object != NULL)
-         {
-           photos_base_item_refresh (PHOTOS_BASE_ITEM (object));
-@@ -557,15 +556,17 @@ photos_item_manager_changes_pending_foreach (gpointer key, gpointer value, gpoin
-             }
-         }
-     }
--  else if (change_type == PHOTOS_TRACKER_CHANGE_EVENT_CREATED)
-+  else if (change_type == TRACKER_NOTIFIER_EVENT_CREATE)
-     {
-+      g_message ("CREATE event for %s", change_urn);
-       photos_item_manager_item_created (self, change_urn);
-     }
--  else if (change_type == PHOTOS_TRACKER_CHANGE_EVENT_DELETED)
-+  else if (change_type == TRACKER_NOTIFIER_EVENT_DELETE)
-     {
-       GObject *object;
- 
-       object = photos_base_manager_get_object_by_id (PHOTOS_BASE_MANAGER (self), change_urn);
-+      g_message ("DELETE event for %s, object %p", change_urn, object);
-       if (object != NULL)
-         {
-           photos_base_item_destroy (PHOTOS_BASE_ITEM (object));
-@@ -577,9 +578,15 @@ photos_item_manager_changes_pending_foreach (gpointer key, gpointer value, gpoin
- 
- 
- static void
--photos_item_manager_changes_pending (PhotosItemManager *self, GHashTable *changes)
--{
--  g_hash_table_foreach (changes, photos_item_manager_changes_pending_foreach, self);
-+photos_item_manager_changes_pending (PhotosItemManager *self,
-+                                     const gchar       *service,
-+                                     const gchar       *graph,
-+                                     GPtrArray         *events,
-+                                     gpointer           user_data)
-+{
-+  if (g_str_equal (graph, TRACKER_PICTURES_GRAPH)) {
-+    g_ptr_array_foreach (events, photos_item_manager_changes_pending_foreach, self);
-+  }
- }
- 
- 
-@@ -717,7 +724,7 @@ photos_item_manager_wait_for_changes_timeout (gpointer user_data)
-       g_autoptr (PhotosQuery) query = NULL;
-       g_autofree gchar *sparql = NULL;
- 
--      sparql = g_strdup_printf ("SELECT ?urn nie:url (?urn) WHERE { ?urn nie:url '%s' }", uri);
-+      sparql = g_strdup_printf ("SELECT ?urn nie:isStoredAs (?urn) WHERE { ?urn nie:isStoredAs '%s' }", uri);
-       query = photos_query_new (NULL, sparql);
-       photos_tracker_queue_select (self->queue,
-                                    query,
-@@ -1038,7 +1045,7 @@ photos_item_manager_dispose (GObject *object)
-   g_clear_object (&self->active_object);
-   g_clear_object (&self->loader_cancellable);
-   g_clear_object (&self->active_collection);
--  g_clear_object (&self->monitor);
-+  g_clear_object (&self->notifier);
-   g_clear_object (&self->queue);
- 
-   G_OBJECT_CLASS (photos_item_manager_parent_class)->dispose (object);
-@@ -1093,20 +1100,24 @@ photos_item_manager_init (PhotosItemManager *self)
- 
-   self->mode = PHOTOS_WINDOW_MODE_NONE;
- 
--  self->monitor = photos_tracker_change_monitor_dup_singleton (NULL, NULL);
--  if (G_LIKELY (self->monitor != NULL))
--    g_signal_connect_object (self->monitor,
--                             "changes-pending",
--                             G_CALLBACK (photos_item_manager_changes_pending),
--                             self,
--                             G_CONNECT_SWAPPED);
--
-   {
-     g_autoptr (GError) error = NULL;
- 
-     self->queue = photos_tracker_queue_dup_singleton (NULL, &error);
-     if (G_UNLIKELY (error != NULL))
--      g_warning ("Unable to create PhotosTrackerQueue: %s", error->message);
-+      {
-+        g_warning ("Unable to create PhotosTrackerQueue: %s", error->message);
-+        self->notifier = NULL;
-+      }
-+    else
-+      {
-+        self->notifier = photos_tracker_queue_get_notifier (self->queue);
-+        g_signal_connect_object (self->notifier,
-+                                 "events",
-+                                 G_CALLBACK (photos_item_manager_changes_pending),
-+                                 self,
-+                                 G_CONNECT_SWAPPED);
-+      }
-   }
- 
-   self->fullscreen = FALSE;
-@@ -1241,7 +1252,7 @@ photos_item_manager_add_item (PhotosItemManager *self,
-   g_return_if_fail (base_item_type == G_TYPE_NONE
-                     || (base_item_type != PHOTOS_TYPE_BASE_ITEM
-                         && g_type_is_a (base_item_type, PHOTOS_TYPE_BASE_ITEM)));
--  g_return_if_fail (TRACKER_SPARQL_IS_CURSOR (cursor));
-+  g_return_if_fail (TRACKER_IS_SPARQL_CURSOR (cursor));
- 
-   id = tracker_sparql_cursor_get_string (cursor, PHOTOS_QUERY_COLUMNS_URN, NULL);
-   g_return_if_fail (id != NULL && id[0] != '\0');
-@@ -1370,7 +1381,7 @@ photos_item_manager_create_item (PhotosItemManager *self,
-   g_return_val_if_fail (base_item_type == G_TYPE_NONE
-                         || (base_item_type != PHOTOS_TYPE_BASE_ITEM
-                             && g_type_is_a (base_item_type, PHOTOS_TYPE_BASE_ITEM)), NULL);
--  g_return_val_if_fail (TRACKER_SPARQL_IS_CURSOR (cursor), NULL);
-+  g_return_val_if_fail (TRACKER_IS_SPARQL_CURSOR (cursor), NULL);
- 
-   id = tracker_sparql_cursor_get_string (cursor, PHOTOS_QUERY_COLUMNS_URN, NULL);
-   item = PHOTOS_BASE_ITEM (photos_base_manager_get_object_by_id (PHOTOS_BASE_MANAGER (self), id));
-diff --git a/src/photos-quarks.c b/src/photos-quarks.c
-index 0870ef62..5ee25745 100644
---- a/src/photos-quarks.c
-+++ b/src/photos-quarks.c
-@@ -25,68 +25,68 @@
- GQuark
- photos_quarks_flash_off_quark (void)
- {
--  return g_quark_from_static_string ("http://www.tracker-project.org/temp/nmm#flash-off");
-+  return g_quark_from_static_string ("http://tracker.api.gnome.org/ontology/v3/nmm#flash-off");
- }
- 
- 
- GQuark
- photos_quarks_flash_on_quark (void)
- {
--  return g_quark_from_static_string ("http://www.tracker-project.org/temp/nmm#flash-on");
-+  return g_quark_from_static_string ("http://tracker.api.gnome.org/ontology/v3/nmm#flash-on");
- }
- 
- 
- GQuark
- photos_quarks_orientation_bottom_quark (void)
- {
--  return g_quark_from_static_string ("http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#orientation-bottom");
-+  return g_quark_from_static_string ("http://tracker.api.gnome.org/ontology/v3/nfo#orientation-bottom");
- }
- 
- 
- GQuark
- photos_quarks_orientation_bottom_mirror_quark (void)
- {
--  return g_quark_from_static_string ("http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#orientation-bottom-mirror");
-+  return g_quark_from_static_string ("http://tracker.api.gnome.org/ontology/v3/nfo#orientation-bottom-mirror");
- }
- 
- 
- GQuark
- photos_quarks_orientation_left_quark (void)
- {
--  return g_quark_from_static_string ("http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#orientation-left");
-+  return g_quark_from_static_string ("http://tracker.api.gnome.org/ontology/v3/nfo#orientation-left");
- }
- 
- 
- GQuark
- photos_quarks_orientation_left_mirror_quark (void)
- {
--  return g_quark_from_static_string ("http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#orientation-left-mirror");
-+  return g_quark_from_static_string ("http://tracker.api.gnome.org/ontology/v3/nfo#orientation-left-mirror");
- }
- 
- 
- GQuark
- photos_quarks_orientation_right_quark (void)
- {
--  return g_quark_from_static_string ("http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#orientation-right");
-+  return g_quark_from_static_string ("http://tracker.api.gnome.org/ontology/v3/nfo#orientation-right");
- }
- 
- 
- GQuark
- photos_quarks_orientation_right_mirror_quark (void)
- {
--  return g_quark_from_static_string ("http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#orientation-right-mirror");
-+  return g_quark_from_static_string ("http://tracker.api.gnome.org/ontology/v3/nfo#orientation-right-mirror");
- }
- 
- 
- GQuark
- photos_quarks_orientation_top_quark (void)
- {
--  return g_quark_from_static_string ("http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#orientation-top");
-+  return g_quark_from_static_string ("http://tracker.api.gnome.org/ontology/v3/nfo#orientation-top");
- }
- 
- 
- GQuark
- photos_quarks_orientation_top_mirror_quark (void)
- {
--  return g_quark_from_static_string ("http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#orientation-top-mirror");
-+  return g_quark_from_static_string ("http://tracker.api.gnome.org/ontology/v3/nfo#orientation-top-mirror");
- }
-diff --git a/src/photos-query-builder.c b/src/photos-query-builder.c
-index 5d9d8a5a..9b1baf29 100644
---- a/src/photos-query-builder.c
-+++ b/src/photos-query-builder.c
-@@ -25,6 +25,7 @@
- 
- #include <string.h>
- 
-+#include "photos-application.h"
- #include "photos-base-manager.h"
- #include "photos-query.h"
- #include "photos-query-builder.h"
-@@ -32,6 +33,7 @@
- #include "photos-source-manager.h"
- #include "photos-search-match-manager.h"
- #include "photos-search-type-manager.h"
-+#include "photos-tracker-queue.h"
- 
- #define PHOTOS_QUERY_COLLECTIONS_IDENTIFIER "photos:collection:"
- #define PHOTOS_QUERY_LOCAL_COLLECTIONS_IDENTIFIER "photos:collection:local:"
-@@ -48,12 +50,14 @@ const gchar *photos_default_filter = \
- 
- static gchar *
- photos_query_builder_query (PhotosSearchContextState *state,
--                            gboolean global,
-+                            const gchar *values,
-                             gint flags,
-                             PhotosOffsetController *offset_cntrlr)
- {
-   PhotosSparqlTemplate *template;
--  const gchar *projection = NULL;
-+  const gchar *miner_fs_busname = NULL;
-+  const gchar *main_projection = NULL;
-+  const gchar *second_projection = NULL;
-   g_autofree gchar *item_pattern = NULL;
-   g_autofree gchar *search_filter = NULL;
-   g_autofree gchar *source_filter = NULL;
-@@ -63,29 +67,35 @@ photos_query_builder_query (PhotosSearchContextState *state,
- 
-   template = photos_base_manager_get_sparql_template (state->srch_typ_mngr, flags);
- 
--  projection = "?urn "
--               "nie:url (?urn) "
--               "nfo:fileName (?urn) "
--               "nie:mimeType (?urn) "
--               "nie:title (?urn) "
--               "tracker:coalesce (nco:fullname (?creator), nco:fullname (?publisher), '') "
--               "tracker:coalesce (nfo:fileLastModified (?urn), nie:contentLastModified (?urn)) AS ?mtime "
--               "nao:identifier (?urn) "
--               "rdf:type (?urn) "
--               "nie:dataSource(?urn) "
--               "( EXISTS { ?urn nao:hasTag nao:predefined-tag-favorite } ) "
--               "( EXISTS { ?urn nco:contributor ?contributor FILTER ( ?contributor != ?creator ) } ) "
--               "tracker:coalesce(nfo:fileCreated (?urn), nie:contentCreated (?urn)) "
--               "nfo:width (?urn) "
--               "nfo:height (?urn) "
--               "nfo:equipment (?urn) "
--               "nfo:orientation (?urn) "
--               "nmm:exposureTime (?urn) "
--               "nmm:fnumber (?urn) "
--               "nmm:focalLength (?urn) "
--               "nmm:isoSpeed (?urn) "
--               "nmm:flash (?urn) "
--               "slo:location (?urn) ";
-+  miner_fs_busname = photos_tracker_queue_get_miner_fs_busname (state->queue);
-+
-+  main_projection = "?urn "
-+                    "?file "
-+                    "nfo:fileName (?file) AS ?filename "
-+                    "nie:mimeType (?urn) AS ?mimetype "
-+                    "nie:title (?urn) AS ?title "
-+                    "tracker:coalesce (nco:fullname (?creator), nco:fullname (?publisher), '') AS ?author_name "
-+                    "tracker:coalesce (nfo:fileLastModified (?file), nie:contentLastModified (?urn)) AS ?mtime "
-+                    "nao:identifier (?urn) AS ?identifier "
-+                    "rdf:type (?urn) AS ?type "
-+                    "nie:dataSource(?urn) AS ?datasource "
-+                    "( EXISTS { ?urn nco:contributor ?contributor FILTER ( ?contributor != ?creator ) } ) AS ?has_contributor "
-+                    "tracker:coalesce(nfo:fileCreated (?file), nie:contentCreated (?urn)) AS ?ctime "
-+                    "nfo:width (?urn) AS ?width "
-+                    "nfo:height (?urn) AS ?height "
-+                    "nfo:equipment (?urn) AS ?equipment "
-+                    "nfo:orientation (?urn) AS ?orientation "
-+                    "nmm:exposureTime (?urn) AS ?exposure_time "
-+                    "nmm:fnumber (?urn) AS ?fnumber "
-+                    "nmm:focalLength (?urn) AS ?focal_length "
-+                    "nmm:isoSpeed (?urn) AS ?isospeed "
-+                    "nmm:flash (?urn) AS ?flash "
-+                    "slo:location (?urn) AS ?location ";
-+
-+  second_projection = "?urn ?file ?filename ?mimetype ?title ?author_name ?mtime ?identifier ?type ?datasource "
-+                      "( EXISTS { ?urn nao:hasTag nao:predefined-tag-favorite } ) AS ?is_favorite "
-+                      "?has_contributor ?ctime ?width ?height ?equipment ?orientation ?exposure_time ?fnumber "
-+                      "?focal_length ?isospeed ?flash ?location ";
- 
-   item_pattern = photos_base_manager_get_where (state->item_mngr, flags);
- 
-@@ -97,7 +107,7 @@ photos_query_builder_query (PhotosSearchContextState *state,
- 
-   order = "ORDER BY DESC (?mtime)";
- 
--  if (global && (flags & PHOTOS_QUERY_FLAGS_UNLIMITED) == 0)
-+  if (values == NULL && (flags & PHOTOS_QUERY_FLAGS_UNLIMITED) == 0)
-     {
-       gint offset = 0;
-       gint step = 60;
-@@ -112,12 +122,16 @@ photos_query_builder_query (PhotosSearchContextState *state,
-     }
- 
-   sparql = photos_sparql_template_get_sparql (template,
--                                              "projection", projection,
-+                                              "miner_fs_busname", miner_fs_busname,
-+                                              "main_projection", main_projection,
-+                                              "second_projection", second_projection,
-+                                              "final_projection", second_projection,
-+                                              "values", values ? values : "",
-                                               "collections_default_filter", collections_default_filter,
-                                               "item_pattern", item_pattern,
-                                               "photos_default_filter", photos_default_filter,
--                                              "source_filter", source_filter ? source_filter : "",
--                                              "search_filter", search_filter ? search_filter : "",
-+                                              "source_filter", source_filter ? source_filter : "(true)",
-+                                              "search_filter", search_filter ? search_filter : "(true)",
-                                               "order", order,
-                                               "offset_limit", offset_limit ? offset_limit : "",
-                                               NULL);
-@@ -133,6 +147,7 @@ photos_query_builder_create_collection_query (PhotosSearchContextState *state,
- {
-   GTimeVal tv;
-   PhotosQuery *query;
-+  g_autoptr (TrackerResource) collection = NULL;
-   g_autofree gchar *identifier = NULL;
-   g_autofree gchar *sparql = NULL;
-   g_autofree gchar *time = NULL;
-@@ -147,13 +162,14 @@ photos_query_builder_create_collection_query (PhotosSearchContextState *state,
-   tv.tv_usec = 0;
-   time = g_time_val_to_iso8601 (&tv);
- 
--  sparql = g_strdup_printf ("INSERT { _:res a nfo:DataContainer ; a nie:DataObject ; "
--                            "nie:contentLastModified '%s' ; "
--                            "nie:title '%s' ; "
--                            "nao:identifier '%s' }",
--                            time,
--                            name,
--                            identifier);
-+  collection = tracker_resource_new ("_:res");
-+  tracker_resource_add_uri (collection, "rdf:type", "nfo:DataContainer");
-+  tracker_resource_add_uri (collection, "rdf:type", "nie:DataObject");
-+  tracker_resource_set_string (collection, "nie:contentLastModified", time);
-+  tracker_resource_set_string (collection, "nie:title", name);
-+  tracker_resource_set_string (collection, "nao:identifier", identifier);
-+
-+  sparql = tracker_resource_print_sparql_update (collection, NULL, "tracker:Pictures");
- 
-   query = photos_query_new (state, sparql);
- 
-@@ -183,7 +199,9 @@ PhotosQuery *
- photos_query_builder_count_query (PhotosSearchContextState *state, gint flags)
- {
-   PhotosSparqlTemplate *template;
--  const gchar *projection = NULL;
-+  const gchar *miner_fs_busname = NULL;
-+  const gchar *count_projection = NULL;
-+  const gchar *value_projection = NULL;
-   g_autofree gchar *item_pattern = NULL;
-   g_autofree gchar *search_filter = NULL;
-   g_autofree gchar *source_filter = NULL;
-@@ -192,7 +210,10 @@ photos_query_builder_count_query (PhotosSearchContextState *state, gint flags)
- 
-   template = photos_base_manager_get_sparql_template (state->srch_typ_mngr, flags);
- 
--  projection = "COUNT(?urn) ";
-+  miner_fs_busname = photos_tracker_queue_get_miner_fs_busname (state->queue);
-+
-+  value_projection = "?urn ";
-+  count_projection = "COUNT(?urn) ";
- 
-   item_pattern = photos_base_manager_get_where (state->item_mngr, flags);
- 
-@@ -203,12 +224,16 @@ photos_query_builder_count_query (PhotosSearchContextState *state, gint flags)
-     }
- 
-   sparql = photos_sparql_template_get_sparql (template,
--                                              "projection", projection,
-+                                              "miner_fs_busname", miner_fs_busname,
-+                                              "main_projection", value_projection,
-+                                              "second_projection", value_projection,
-+                                              "final_projection", count_projection,
-+                                              "values", "",
-                                               "collections_default_filter", collections_default_filter,
-                                               "item_pattern", item_pattern,
-                                               "photos_default_filter", photos_default_filter,
--                                              "source_filter", source_filter ? source_filter : "",
--                                              "search_filter", search_filter ? search_filter : "",
-+                                              "source_filter", source_filter ? source_filter : "(true)",
-+                                              "search_filter", search_filter ? search_filter : "(true)",
-                                               "order", "",
-                                               "offset_limit", "",
-                                               NULL);
-@@ -267,7 +292,7 @@ photos_query_builder_fetch_collections_local (PhotosSearchContextState *state)
-   g_autofree gchar *sparql = NULL;
- 
-   sparql = photos_query_builder_query (state,
--                                       TRUE,
-+                                       NULL,
-                                        PHOTOS_QUERY_FLAGS_COLLECTIONS
-                                        | PHOTOS_QUERY_FLAGS_LOCAL
-                                        | PHOTOS_QUERY_FLAGS_UNLIMITED,
-@@ -287,7 +312,7 @@ photos_query_builder_global_query (PhotosSearchContextState *state,
-   PhotosQuery *query;
-   g_autofree gchar *sparql = NULL;
- 
--  sparql = photos_query_builder_query (state, TRUE, flags, offset_cntrlr);
-+  sparql = photos_query_builder_query (state, NULL, flags, offset_cntrlr);
-   query = photos_query_new (state, sparql);
- 
-   return query;
-@@ -316,10 +341,19 @@ photos_query_builder_set_collection_query (PhotosSearchContextState *state,
-   PhotosQuery *query;
-   g_autofree gchar *sparql = NULL;
- 
--  sparql = g_strdup_printf ("%s { <%s> nie:isPartOf <%s> }",
--                            setting ? "INSERT" : "DELETE",
--                            item_urn,
--                            collection_urn);
-+  if (setting)
-+    sparql = g_strdup_printf ("INSERT DATA { "
-+                              "  GRAPH tracker:Pictures {"
-+                              "    <%s> a nie:DataObject , nmm:Photo ; "
-+                              "      nie:isPartOf <%s> "
-+                              "  }"
-+                              "}", item_urn, collection_urn);
-+  else
-+    sparql = g_strdup_printf ("DELETE DATA { "
-+                              "  GRAPH tracker:Pictures {"
-+                              "    <%s> nie:isPartOf <%s> "
-+                              "  }"
-+                              "}", item_urn, collection_urn);
-   query = photos_query_new (state, sparql);
- 
-   return query;
-@@ -329,17 +363,14 @@ photos_query_builder_set_collection_query (PhotosSearchContextState *state,
- PhotosQuery *
- photos_query_builder_single_query (PhotosSearchContextState *state, gint flags, const gchar *resource)
- {
--  g_autoptr (GRegex) regex = NULL;
-   PhotosQuery *query;
--  g_autofree gchar *replacement = NULL;
-   g_autofree gchar *sparql = NULL;
--  g_autofree gchar *tmp = NULL;
-+  g_autofree gchar *values = NULL;
-+
-+  values = g_strdup_printf ("VALUES ?urn { <%s> }", resource);
- 
--  tmp = photos_query_builder_query (state, FALSE, flags, NULL);
-+  sparql = photos_query_builder_query (state, values, flags, NULL);
- 
--  regex = g_regex_new ("\\?urn", 0, 0, NULL);
--  replacement = g_strconcat ("<", resource, ">", NULL);
--  sparql = g_regex_replace (regex, tmp, -1, 0, replacement, 0, NULL);
-   query = photos_query_new (state, sparql);
- 
-   return query;
-@@ -360,7 +391,14 @@ photos_query_builder_update_mtime_query (PhotosSearchContextState *state, const
-   tv.tv_usec = 0;
-   time = g_time_val_to_iso8601 (&tv);
- 
--  sparql = g_strdup_printf ("INSERT OR REPLACE { <%s> nie:contentLastModified '%s' }", resource, time);
-+  sparql = g_strdup_printf ("WITH tracker:Pictures "
-+                            "DELETE { <%s> nie:contentLastModified ?time } "
-+                            "INSERT { "
-+                            "  <%s> a nmm:Photo ; "
-+                            "    nie:contentLastModified '%s' "
-+                            "}"
-+                            "WHERE { <%s> nie:contentLastModified ?time }",
-+                            resource, resource, time, resource);
-   query = photos_query_new (state, sparql);
- 
-   return query;
-diff --git a/src/photos-search-context.c b/src/photos-search-context.c
-index 4b503798..6f8694bc 100644
---- a/src/photos-search-context.c
-+++ b/src/photos-search-context.c
-@@ -31,6 +31,7 @@
- #include "photos-search-match-manager.h"
- #include "photos-search-type-manager.h"
- #include "photos-source-manager.h"
-+#include "photos-tracker-queue.h"
- 
- 
- G_DEFINE_INTERFACE (PhotosSearchContext, photos_search_context, G_TYPE_OBJECT);
-@@ -54,6 +55,7 @@ photos_search_context_state_new (PhotosSearchContext *self)
-   state->srch_cntrlr = photos_search_controller_new ();
-   state->srch_mtch_mngr = photos_search_match_manager_new (state->srch_cntrlr);
-   state->srch_typ_mngr = photos_search_type_manager_new ();
-+  state->queue = photos_tracker_queue_dup_singleton (NULL, NULL);
- 
-   return state;
- }
-@@ -68,6 +70,7 @@ photos_search_context_state_free (PhotosSearchContextState *state)
-   g_object_unref (state->srch_mtch_mngr);
-   g_object_unref (state->srch_typ_mngr);
-   g_object_unref (state->srch_cntrlr);
-+  g_clear_object (&state->queue);
-   g_slice_free (PhotosSearchContextState, state);
- }
- 
-diff --git a/src/photos-search-context.h b/src/photos-search-context.h
-index 2af6cf96..5a18d386 100644
---- a/src/photos-search-context.h
-+++ b/src/photos-search-context.h
-@@ -41,6 +41,7 @@ struct _PhotosSearchContextState
-   gpointer srch_typ_mngr;
-   gpointer offset_cntrlr;
-   gpointer srch_cntrlr;
-+  gpointer queue;
- };
- 
- PhotosSearchContextState      *photos_search_context_state_new      (PhotosSearchContext *self);
-diff --git a/src/photos-search-match-manager.c b/src/photos-search-match-manager.c
-index e6dc429a..2ba1fd0f 100644
---- a/src/photos-search-match-manager.c
-+++ b/src/photos-search-match-manager.c
-@@ -148,7 +148,7 @@ photos_search_match_manager_init (PhotosSearchMatchManager *self)
-                   "  tracker:case-fold (tracker:coalesce (nco:fullname (?creator), nco:fullname(?publisher))),"
-                   "  \"%s\")";
-   title_filter = "fn:contains ("
--                 "  tracker:case-fold (tracker:coalesce (nie:title (?urn), nfo:fileName(?urn))),"
-+                 "  tracker:case-fold (tracker:coalesce (nie:title (?urn), nfo:fileName(?file))),"
-                  "  \"%s\")";
- 
-   search_match = photos_search_match_new (PHOTOS_SEARCH_MATCH_STOCK_ALL,
-diff --git a/src/photos-source.c b/src/photos-source.c
-index db6f2de9..5219652c 100644
---- a/src/photos-source.c
-+++ b/src/photos-source.c
-@@ -62,7 +62,7 @@ G_DEFINE_TYPE_WITH_CODE (PhotosSource, photos_source, G_TYPE_OBJECT,
- DZL_DEFINE_COUNTER (instances, "PhotosSource", "Instances", "Number of PhotosSource instances")
- 
- 
--static const gchar *TRACKER_SCHEMA = "org.freedesktop.Tracker.Miner.Files";
-+static const gchar *TRACKER_SCHEMA = "org.freedesktop.Tracker3.Miner.Files";
- static const gchar *TRACKER_KEY_RECURSIVE_DIRECTORIES = "index-recursive-directories";
- 
- 
-@@ -94,7 +94,7 @@ photos_source_build_filter_local (void)
-         continue;
- 
-       tracker_uri = photos_utils_convert_path_to_uri (tracker_dirs[i]);
--      g_string_append_printf (tracker_filter, " || fn:contains (nie:url (?urn), '%s')", tracker_uri);
-+      g_string_append_printf (tracker_filter, " || fn:contains (nie:isStoredAs (?urn), '%s')", tracker_uri);
-     }
- 
-   path = g_get_user_special_dir (G_USER_DIRECTORY_DESKTOP);
-@@ -109,11 +109,11 @@ photos_source_build_filter_local (void)
-   export_path = g_build_filename (path, PHOTOS_EXPORT_SUBPATH, NULL);
-   export_uri = photos_utils_convert_path_to_uri (export_path);
- 
--  filter = g_strdup_printf ("(((fn:contains (nie:url (?urn), '%s')"
--                            "   || fn:contains (nie:url (?urn), '%s')"
--                            "   || fn:contains (nie:url (?urn), '%s')"
-+  filter = g_strdup_printf ("(((fn:contains (nie:isStoredAs (?urn), '%s')"
-+                            "   || fn:contains (nie:isStoredAs (?urn), '%s')"
-+                            "   || fn:contains (nie:isStoredAs (?urn), '%s')"
-                             "   %s)"
--                            "  && !fn:contains (nie:url (?urn), '%s'))"
-+                            "  && !fn:contains (nie:isStoredAs (?urn), '%s'))"
-                             " || fn:starts-with (nao:identifier (?urn), '%s')"
-                             " || (?urn = nfo:image-category-screenshot))",
-                             desktop_uri,
-@@ -146,7 +146,7 @@ photos_source_build_filter_resource (PhotosSource *self)
- 
-       root = g_mount_get_root (self->mount);
-       uri = g_file_get_uri (root);
--      filter = g_strdup_printf ("(fn:starts-with (nie:url (?urn), '%s'))", uri);
-+      filter = g_strdup_printf ("(fn:starts-with (nie:isStoredAs (?urn), '%s'))", uri);
-     }
-   else
-     {
-diff --git a/src/photos-tracker-change-event.c b/src/photos-tracker-change-event.c
-deleted file mode 100644
-index d5c74ebc..00000000
---- a/src/photos-tracker-change-event.c
-+++ /dev/null
-@@ -1,136 +0,0 @@
--/*
-- * Photos - access, organize and share your photos on GNOME
-- * Copyright © 2012 – 2019 Red Hat, Inc.
-- *
-- * This program is free software: you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation, either version 3 of the License, or
-- * (at your option) any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- */
--
--/* Based on code from:
-- *   + Documents
-- */
--
--
--#include "config.h"
--
--#include "photos-tracker-change-event.h"
--
--
--struct _PhotosTrackerChangeEvent
--{
--  PhotosTrackerChangeEventType type;
--  gchar *predicate;
--  gchar *urn;
--  gint32 predicate_id;
--  gint32 urn_id;
--};
--
--
--static const gchar *RDF_TYPE = "http://www.w3.org/1999/02/22-rdf-syntax-ns#type";
--
--
--void
--photos_tracker_change_event_free (PhotosTrackerChangeEvent *self)
--{
--  g_free (self->predicate);
--  g_free (self->urn);
--  g_slice_free (PhotosTrackerChangeEvent, self);
--}
--
--
--PhotosTrackerChangeEvent *
--photos_tracker_change_event_new (gint32 urn_id, gint32 predicate_id, gboolean is_delete)
--{
--  PhotosTrackerChangeEvent *self;
--
--  self = g_slice_new0 (PhotosTrackerChangeEvent);
--  self->urn_id = urn_id;
--  self->predicate_id = predicate_id;
--
--  if (is_delete)
--    self->type = PHOTOS_TRACKER_CHANGE_EVENT_DELETED;
--  else
--    self->type = PHOTOS_TRACKER_CHANGE_EVENT_CREATED;
--
--  return self;
--}
--
--
--PhotosTrackerChangeEvent *
--photos_tracker_change_event_copy (PhotosTrackerChangeEvent *event)
--{
--  PhotosTrackerChangeEvent *self;
--
--  self = g_slice_new0 (PhotosTrackerChangeEvent);
--  self->type = event->type;
--  self->predicate = g_strdup (event->predicate);
--  self->urn = g_strdup (event->urn);
--  self->predicate_id = event->predicate_id;
--  self->urn_id = event->urn_id;
--
--  return self;
--}
--
--
--PhotosTrackerChangeEventType
--photos_tracker_change_event_get_type (PhotosTrackerChangeEvent *self)
--{
--  return self->type;
--}
--
--
--gint32
--photos_tracker_change_event_get_predicate_id (PhotosTrackerChangeEvent *self)
--{
--  return self->predicate_id;
--}
--
--
--const gchar *
--photos_tracker_change_event_get_urn (PhotosTrackerChangeEvent *self)
--{
--  return self->urn;
--}
--
--
--gint32
--photos_tracker_change_event_get_urn_id (PhotosTrackerChangeEvent *self)
--{
--  return self->urn_id;
--}
--
--
--void
--photos_tracker_change_event_merge (PhotosTrackerChangeEvent *self, PhotosTrackerChangeEvent *event)
--{
--  g_return_if_fail (g_strcmp0 (self->urn, event->urn) == 0);
--
--  if (event->type == PHOTOS_TRACKER_CHANGE_EVENT_DELETED || event->type == PHOTOS_TRACKER_CHANGE_EVENT_CREATED)
--    self->type = event->type;
--}
--
--
--void
--photos_tracker_change_event_set_resolved_values (PhotosTrackerChangeEvent *self,
--                                                 const gchar *urn,
--                                                 const gchar *predicate)
--{
--  g_return_if_fail (self->predicate == NULL);
--  g_return_if_fail (self->urn == NULL);
--
--  self->urn = g_strdup (urn);
--  self->predicate = g_strdup (predicate);
--
--  if (g_strcmp0 (predicate, RDF_TYPE) != 0)
--    self->type = PHOTOS_TRACKER_CHANGE_EVENT_CHANGED;
--}
-diff --git a/src/photos-tracker-change-event.h b/src/photos-tracker-change-event.h
-deleted file mode 100644
-index eee4f40c..00000000
---- a/src/photos-tracker-change-event.h
-+++ /dev/null
-@@ -1,64 +0,0 @@
--/*
-- * Photos - access, organize and share your photos on GNOME
-- * Copyright © 2012 – 2019 Red Hat, Inc.
-- *
-- * This program is free software: you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation, either version 3 of the License, or
-- * (at your option) any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- */
--
--/* Based on code from:
-- *   + Documents
-- */
--
--#ifndef PHOTOS_TRACKER_CHANGE_EVENT_H
--#define PHOTOS_TRACKER_CHANGE_EVENT_H
--
--#include <glib.h>
--
--G_BEGIN_DECLS
--
--typedef enum
--{
--  PHOTOS_TRACKER_CHANGE_EVENT_CHANGED,
--  PHOTOS_TRACKER_CHANGE_EVENT_CREATED,
--  PHOTOS_TRACKER_CHANGE_EVENT_DELETED
--} PhotosTrackerChangeEventType;
--
--typedef struct _PhotosTrackerChangeEvent PhotosTrackerChangeEvent;
--
--PhotosTrackerChangeEvent  *photos_tracker_change_event_new        (gint32 urn_id,
--                                                                   gint32 predicate_id,
--                                                                   gboolean is_delete);
--
--PhotosTrackerChangeEvent  *photos_tracker_change_event_copy       (PhotosTrackerChangeEvent *event);
--
--void                       photos_tracker_change_event_free       (PhotosTrackerChangeEvent *self);
--
--PhotosTrackerChangeEventType photos_tracker_change_event_get_type (PhotosTrackerChangeEvent *self);
--
--gint32                     photos_tracker_change_event_get_predicate_id (PhotosTrackerChangeEvent *self);
--
--const gchar               *photos_tracker_change_event_get_urn    (PhotosTrackerChangeEvent *self);
--
--gint32                     photos_tracker_change_event_get_urn_id (PhotosTrackerChangeEvent *self);
--
--void                       photos_tracker_change_event_merge      (PhotosTrackerChangeEvent *self,
--                                                                   PhotosTrackerChangeEvent *event);
--
--void                       photos_tracker_change_event_set_resolved_values (PhotosTrackerChangeEvent *self,
--                                                                            const gchar *urn,
--                                                                            const gchar *predicate);
--
--G_END_DECLS
--
--#endif /* PHOTOS_TRACKER_CHANGE_EVENT_H */
-diff --git a/src/photos-tracker-change-monitor.c b/src/photos-tracker-change-monitor.c
-deleted file mode 100644
-index 44c9ffe7..00000000
---- a/src/photos-tracker-change-monitor.c
-+++ /dev/null
-@@ -1,468 +0,0 @@
--/*
-- * Photos - access, organize and share your photos on GNOME
-- * Copyright © 2012 – 2019 Red Hat, Inc.
-- *
-- * This program is free software: you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation, either version 3 of the License, or
-- * (at your option) any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- */
--
--/* Based on code from:
-- *   + Documents
-- */
--
--
--#include "config.h"
--
--#include <glib.h>
--#include <tracker-sparql.h>
--
--#include "photos-tracker-change-event.h"
--#include "photos-tracker-change-monitor.h"
--#include "photos-tracker-queue.h"
--#include "photos-tracker-resources.h"
--#include "photos-query.h"
--
--
--struct _PhotosTrackerChangeMonitor
--{
--  GObject parent_instance;
--  GHashTable *pending_changes;
--  GHashTable *unresolved_ids;
--  GQueue *pending_events;
--  PhotosTrackerQueue *queue;
--  TrackerResources *resource_service;
--  guint outstanding_ops;
--  guint pending_events_id;
--};
--
--enum
--{
--  CHANGES_PENDING,
--  LAST_SIGNAL
--};
--
--static guint signals[LAST_SIGNAL] = { 0 };
--
--static void photos_tracker_change_monitor_initable_iface_init (GInitableIface *iface);
--
--
--G_DEFINE_TYPE_EXTENDED (PhotosTrackerChangeMonitor, photos_tracker_change_monitor, G_TYPE_OBJECT, 0,
--                        G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, photos_tracker_change_monitor_initable_iface_init));
--
--
--enum
--{
--  CHANGE_MONITOR_TIMEOUT = 500, /* ms */
--  CHANGE_MONITOR_MAX_ITEMS = 500
--};
--
--
--typedef struct _PhotosTrackerChangeMonitorQueryData PhotosTrackerChangeMonitorQueryData;
--typedef struct _TrackerResourcesEvent TrackerResourcesEvent;
--
--struct _PhotosTrackerChangeMonitorQueryData
--{
--  PhotosTrackerChangeMonitor *self;
--  GHashTable *id_table;
--  GQueue *events;
--};
--
--struct _TrackerResourcesEvent
--{
--  gint32 graph;
--  gint32 subject;
--  gint32 predicate;
--  gint32 object;
--};
--
--
--static void
--photos_tracker_change_monitor_query_data_free (PhotosTrackerChangeMonitorQueryData *data)
--{
--  g_clear_object (&data->self);
--
--  if (data->id_table != NULL)
--    g_hash_table_unref (data->id_table);
--
--  if (data->events != NULL)
--    g_queue_free_full (data->events, (GDestroyNotify) photos_tracker_change_event_free);
--
--  g_slice_free (PhotosTrackerChangeMonitorQueryData, data);
--}
--
--
--static PhotosTrackerChangeMonitorQueryData *
--photos_tracker_change_monitor_query_data_new (PhotosTrackerChangeMonitor *self,
--                                              GHashTable *id_table,
--                                              GQueue *events)
--{
--  PhotosTrackerChangeMonitorQueryData *data;
--
--  data = g_slice_new0 (PhotosTrackerChangeMonitorQueryData);
--  data->self = g_object_ref (self);
--  data->id_table = id_table;
--  data->events = events;
--
--  return data;
--}
--
--
--static void
--photos_tracker_change_monitor_add_event (PhotosTrackerChangeMonitor *self, PhotosTrackerChangeEvent *change_event)
--{
--  PhotosTrackerChangeEvent *old_change_event;
--  const gchar *urn;
--
--  urn = photos_tracker_change_event_get_urn (change_event);
--  old_change_event = (PhotosTrackerChangeEvent *) g_hash_table_lookup (self->pending_changes, urn);
--
--  if (old_change_event != NULL)
--    photos_tracker_change_event_merge (old_change_event, change_event);
--  else
--    g_hash_table_insert (self->pending_changes, g_strdup (urn), photos_tracker_change_event_copy (change_event));
--}
--
--
--static void
--photos_tracker_change_monitor_remove_timeout (PhotosTrackerChangeMonitor *self)
--{
--  if (self->pending_events_id != 0)
--    {
--      g_source_remove (self->pending_events_id);
--      self->pending_events_id = 0;
--    }
--}
--
--
--static void
--photos_tracker_change_monitor_send_events (PhotosTrackerChangeMonitor *self, GHashTable *id_table, GQueue *events)
--{
--  GList *l;
--
--  for (l = events->head; l != NULL; l = l->next)
--    {
--      PhotosTrackerChangeEvent *change_event = (PhotosTrackerChangeEvent *) l->data;
--      const gchar *predicate;
--      const gchar *urn;
--      gint32 predicate_id;
--      gint32 urn_id;
--
--      predicate_id = photos_tracker_change_event_get_predicate_id (change_event);
--      urn_id = photos_tracker_change_event_get_urn_id (change_event);
--
--      predicate = (gchar *) g_hash_table_lookup (id_table, GINT_TO_POINTER (predicate_id));
--      if (G_UNLIKELY (predicate == NULL))
--        continue;
--
--      urn = (gchar *) g_hash_table_lookup (id_table, GINT_TO_POINTER (urn_id));
--      if (G_UNLIKELY (urn == NULL))
--        continue;
--
--      photos_tracker_change_event_set_resolved_values (change_event, urn, predicate);
--      photos_tracker_change_monitor_add_event (self, change_event);
--    }
--
--  g_signal_emit (self, signals[CHANGES_PENDING], 0, self->pending_changes);
--  g_hash_table_remove_all (self->pending_changes);
--}
--
--
--static void
--photos_tracker_change_monitor_cursor_next (GObject *source_object, GAsyncResult *res, gpointer user_data)
--{
--  PhotosTrackerChangeMonitorQueryData *data = (PhotosTrackerChangeMonitorQueryData *) user_data;
--  PhotosTrackerChangeMonitor *self = data->self;
--  TrackerSparqlCursor *cursor = TRACKER_SPARQL_CURSOR (source_object);
--  GHashTableIter iter;
--  gboolean valid;
--
--  {
--    g_autoptr (GError) error = NULL;
--
--    valid = tracker_sparql_cursor_next_finish (cursor, res, &error);
--    if (error != NULL)
--      g_warning ("Unable to resolve item URNs for graph changes: %s", error->message);
--  }
--
--  if (valid)
--    {
--      guint idx;
--
--      idx = 0;
--      g_hash_table_iter_init (&iter, data->id_table);
--      while (g_hash_table_iter_next (&iter, NULL, NULL))
--        {
--          const gchar *str;
--
--          str = tracker_sparql_cursor_get_string (cursor, idx, NULL);
--          g_hash_table_iter_replace (&iter, g_strdup (str));
--          idx++;
--        }
--
--      photos_tracker_change_monitor_send_events (self, data->id_table, data->events);
--    }
--
--  tracker_sparql_cursor_close (cursor);
--  photos_tracker_change_monitor_query_data_free (data);
--}
--
--
--static void
--photos_tracker_change_monitor_query_executed (GObject *source_object, GAsyncResult *res, gpointer user_data)
--{
--  PhotosTrackerChangeMonitorQueryData *data = (PhotosTrackerChangeMonitorQueryData *) user_data;
--  TrackerSparqlConnection *connection = TRACKER_SPARQL_CONNECTION (source_object);
--  TrackerSparqlCursor *cursor; /* TODO: Use g_autoptr */
--
--  {
--    g_autoptr (GError) error = NULL;
--
--    cursor = tracker_sparql_connection_query_finish (connection, res, &error);
--    if (error != NULL)
--      {
--        g_warning ("Unable to resolve item URNs for graph changes: %s", error->message);
--        photos_tracker_change_monitor_query_data_free (data);
--        return;
--      }
--  }
--
--  tracker_sparql_cursor_next_async (cursor, NULL, photos_tracker_change_monitor_cursor_next, data);
--  g_object_unref (cursor);
--}
--
--
--static gboolean
--photos_tracker_change_monitor_process_events (PhotosTrackerChangeMonitor *self)
--{
--  GHashTable *id_table;
--  GHashTableIter iter;
--  GQueue *events;
--  g_autoptr (GString) sparql = NULL;
--  PhotosTrackerChangeMonitorQueryData *data;
--  g_autoptr (PhotosQuery) query = NULL;
--  gpointer id;
--
--  events = self->pending_events;
--  self->pending_events = g_queue_new ();
--
--  id_table = self->unresolved_ids;
--  self->unresolved_ids = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, g_free);
--
--  self->pending_events_id = 0;
--
--  sparql = g_string_new ("SELECT");
--
--  g_hash_table_iter_init (&iter, id_table);
--  while (g_hash_table_iter_next (&iter, &id, NULL))
--    g_string_append_printf (sparql, " tracker:uri(%d)", GPOINTER_TO_INT (id));
--
--  g_string_append (sparql, " {}");
--
--  query = photos_query_new (NULL, sparql->str);
--
--  data = photos_tracker_change_monitor_query_data_new (self, id_table, events);
--  photos_tracker_queue_select (self->queue,
--                               query,
--                               NULL,
--                               photos_tracker_change_monitor_query_executed,
--                               data,
--                               NULL);
--
--  return G_SOURCE_REMOVE;
--}
--
--
--static void
--photos_tracker_change_monitor_add_pending_event (PhotosTrackerChangeMonitor *self,
--                                                 const TrackerResourcesEvent *event,
--                                                 gboolean is_delete)
--{
--  PhotosTrackerChangeEvent *change_event;
--
--  photos_tracker_change_monitor_remove_timeout (self);
--
--  g_hash_table_insert (self->unresolved_ids, GINT_TO_POINTER (event->subject), NULL);
--  g_hash_table_insert (self->unresolved_ids, GINT_TO_POINTER (event->predicate), NULL);
--
--  change_event = photos_tracker_change_event_new (event->subject, event->predicate, is_delete);
--  g_queue_push_tail (self->pending_events, change_event);
--
--  if (self->pending_events->length >= CHANGE_MONITOR_MAX_ITEMS)
--    photos_tracker_change_monitor_process_events (self);
--  else
--    self->pending_events_id = g_timeout_add (CHANGE_MONITOR_TIMEOUT,
--                                             (GSourceFunc) photos_tracker_change_monitor_process_events,
--                                             self);
--}
--
--
--static void
--photos_tracker_change_monitor_graph_updated (TrackerResources *resource_service,
--                                             const gchar *class_name,
--                                             GVariant *delete_events,
--                                             GVariant *insert_events,
--                                             gpointer user_data)
--{
--  PhotosTrackerChangeMonitor *self = PHOTOS_TRACKER_CHANGE_MONITOR (user_data);
--  const TrackerResourcesEvent *events;
--  gsize i;
--  gsize n_elements;
--
--  events = (const TrackerResourcesEvent *) g_variant_get_fixed_array (delete_events,
--                                                                      &n_elements,
--                                                                      sizeof (TrackerResourcesEvent));
--  for (i = 0; i < n_elements; i++)
--    photos_tracker_change_monitor_add_pending_event (self, &events[i], TRUE);
--
--  events = (const TrackerResourcesEvent *) g_variant_get_fixed_array (insert_events,
--                                                                      &n_elements,
--                                                                      sizeof (TrackerResourcesEvent));
--  for (i = 0; i < n_elements; i++)
--    photos_tracker_change_monitor_add_pending_event (self, &events[i], FALSE);
--}
--
--
--static GObject *
--photos_tracker_change_monitor_constructor (GType type,
--                                           guint n_construct_params,
--                                           GObjectConstructParam *construct_params)
--{
--  static GObject *self = NULL;
--
--  if (self == NULL)
--    {
--      self = G_OBJECT_CLASS (photos_tracker_change_monitor_parent_class)->constructor (type,
--                                                                                       n_construct_params,
--                                                                                       construct_params);
--      g_object_add_weak_pointer (self, (gpointer) &self);
--      return self;
--    }
--
--  return g_object_ref (self);
--}
--
--
--static void
--photos_tracker_change_monitor_dispose (GObject *object)
--{
--  PhotosTrackerChangeMonitor *self = PHOTOS_TRACKER_CHANGE_MONITOR (object);
--
--  photos_tracker_change_monitor_remove_timeout (self);
--
--  g_clear_object (&self->queue);
--  g_clear_object (&self->resource_service);
--
--  G_OBJECT_CLASS (photos_tracker_change_monitor_parent_class)->dispose (object);
--}
--
--
--static void
--photos_tracker_change_monitor_finalize (GObject *object)
--{
--  PhotosTrackerChangeMonitor *self = PHOTOS_TRACKER_CHANGE_MONITOR (object);
--
--  g_hash_table_unref (self->pending_changes);
--  g_hash_table_unref (self->unresolved_ids);
--
--  g_queue_free_full (self->pending_events, (GDestroyNotify) photos_tracker_change_event_free);
--
--  G_OBJECT_CLASS (photos_tracker_change_monitor_parent_class)->finalize (object);
--}
--
--
--static void
--photos_tracker_change_monitor_init (PhotosTrackerChangeMonitor *self)
--{
--  self->pending_changes = g_hash_table_new_full (g_str_hash,
--                                                 g_str_equal,
--                                                 g_free,
--                                                 (GDestroyNotify) photos_tracker_change_event_free);
--
--  self->unresolved_ids = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, g_free);
--
--  self->pending_events = g_queue_new ();
--}
--
--
--static void
--photos_tracker_change_monitor_class_init (PhotosTrackerChangeMonitorClass *class)
--{
--  GObjectClass *object_class = G_OBJECT_CLASS (class);
--
--  object_class->constructor = photos_tracker_change_monitor_constructor;
--  object_class->dispose = photos_tracker_change_monitor_dispose;
--  object_class->finalize = photos_tracker_change_monitor_finalize;
--
--  signals[CHANGES_PENDING] = g_signal_new ("changes-pending",
--                                           G_TYPE_FROM_CLASS (class),
--                                           G_SIGNAL_RUN_LAST,
--                                           0,
--                                           NULL, /*accumulator */
--                                           NULL, /*accu_data */
--                                           g_cclosure_marshal_VOID__BOXED,
--                                           G_TYPE_NONE,
--                                           1,
--                                           G_TYPE_HASH_TABLE);
--}
--
--
--static gboolean
--photos_tracker_change_monitor_initable_init (GInitable *initable, GCancellable *cancellable, GError **error)
--{
--  PhotosTrackerChangeMonitor *self = PHOTOS_TRACKER_CHANGE_MONITOR (initable);
--  gboolean ret_val = TRUE;
--
--  if (G_LIKELY (self->queue != NULL && self->resource_service != NULL))
--    goto out;
--
--  self->queue = photos_tracker_queue_dup_singleton (cancellable, error);
--  if (G_UNLIKELY (self->queue == NULL))
--    {
--      ret_val = FALSE;
--      goto out;
--    }
--
--  self->resource_service = tracker_resources_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
--                                                                     G_DBUS_PROXY_FLAGS_NONE,
--                                                                     "org.gnome.Photos.Tracker1",
--                                                                     "/org/freedesktop/Tracker1/Resources",
--                                                                     cancellable,
--                                                                     error);
--  if (G_UNLIKELY (self->resource_service == NULL))
--    {
--      ret_val = FALSE;
--      goto out;
--    }
--
--  g_signal_connect (self->resource_service,
--                    "graph-updated",
--                    G_CALLBACK (photos_tracker_change_monitor_graph_updated),
--                    self);
--
-- out:
--  return ret_val;
--}
--
--
--static void
--photos_tracker_change_monitor_initable_iface_init (GInitableIface *iface)
--{
--  iface->init = photos_tracker_change_monitor_initable_init;
--}
--
--
--PhotosTrackerChangeMonitor *
--photos_tracker_change_monitor_dup_singleton (GCancellable *cancellable, GError **error)
--{
--  return g_initable_new (PHOTOS_TYPE_TRACKER_CHANGE_MONITOR, cancellable, error, NULL);
--}
-diff --git a/src/photos-tracker-change-monitor.h b/src/photos-tracker-change-monitor.h
-deleted file mode 100644
-index 9740b046..00000000
---- a/src/photos-tracker-change-monitor.h
-+++ /dev/null
-@@ -1,42 +0,0 @@
--/*
-- * Photos - access, organize and share your photos on GNOME
-- * Copyright © 2012 – 2019 Red Hat, Inc.
-- *
-- * This program is free software: you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation, either version 3 of the License, or
-- * (at your option) any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- */
--
--/* Based on code from:
-- *   + Documents
-- */
--
--#ifndef PHOTOS_TRACKER_CHANGE_MONITOR_H
--#define PHOTOS_TRACKER_CHANGE_MONITOR_H
--
--#include <gio/gio.h>
--
--G_BEGIN_DECLS
--
--#define PHOTOS_TYPE_TRACKER_CHANGE_MONITOR (photos_tracker_change_monitor_get_type ())
--G_DECLARE_FINAL_TYPE (PhotosTrackerChangeMonitor,
--                      photos_tracker_change_monitor,
--                      PHOTOS,
--                      TRACKER_CHANGE_MONITOR,
--                      GObject);
--
--PhotosTrackerChangeMonitor  *photos_tracker_change_monitor_dup_singleton    (GCancellable *cancellable,
--                                                                             GError **error);
--
--G_END_DECLS
--
--#endif /* PHOTOS_TRACKER_CHANGE_MONITOR_H */
-diff --git a/src/photos-tracker-controller.c b/src/photos-tracker-controller.c
-index a02db077..6d0053a1 100644
---- a/src/photos-tracker-controller.c
-+++ b/src/photos-tracker-controller.c
-@@ -292,6 +292,12 @@ photos_tracker_controller_perform_current_query (PhotosTrackerController *self)
- 
-   priv = photos_tracker_controller_get_instance_private (self);
- 
-+  if (G_UNLIKELY (priv->queue == NULL))
-+    {
-+      photos_tracker_controller_query_error (self, priv->queue_error);
-+      goto out;
-+    }
-+
-   g_clear_object (&priv->current_query);
-   priv->current_query = PHOTOS_TRACKER_CONTROLLER_GET_CLASS (self)->get_query (self);
-   g_return_if_fail (priv->current_query != NULL);
-@@ -303,12 +309,6 @@ photos_tracker_controller_perform_current_query (PhotosTrackerController *self)
-   g_object_unref (priv->cancellable);
-   priv->cancellable = g_cancellable_new ();
- 
--  if (G_UNLIKELY (priv->queue == NULL))
--    {
--      photos_tracker_controller_query_error (self, priv->queue_error);
--      goto out;
--    }
--
-   photos_tracker_queue_select (priv->queue,
-                                priv->current_query,
-                                priv->cancellable,
-diff --git a/src/photos-tracker-extract-priority.xml b/src/photos-tracker-extract-priority.xml
-index 7e3b9b0c..2b562299 100644
---- a/src/photos-tracker-extract-priority.xml
-+++ b/src/photos-tracker-extract-priority.xml
-@@ -21,7 +21,7 @@
- -->
- 
- <node name="/" xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
--  <interface name="org.freedesktop.Tracker1.Extract.Priority">
-+  <interface name="org.freedesktop.Tracker3.Extract.Priority">
-     <method name="ClearRdfTypes" />
-     <method name="SetRdfTypes">
-       <arg name="rdf_types" type="as" direction="in" />
-diff --git a/src/photos-tracker-import-controller.c b/src/photos-tracker-import-controller.c
-index 9f130714..d7ed9b20 100644
---- a/src/photos-tracker-import-controller.c
-+++ b/src/photos-tracker-import-controller.c
-@@ -24,7 +24,6 @@
- #include "config.h"
- 
- #include <gio/gio.h>
--#include <libtracker-control/tracker-control.h>
- 
- #include "photos-base-manager.h"
- #include "photos-debug.h"
-@@ -34,6 +33,8 @@
- #include "photos-query-builder.h"
- #include "photos-search-context.h"
- #include "photos-tracker-import-controller.h"
-+#include "photos-tracker-miner-index.h"
-+#include "photos-tracker-queue.h"
- #include "photos-utils.h"
- 
- 
-@@ -45,7 +46,7 @@ struct _PhotosTrackerImportController
-   PhotosBaseManager *item_mngr;
-   PhotosBaseManager *src_mngr;
-   PhotosOffsetController *offset_cntrlr;
--  TrackerMinerManager *manager;
-+  TrackerMinerFilesIndex *miner_control_proxy;
- };
- 
- 
-@@ -76,12 +77,12 @@ static void
- photos_tracker_import_controller_index (GObject *source_object, GAsyncResult *res, gpointer user_data)
- {
-   g_autoptr (GFile) file = G_FILE (user_data);
--  TrackerMinerManager *manager = TRACKER_MINER_MANAGER (source_object);
-+  TrackerMinerFilesIndex *miner_control_proxy = TRACKER_MINER_FILES_INDEX (source_object);
- 
-   {
-     g_autoptr (GError) error = NULL;
- 
--    if (!tracker_miner_manager_index_file_for_process_finish (manager, res, &error))
-+    if (!tracker_miner_files_index_call_index_location_finish (miner_control_proxy, res, &error))
-       {
-         if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
-           {
-@@ -102,6 +103,8 @@ photos_tracker_import_controller_next_files (GObject *source_object, GAsyncResul
-   GFileEnumerator *enumerator = G_FILE_ENUMERATOR (source_object);
-   GList *infos = NULL;
-   GList *l;
-+  const gchar *tracker_priority_graphs[] = { TRACKER_PICTURES_GRAPH };
-+  const gchar *tracker_index_location_flags[] = { "for-process" };
- 
-   {
-     g_autoptr (GError) error = NULL;
-@@ -187,11 +190,13 @@ photos_tracker_import_controller_next_files (GObject *source_object, GAsyncResul
-                     if (g_content_type_equals (mime_type, IMPORTABLE_MIME_TYPES[i])
-                         || g_content_type_is_a (mime_type, IMPORTABLE_MIME_TYPES[i]))
-                       {
--                        tracker_miner_manager_index_file_for_process_async (self->manager,
--                                                                            file,
--                                                                            self->cancellable,
--                                                                            photos_tracker_import_controller_index,
--                                                                            g_object_ref (file));
-+                        tracker_miner_files_index_call_index_location (self->miner_control_proxy,
-+                                                                       uri,
-+                                                                       tracker_priority_graphs,
-+                                                                       tracker_index_location_flags,
-+                                                                       self->cancellable,
-+                                                                       photos_tracker_import_controller_index,
-+                                                                       g_object_ref (file));
-                         indexing = TRUE;
-                       }
-                   }
-@@ -291,28 +296,6 @@ photos_tracker_import_controller_source_active_changed (PhotosTrackerImportContr
-     {
-       g_return_if_fail (g_queue_is_empty (self->pending_directories));
- 
--      if (G_LIKELY (self->manager != NULL))
--        {
--          g_autoptr (GFile) root = NULL;
--          g_autofree gchar *uri = NULL;
--
--          root = g_mount_get_root (mount);
--          g_queue_push_tail (self->pending_directories, g_object_ref (root));
--
--          uri = g_file_get_uri (root);
--          photos_debug (PHOTOS_DEBUG_IMPORT, "Enumerating device directory %s", uri);
--
--          g_file_enumerate_children_async (root,
--                                           G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE","
--                                           G_FILE_ATTRIBUTE_STANDARD_NAME","
--                                           G_FILE_ATTRIBUTE_STANDARD_TYPE,
--                                           G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
--                                           G_PRIORITY_DEFAULT,
--                                           self->cancellable,
--                                           photos_tracker_import_controller_enumerate_children,
--                                           self);
--        }
--
-       photos_tracker_controller_refresh_for_object (PHOTOS_TRACKER_CONTROLLER (self));
-     }
- }
-@@ -379,7 +362,6 @@ photos_tracker_import_controller_dispose (GObject *object)
- 
-   g_clear_object (&self->src_mngr);
-   g_clear_object (&self->offset_cntrlr);
--  g_clear_object (&self->manager);
- 
-   G_OBJECT_CLASS (photos_tracker_import_controller_parent_class)->dispose (object);
- }
-@@ -397,6 +379,37 @@ photos_tracker_import_controller_finalize (GObject *object)
- }
- 
- 
-+static TrackerMinerFilesIndex *
-+photos_tracker_import_controller_get_miner_fs_control_proxy (GCancellable *cancellable)
-+{
-+  g_autoptr (PhotosTrackerQueue) tracker_queue = NULL;
-+  const gchar *miner_fs_control_busname;
-+  g_autoptr (GError) error = NULL;
-+  TrackerMinerFilesIndex *miner_control_proxy;
-+
-+  tracker_queue = photos_tracker_queue_dup_singleton (cancellable, &error);
-+
-+  if (!tracker_queue) {
-+    g_warning ("Error getting Tracker queue: %s. Import will not work.", error->message);
-+    return NULL;
-+  }
-+
-+  miner_fs_control_busname = photos_tracker_queue_get_miner_fs_control_busname (tracker_queue);
-+  miner_control_proxy = tracker_miner_files_index_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
-+                                                                          G_DBUS_PROXY_FLAGS_NONE,
-+                                                                          miner_fs_control_busname,
-+                                                                          "/org/freedesktop/Tracker3/Miner/Files/Control",
-+                                                                          NULL,
-+                                                                          &error);
-+  if (!miner_control_proxy) {
-+    g_warning ("Error getting Tracker Miner FS control proxy: %s. Import will not work", error->message);
-+    return NULL;
-+  }
-+
-+  return miner_control_proxy;
-+}
-+
-+
- static void
- photos_tracker_import_controller_init (PhotosTrackerImportController *self)
- {
-@@ -421,13 +434,7 @@ photos_tracker_import_controller_init (PhotosTrackerImportController *self)
- 
-   self->offset_cntrlr = photos_offset_import_controller_dup_singleton ();
- 
--  {
--    g_autoptr (GError) error = NULL;
--
--    self->manager = tracker_miner_manager_new_full (TRUE, &error);
--    if (error != NULL)
--      g_warning ("Unable to create a TrackerMinerManager, indexing attached devices won't work: %s", error->message);
--  }
-+  self->miner_control_proxy = photos_tracker_import_controller_get_miner_fs_control_proxy (NULL);
- }
- 
- 
-diff --git a/src/photos-tracker-queue.c b/src/photos-tracker-queue.c
-index 76d25d5d..a5f4c91a 100644
---- a/src/photos-tracker-queue.c
-+++ b/src/photos-tracker-queue.c
-@@ -37,9 +37,20 @@ struct _PhotosTrackerQueue
-   GObject parent_instance;
-   GError *initialization_error;
-   GQueue *queue;
--  TrackerSparqlConnection *connection;
-+  TrackerSparqlConnection *local_connection;
-+  TrackerSparqlConnection *miner_fs_connection;
-   gboolean is_initialized;
-   gboolean running;
-+  gboolean miner_fs_ready;
-+  const gchar *miner_fs_busname;
-+  const gchar *miner_fs_control_busname;
-+};
-+
-+enum
-+{
-+  PROP_0,
-+  PROP_MINER_FS_READY,
-+  PROP_MINER_FS_BUSNAME
- };
- 
- static void photos_tracker_queue_initable_iface_init (GInitableIface *iface);
-@@ -90,7 +101,6 @@ photos_tracker_queue_data_free (PhotosTrackerQueueData *data)
- 
- G_DEFINE_AUTOPTR_CLEANUP_FUNC (PhotosTrackerQueueData, photos_tracker_queue_data_free);
- 
--
- static PhotosTrackerQueueData *
- photos_tracker_queue_data_new (PhotosQuery *query,
-                                PhotosTrackerQueryType query_type,
-@@ -179,7 +189,7 @@ photos_tracker_queue_check (PhotosTrackerQueue *self)
-   switch (data->query_type)
-     {
-     case PHOTOS_TRACKER_QUERY_SELECT:
--      tracker_sparql_connection_query_async (self->connection,
-+      tracker_sparql_connection_query_async (self->local_connection,
-                                              sparql,
-                                              data->cancellable,
-                                              photos_tracker_queue_collector,
-@@ -187,18 +197,16 @@ photos_tracker_queue_check (PhotosTrackerQueue *self)
-       break;
- 
-     case PHOTOS_TRACKER_QUERY_UPDATE:
--      tracker_sparql_connection_update_async (self->connection,
-+      tracker_sparql_connection_update_async (self->local_connection,
-                                               sparql,
--                                              G_PRIORITY_DEFAULT,
-                                               data->cancellable,
-                                               photos_tracker_queue_collector,
-                                               g_object_ref (self));
-       break;
- 
-     case PHOTOS_TRACKER_QUERY_UPDATE_BLANK:
--      tracker_sparql_connection_update_blank_async (self->connection,
-+      tracker_sparql_connection_update_blank_async (self->local_connection,
-                                                     sparql,
--                                                    G_PRIORITY_DEFAULT,
-                                                     data->cancellable,
-                                                     photos_tracker_queue_collector,
-                                                     g_object_ref (self));
-@@ -211,6 +219,53 @@ photos_tracker_queue_check (PhotosTrackerQueue *self)
- }
- 
- 
-+static gboolean
-+photos_tracker_queue_start_session_miner_fs (PhotosTrackerQueue *self, GError **error)
-+{
-+  const gchar *busname = "org.freedesktop.Tracker3.Miner.Files";
-+  const gchar *control_busname = "org.freedesktop.Tracker3.Miner.Files.Control";
-+
-+  photos_debug (PHOTOS_DEBUG_TRACKER, "Connecting to %s", busname);
-+  self->miner_fs_connection = tracker_sparql_connection_bus_new (busname, NULL, NULL, error);
-+  if (*error)
-+    {
-+      g_warning ("Unable to create connection for session-wide Tracker indexer at %s: %s", busname, (*error)->message);
-+      return FALSE;
-+    }
-+
-+  self->miner_fs_busname = busname;
-+  self->miner_fs_control_busname = control_busname;
-+
-+  return TRUE;
-+}
-+
-+
-+static gboolean
-+photos_tracker_queue_start_local_miner_fs (PhotosTrackerQueue *self, GError **error)
-+{
-+  const gchar *busname = "org.gnome.Photos.Tracker3.Miner.Files";
-+  const gchar *control_busname = "org.gnome.Photos.Tracker3.Miner.Files.Control";
-+
-+  photos_debug (PHOTOS_DEBUG_TRACKER, "Connecting to %s", busname);
-+  self->miner_fs_connection = tracker_sparql_connection_bus_new (busname, NULL, NULL, error);
-+  if (*error)
-+    {
-+      g_critical ("Could not start local Tracker indexer at %s: %s", busname, (*error)->message);
-+      return FALSE;
-+    }
-+
-+  self->miner_fs_busname = busname;
-+  self->miner_fs_control_busname = control_busname;
-+
-+  return TRUE;
-+}
-+
-+static gboolean
-+inside_flatpak (void)
-+{
-+    return g_file_test ("/.flatpak-info", G_FILE_TEST_EXISTS);
-+}
-+
- static GObject *
- photos_tracker_queue_constructor (GType type, guint n_construct_params, GObjectConstructParam *construct_params)
- {
-@@ -234,7 +289,8 @@ photos_tracker_queue_dispose (GObject *object)
- {
-   PhotosTrackerQueue *self = PHOTOS_TRACKER_QUEUE (object);
- 
--  g_clear_object (&self->connection);
-+  g_clear_object (&self->local_connection);
-+  g_clear_object (&self->miner_fs_connection);
- 
-   G_OBJECT_CLASS (photos_tracker_queue_parent_class)->dispose (object);
- }
-@@ -258,6 +314,38 @@ photos_tracker_queue_init (PhotosTrackerQueue *self)
-   self->queue = g_queue_new ();
- }
- 
-+static void
-+photos_tracker_queue_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
-+{
-+  PhotosTrackerQueue *self = PHOTOS_TRACKER_QUEUE (object);
-+
-+  switch (prop_id)
-+    {
-+    case PROP_MINER_FS_READY:
-+      g_value_set_boolean (value, self->miner_fs_ready);
-+      break;
-+
-+    case PROP_MINER_FS_BUSNAME:
-+      g_value_set_string (value, self->miner_fs_busname);
-+      break;
-+
-+    default:
-+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-+      break;
-+    }
-+}
-+
-+static void
-+photos_tracker_queue_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
-+{
-+  switch (prop_id)
-+    {
-+    /* All properties are read only */
-+    default:
-+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-+      break;
-+    }
-+}
- 
- static void
- photos_tracker_queue_class_init (PhotosTrackerQueueClass *class)
-@@ -267,6 +355,24 @@ photos_tracker_queue_class_init (PhotosTrackerQueueClass *class)
-   object_class->constructor = photos_tracker_queue_constructor;
-   object_class->dispose = photos_tracker_queue_dispose;
-   object_class->finalize = photos_tracker_queue_finalize;
-+  object_class->get_property = photos_tracker_queue_get_property;
-+  object_class->set_property = photos_tracker_queue_set_property;
-+
-+  g_object_class_install_property (object_class,
-+                                   PROP_MINER_FS_READY,
-+                                   g_param_spec_boolean ("tracker-miner-fs-ready",
-+                                                         "Tracker Miner FS ready",
-+                                                         "TRUE if it is possible to query Tracker indexer",
-+                                                         FALSE,
-+                                                         G_PARAM_READABLE));
-+
-+  g_object_class_install_property (object_class,
-+                                   PROP_MINER_FS_BUSNAME,
-+                                   g_param_spec_string ("tracker-miner-fs-busname",
-+                                                        "Tracker Miner FS busname",
-+                                                        "D-Bus name of the Tracker indexer daemon",
-+                                                        "",
-+                                                        G_PARAM_READABLE));
- }
- 
- 
-@@ -274,13 +380,16 @@ static gboolean
- photos_tracker_queue_initable_init (GInitable *initable, GCancellable *cancellable, GError **error)
- {
-   PhotosTrackerQueue *self = PHOTOS_TRACKER_QUEUE (initable);
-+  TrackerSparqlConnectionFlags tracker_flags;
-+  g_autoptr (GFile) store = NULL;
-   gboolean ret_val = FALSE;
-+  gboolean miner_ok = FALSE;
- 
-   G_LOCK (init_lock);
- 
-   if (self->is_initialized)
-     {
--      if (self->connection != NULL)
-+      if (self->local_connection != NULL && self->miner_fs_connection != NULL)
-         ret_val = TRUE;
-       else
-         g_assert_nonnull (self->initialization_error);
-@@ -290,13 +399,49 @@ photos_tracker_queue_initable_init (GInitable *initable, GCancellable *cancellab
- 
-   g_assert_no_error (self->initialization_error);
- 
--  tracker_sparql_connection_set_domain ("org.gnome.Photos");
-+  /* Connect to the local database which stores user data.
-+   *
-+   * Same flags that tracker-miner-fs uses by default. See:
-+   * https://gitlab.gnome.org/GNOME/tracker-miners/-/blob/master/src/miners/fs/tracker-main.c#L735 and
-+   * https://gitlab.gnome.org/GNOME/tracker-miners/-/blob/master/data/org.freedesktop.Tracker.FTS.gschema.xml */
-+  tracker_flags = TRACKER_SPARQL_CONNECTION_FLAGS_FTS_ENABLE_UNACCENT |
-+                  TRACKER_SPARQL_CONNECTION_FLAGS_FTS_ENABLE_STOP_WORDS |
-+                  TRACKER_SPARQL_CONNECTION_FLAGS_FTS_IGNORE_NUMBERS;
-+
-+  store = g_file_new_build_filename (g_get_user_data_dir (), "gnome-photos", NULL);
-+
-+  photos_debug (PHOTOS_DEBUG_TRACKER, "Opening local database at %s", g_file_peek_path (store));
-+  self->local_connection = tracker_sparql_connection_new (tracker_flags,
-+                                                          store,
-+                                                          tracker_sparql_get_ontology_nepomuk (),
-+                                                          cancellable,
-+                                                          &self->initialization_error);
- 
--  self->connection = tracker_sparql_connection_get (cancellable, &self->initialization_error);
-   if (G_UNLIKELY (self->initialization_error != NULL))
-     goto out;
- 
--  ret_val = TRUE;
-+  /* Connect to filesystem indexer. */
-+  miner_ok = photos_tracker_queue_start_session_miner_fs (self, &self->initialization_error);
-+
-+  if (!miner_ok && inside_flatpak ())
-+    {
-+      g_clear_error (&self->initialization_error);
-+      miner_ok = photos_tracker_queue_start_local_miner_fs (self, &self->initialization_error);
-+    }
-+
-+  if (miner_ok)
-+    {
-+      photos_debug (PHOTOS_DEBUG_TRACKER, "Using %s as tracker-miner-fs", self->miner_fs_busname);
-+      ret_val = TRUE;
-+    }
-+  else
-+    {
-+      photos_debug (PHOTOS_DEBUG_TRACKER, "Initialization failed due to %s", self->initialization_error->message);
-+      g_clear_object (&self->miner_fs_connection);
-+      g_clear_object (&self->local_connection);
-+      ret_val = FALSE;
-+    }
-+
- 
-  out:
-   self->is_initialized = TRUE;
-@@ -321,10 +466,44 @@ photos_tracker_queue_initable_iface_init (GInitableIface *iface)
- PhotosTrackerQueue *
- photos_tracker_queue_dup_singleton (GCancellable *cancellable, GError **error)
- {
-+  GObject *singleton;
-+
-   g_return_val_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable), NULL);
-   g_return_val_if_fail (error == NULL || *error == NULL, NULL);
- 
--  return g_initable_new (PHOTOS_TYPE_TRACKER_QUEUE, cancellable, error, NULL);
-+  singleton = g_object_new (PHOTOS_TYPE_TRACKER_QUEUE, NULL);
-+
-+  if (g_initable_init (G_INITABLE (singleton), cancellable, error))
-+      return PHOTOS_TRACKER_QUEUE (singleton);
-+
-+  /* On error we deliberately don't unref the object so that we won't try
-+   * and re-initialize Tracker when called again.
-+   */
-+  return NULL;
-+}
-+
-+
-+const gchar *
-+photos_tracker_queue_get_miner_fs_busname (PhotosTrackerQueue *self)
-+{
-+  return self->miner_fs_busname;
-+}
-+
-+
-+const gchar *
-+photos_tracker_queue_get_miner_fs_control_busname (PhotosTrackerQueue *self)
-+{
-+  return self->miner_fs_control_busname;
-+}
-+
-+
-+TrackerNotifier *
-+photos_tracker_queue_get_notifier (PhotosTrackerQueue *self)
-+{
-+  /* We want notifications on filesystem changes, we don't need them for the
-+   * local database which we manage ourselves.
-+   */
-+  return tracker_sparql_connection_create_notifier (self->miner_fs_connection);
- }
- 
- 
-@@ -353,6 +532,7 @@ photos_tracker_queue_select (PhotosTrackerQueue *self,
- }
- 
- 
-+
- void
- photos_tracker_queue_update (PhotosTrackerQueue *self,
-                              PhotosQuery *query,
-diff --git a/src/photos-tracker-queue.h b/src/photos-tracker-queue.h
-index 93d97306..6e31ecf6 100644
---- a/src/photos-tracker-queue.h
-+++ b/src/photos-tracker-queue.h
-@@ -24,16 +24,23 @@
- #define PHOTOS_TRACKER_QUEUE_H
- 
- #include <gio/gio.h>
-+#include <libtracker-sparql/tracker-sparql.h>
- 
- #include "photos-query.h"
- 
- G_BEGIN_DECLS
- 
-+#define TRACKER_PICTURES_GRAPH "http://tracker.api.gnome.org/ontology/v3/tracker#Pictures"
-+
- #define PHOTOS_TYPE_TRACKER_QUEUE (photos_tracker_queue_get_type ())
- G_DECLARE_FINAL_TYPE (PhotosTrackerQueue, photos_tracker_queue, PHOTOS, TRACKER_QUEUE, GObject);
- 
- PhotosTrackerQueue    *photos_tracker_queue_dup_singleton          (GCancellable *cancellable, GError **error);
- 
-+const gchar *          photos_tracker_queue_get_miner_fs_busname         (PhotosTrackerQueue *self);
-+const gchar *          photos_tracker_queue_get_miner_fs_control_busname (PhotosTrackerQueue *self);
-+TrackerNotifier *      photos_tracker_queue_get_notifier                 (PhotosTrackerQueue *self);
-+
- void                   photos_tracker_queue_select                 (PhotosTrackerQueue *self,
-                                                                     PhotosQuery *query,
-                                                                     GCancellable *cancellable,
-diff --git a/src/photos-tracker-resources.xml b/src/photos-tracker-resources.xml
-deleted file mode 100644
-index 18177aa0..00000000
---- a/src/photos-tracker-resources.xml
-+++ /dev/null
-@@ -1,31 +0,0 @@
--<!DOCTYPE node PUBLIC
--"-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
--"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
--
--<!--
-- Photos - access, organize and share your photos on GNOME
-- Copyright © 2012 – 2019 Red Hat, Inc.
--
-- This program is free software: you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
-- the Free Software Foundation, either version 3 of the License, or
-- (at your option) any later version.
--
-- This program is distributed in the hope that it will be useful,
-- but WITHOUT ANY WARRANTY; without even the implied warranty of
-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- GNU General Public License for more details.
--
-- You should have received a copy of the GNU General Public License
-- along with this program.  If not, see <http://www.gnu.org/licenses/>.
---->
--
--<node name="/" xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
--  <interface name="org.freedesktop.Tracker1.Resources">
--    <signal name="GraphUpdated">
--      <arg name="className" type="s" />
--      <arg name="deleteEvents" type="a(iiii)" />
--      <arg name="insertEvents" type="a(iiii)" />
--    </signal>
--  </interface>
--</node>
-diff --git a/src/photos-utils.c b/src/photos-utils.c
-index d659b47d..72d2e98b 100644
---- a/src/photos-utils.c
-+++ b/src/photos-utils.c
-@@ -1324,7 +1324,13 @@ photos_utils_set_edited_name (const gchar *urn, const gchar *title)
-   g_autoptr (PhotosTrackerQueue) queue = NULL;
-   g_autofree gchar *sparql = NULL;
- 
--  sparql = g_strdup_printf ("INSERT OR REPLACE { <%s> nie:title \"%s\" }", urn, title);
-+  sparql = g_strdup_printf ("WITH tracker:Pictures "
-+                            "DELETE { <%s> nie:title ?title } "
-+                            "INSERT { "
-+                            "  <%s> a nmm:Photo ; "
-+                            "    nie:title \"%s\" . "
-+                            "}"
-+                            "WHERE { <%s> nie:title ?title }", urn, urn, title, urn);
-   query = photos_query_new (NULL, sparql);
- 
-   {
-@@ -1352,9 +1358,19 @@ photos_utils_set_favorite (const gchar *urn, gboolean is_favorite)
-   g_autoptr (PhotosTrackerQueue) queue = NULL;
-   g_autofree gchar *sparql = NULL;
- 
--  sparql = g_strdup_printf ("%s { <%s> nao:hasTag nao:predefined-tag-favorite }",
--                            (is_favorite) ? "INSERT OR REPLACE" : "DELETE",
--                            urn);
-+  if (is_favorite)
-+    sparql = g_strdup_printf ("INSERT DATA { "
-+                              "  GRAPH tracker:Pictures {"
-+                              "    <%s> a nmm:Photo ; "
-+                              "      nao:hasTag nao:predefined-tag-favorite "
-+                              "  } "
-+                              "}", urn);
-+  else
-+    sparql = g_strdup_printf ("DELETE DATA {"
-+                              "  GRAPH tracker:Pictures {"
-+                              "    <%s> nao:hasTag nao:predefined-tag-favorite "
-+                              "  } "
-+                              "}", urn);
-   query = photos_query_new (NULL, sparql);
- 
-   {
-diff --git a/src/photos-utils.h b/src/photos-utils.h
-index a4d69abf..57069892 100644
---- a/src/photos-utils.h
-+++ b/src/photos-utils.h
-@@ -46,7 +46,7 @@ G_BEGIN_DECLS
- #define PHOTOS_TRACKER_CONTROLLER_EXTENSION_POINT_NAME "photos-tracker-controller"
- 
- #define PHOTOS_COLLECTION_SCREENSHOT \
--  "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#image-category-screenshot"
-+  "http://tracker.api.gnome.org/ontology/v3/nfo#image-category-screenshot"
- #define PHOTOS_EXPORT_SUBPATH "Exports"
- 
- typedef enum
-diff --git a/src/queries/all.sparql.template b/src/queries/all.sparql.template
-index 1cef98e8..14e08027 100644
---- a/src/queries/all.sparql.template
-+++ b/src/queries/all.sparql.template
-@@ -1,30 +1,42 @@
--SELECT {{projection}}
-+SELECT {{final_projection}}
-+FROM NAMED tracker:Pictures
- {
-     {
--        SELECT {{projection}}
-+        SELECT {{main_projection}}
-         {
-             {
-                 SELECT ?urn COUNT(?item) AS ?count
-                 {
-+                    {{values}}
-+                    VALUES (?file ?filename ?creator ?publisher) { ("" "" "" "") }
-                     ?urn a nfo:DataContainer.
--                    ?item a nmm:Photo; nie:isPartOf ?urn.
--                } GROUP BY ?urn
-+                    ?item a nmm:Photo ;
-+                       nie:isPartOf ?urn .
-+                    {{item_pattern}}
-+                }
-+                GROUP BY ?urn
-             }
-             FILTER (?count > 0 && {{collections_default_filter}} && {{search_filter}})
-         }
--        GROUP BY ?urn
-     }
-     UNION
-     {
--        SELECT {{projection}}
-+        SELECT {{second_projection}}
-         {
--            ?urn a nmm:Photo .
--            OPTIONAL { ?urn nco:creator ?creator . }
--            OPTIONAL { ?urn nco:publisher ?publisher . }
-             {{item_pattern}}
--            FILTER ({{photos_default_filter}} && {{source_filter}} && {{search_filter}})
-+            SERVICE <dbus:{{miner_fs_busname}}>
-+            {
-+                SELECT {{main_projection}}
-+                {
-+                    {{values}}
-+                    ?urn a nmm:Photo ;
-+                        nie:isStoredAs ?file .
-+                    OPTIONAL { ?urn nco:creator ?creator . }
-+                    OPTIONAL { ?urn nco:publisher ?publisher . }
-+                    FILTER ({{photos_default_filter}} && {{source_filter}} && {{search_filter}})
-+                }
-+            }
-         }
--        GROUP BY ?urn
-     }
- }
- {{order}}
-diff --git a/src/queries/collections.sparql.template b/src/queries/collections.sparql.template
-index 20b35cd6..4dfb345a 100644
---- a/src/queries/collections.sparql.template
-+++ b/src/queries/collections.sparql.template
-@@ -1,14 +1,20 @@
--SELECT {{projection}}
-+SELECT {{final_projection}}
- {
-+    SELECT {{main_projection}}
-     {
--        SELECT ?urn COUNT(?item) AS ?count
-         {
--            ?urn a nfo:DataContainer.
--            ?item a nmm:Photo; nie:isPartOf ?urn.
--        } GROUP BY ?urn
-+            SELECT ?urn COUNT(?item) AS ?count
-+            {
-+                {{values}}
-+                VALUES (?file ?filename ?creator ?publisher) { ("" "" "" "") }
-+                ?urn a nfo:DataContainer .
-+                ?item a nmm:Photo ;
-+                   nie:isPartOf ?urn .
-+            }
-+            GROUP BY ?urn
-+        }
-+        FILTER (?count > 0 && {{collections_default_filter}} && {{search_filter}})
-     }
--    FILTER (?count > 0 && {{collections_default_filter}} && {{search_filter}})
- }
--GROUP BY ?urn
- {{order}}
- {{offset_limit}}
-diff --git a/src/queries/favorite-photos.sparql.template b/src/queries/favorite-photos.sparql.template
-index 0885a08a..9a0d7806 100644
---- a/src/queries/favorite-photos.sparql.template
-+++ b/src/queries/favorite-photos.sparql.template
-@@ -1,12 +1,20 @@
--SELECT {{projection}}
-+SELECT {{final_projection}}
-+FROM tracker:Pictures
- {
-     ?urn a nmm:Photo .
-     ?urn a nmm:Photo; nao:hasTag nao:predefined-tag-favorite .
--    OPTIONAL { ?urn nco:creator ?creator . }
--    OPTIONAL { ?urn nco:publisher ?publisher . }
--    {{item_pattern}}
--    FILTER ({{photos_default_filter}} && {{source_filter}} && {{search_filter}})
-+    SERVICE <dbus:{{miner_fs_busname}}>
-+    {
-+        SELECT {{main_projection}}
-+        {
-+            ?urn a nmm:Photo ;
-+                nie:isStoredAs ?file .
-+            OPTIONAL { ?urn nco:creator ?creator . }
-+            OPTIONAL { ?urn nco:publisher ?publisher . }
-+            {{item_pattern}}
-+            FILTER ({{photos_default_filter}} && {{source_filter}} && {{search_filter}})
-+        }
-+    }
- }
--GROUP BY ?urn
- {{order}}
- {{offset_limit}}
-diff --git a/src/queries/photos.sparql.template b/src/queries/photos.sparql.template
-index 4eb10b74..6ade35e2 100644
---- a/src/queries/photos.sparql.template
-+++ b/src/queries/photos.sparql.template
-@@ -1,11 +1,19 @@
--SELECT {{projection}}
-+SELECT {{final_projection}}
-+FROM tracker:Pictures
- {
--    ?urn a nmm:Photo .
--    OPTIONAL { ?urn nco:creator ?creator . }
--    OPTIONAL { ?urn nco:publisher ?publisher . }
--    {{item_pattern}}
--    FILTER ({{photos_default_filter}} && {{source_filter}} && {{search_filter}})
-+    SERVICE <dbus:{{miner_fs_busname}}>
-+    {
-+        SELECT {{main_projection}}
-+        {
-+            {{values}}
-+            ?urn a nmm:Photo ;
-+                nie:isStoredAs ?file .
-+            OPTIONAL { ?urn nco:creator ?creator . }
-+            OPTIONAL { ?urn nco:publisher ?publisher . }
-+            {{item_pattern}}
-+            FILTER ({{photos_default_filter}} && {{source_filter}} && {{search_filter}})
-+        }
-+    }
- }
--GROUP BY ?urn
- {{order}}
- {{offset_limit}}
--- 
-GitLab
-
diff --git a/srcpkgs/gnome-photos/template b/srcpkgs/gnome-photos/template
index ca3f4be7162e..fee19723ed89 100644
--- a/srcpkgs/gnome-photos/template
+++ b/srcpkgs/gnome-photos/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-photos'
 pkgname=gnome-photos
-version=3.38.0
+version=40.0
 revision=1
 build_helper="gir"
 build_style=meson
@@ -9,15 +9,14 @@ hostmakedepends="pkg-config gettext itstool glib-devel gdk-pixbuf librsvg"
 makedepends="gtk+3-devel babl-devel exempi-devel lcms2-devel
  gfbgraph-devel tracker3-devel libexif-devel librsvg-devel grilo-devel
  libgexiv2-devel gnome-online-accounts-devel gnome-desktop-devel libgdata-devel
- geocode-glib-devel libdazzle-devel gegl-devel"
+ geocode-glib-devel libdazzle-devel gegl-devel libhandy1-devel"
 depends="desktop-file-utils tracker3 tracker3-miners"
 short_desc="Access, organize, and share your photos on GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Photos"
 distfiles="${GNOME_SITE}/gnome-photos/${version%.*}/gnome-photos-${version}.tar.xz"
-checksum=667f39477579d577470740e01f37b05c62e461e6f6da6377724d8f3993e1c4c4
-patch_args="-Np1"
+checksum=e02d73e138af8b2868b5cad7faa1bdd278aeade3b6c3c92836511a4e6f3af1af
 
 build_options="gir"
 build_options_default="gir"

From 0bc33ecfdcda3ca07b1b56c61a36ad44854e4d97 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Fri, 16 Apr 2021 12:14:41 +0200
Subject: [PATCH 1725/2024] New package: mpdevil-1.2.0

---
 srcpkgs/mpdevil/template | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/mpdevil/template

diff --git a/srcpkgs/mpdevil/template b/srcpkgs/mpdevil/template
new file mode 100644
index 000000000000..588d0f45f385
--- /dev/null
+++ b/srcpkgs/mpdevil/template
@@ -0,0 +1,13 @@
+# Template file for 'mpdevil'
+pkgname=mpdevil
+version=1.2.0
+revision=1
+build_style=python3-module
+hostmakedepends="python3-BeautifulSoup4 python3-mpd2 python3-requests python3-gobject intltool python3-distutils-extra"
+depends="python3-BeautifulSoup4 python3-mpd2 python3-requests python3-gobject"
+short_desc="Simple music browser for MPD"
+maintainer="Paper <paper@tilde.institute>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/SoongNoonien/mpdevil/"
+distfiles="https://github.com/SoongNoonien/mpdevil/archive/refs/tags/v$version.tar.gz"
+checksum=a0a6528fd832894c24fa75e4f20c61823d98120321a71e6ec9e14793ee2e5ae2

From a913252b373681e7ee713f7adb198b98a46280e7 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Tue, 20 Apr 2021 18:20:02 +0300
Subject: [PATCH 1726/2024] snapper: update to 0.9.0; adopt

---
 .../patches/0001-disable-locale-tests.patch   |  29 ++--
 .../0002-backport-equal-date-test.patch       | 164 ------------------
 .../patches/0002-fix-32bit-musl-build.patch   |  13 ++
 .../0003-backport-fix-jsonc-linkage.patch     |  19 --
 srcpkgs/snapper/template                      |   6 +-
 5 files changed, 35 insertions(+), 196 deletions(-)
 delete mode 100644 srcpkgs/snapper/patches/0002-backport-equal-date-test.patch
 create mode 100644 srcpkgs/snapper/patches/0002-fix-32bit-musl-build.patch
 delete mode 100644 srcpkgs/snapper/patches/0003-backport-fix-jsonc-linkage.patch

diff --git a/srcpkgs/snapper/patches/0001-disable-locale-tests.patch b/srcpkgs/snapper/patches/0001-disable-locale-tests.patch
index 05e589dbfc5d..834ffdeffcbb 100644
--- a/srcpkgs/snapper/patches/0001-disable-locale-tests.patch
+++ b/srcpkgs/snapper/patches/0001-disable-locale-tests.patch
@@ -1,27 +1,28 @@
-These 4 tests fail with error:
-std::runtime_error: locale::facet::_S_create_c_locale name not valid
-
 diff --git testsuite/Makefile.am testsuite/Makefile.am
-index d7e30b8..001f834 100644
+index ccb84d3..9774a9c 100644
 --- testsuite/Makefile.am
 +++ testsuite/Makefile.am
-@@ -7,8 +7,8 @@ AM_CPPFLAGS = -I$(top_srcdir) $(DBUS_CFLAGS)
+@@ -7,9 +7,9 @@ AM_CPPFLAGS = -I$(top_srcdir) $(DBUS_CFLAGS)
  LDADD = ../snapper/libsnapper.la ../dbus/libdbus.la -lboost_unit_test_framework
  
  check_PROGRAMS = sysconfig-get1.test dirname1.test basename1.test 		\
--	equal-date.test dbus-escape.test cmp-lt.test humanstring.test 		\
+-	equal-date.test dbus-escape.test cmp-lt.test humanstring.test uuid.test	\
 -	table.test table-formatter.test csv-formatter.test json-formatter.test	\
-+	equal-date.test dbus-escape.test 		\
+-	getopts.test scan-datetime.test root-prefix.test range.test limit.test
++	equal-date.test dbus-escape.test uuid.test	\
 +	csv-formatter.test json-formatter.test	\
- 	getopts.test
++	getopts.test scan-datetime.test root-prefix.test
  
  if ENABLE_BTRFS_QUOTA
-@@ -27,12 +27,6 @@ EXTRA_DIST = $(noinst_SCRIPTS) sysconfig-get1.txt sysconfig-set1.txt
+ check_PROGRAMS += qgroup1.test
+@@ -29,14 +29,8 @@ equal_date_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
  
- equal_date_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
+ scan_datetime_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
  
 -humanstring_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
 -
+ uuid_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
+ 
 -table_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
 -
 -table_formatter_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
@@ -29,3 +30,11 @@ index d7e30b8..001f834 100644
  csv_formatter_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
  
  json_formatter_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la $(JSONC_LIBS)
+@@ -44,7 +38,3 @@ json_formatter_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils
+ getopts_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
+ 
+ lvm_utils_test_LDADD = -lboost_unit_test_framework ../snapper/libsnapper.la
+-
+-range_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
+-
+-limit_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
diff --git a/srcpkgs/snapper/patches/0002-backport-equal-date-test.patch b/srcpkgs/snapper/patches/0002-backport-equal-date-test.patch
deleted file mode 100644
index 688ab7e1f27d..000000000000
--- a/srcpkgs/snapper/patches/0002-backport-equal-date-test.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-diff --git package/snapper.changes package/snapper.changes
-index 9235de3..5570cf1 100644
---- package/snapper.changes
-+++ package/snapper.changes
-@@ -1,3 +1,8 @@
-+-------------------------------------------------------------------
-+Mon Jan 25 11:29:45 CET 2021 - aschnell@suse.com
-+
-+- fixed testsuite for equal-date (gh#openSUSE/snapper#526)
-+
- -------------------------------------------------------------------
- Thu Dec 17 12:20:59 CET 2020 - aschnell@suse.com
- 
-diff --git testsuite/Makefile.am testsuite/Makefile.am
-index d7e30b8..cfd1002 100644
---- testsuite/Makefile.am
-+++ testsuite/Makefile.am
-@@ -9,7 +9,7 @@ LDADD = ../snapper/libsnapper.la ../dbus/libdbus.la -lboost_unit_test_framework
- check_PROGRAMS = sysconfig-get1.test dirname1.test basename1.test 		\
- 	equal-date.test dbus-escape.test 		\
- 	csv-formatter.test json-formatter.test	\
--	getopts.test
-+	getopts.test scan-datetime.test
- 
- if ENABLE_BTRFS_QUOTA
- check_PROGRAMS += qgroup1.test
-@@ -27,6 +27,8 @@ EXTRA_DIST = $(noinst_SCRIPTS) sysconfig-get1.txt sysconfig-set1.txt
- 
- equal_date_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
- 
-+scan_datetime_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
-+
- csv_formatter_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
-
- json_formatter_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la $(JSONC_LIBS)
-diff --git testsuite/equal-date.cc testsuite/equal-date.cc
-index 42e00d8..8d8eda8 100644
---- testsuite/equal-date.cc
-+++ testsuite/equal-date.cc
-@@ -5,18 +5,25 @@
- #include <boost/test/unit_test.hpp>
- 
- #include "../client/utils/equal-date.h"
-+#include "../snapper/AppUtil.h"
-+
-+using namespace snapper;
- 
- 
- bool
- equal_week(const char* s1, const char* s2)
- {
-+    // use interim time_t since strptime on musl does not set tm_yday
-+
-+    time_t t1 = scan_datetime(s1, true);
-     struct tm tmp1;
-     memset(&tmp1, 0, sizeof(tmp1));
--    strptime(s1, "%Y-%m-%d", &tmp1);
-+    gmtime_r(&t1, &tmp1);
- 
-+    time_t t2 = scan_datetime(s2, true);
-     struct tm tmp2;
-     memset(&tmp2, 0, sizeof(tmp2));
--    strptime(s2, "%Y-%m-%d", &tmp2);
-+    gmtime_r(&t2, &tmp2);
- 
-     return equal_week(tmp1, tmp2);
- }
-@@ -25,46 +32,46 @@ equal_week(const char* s1, const char* s2)
- BOOST_AUTO_TEST_CASE(test1)
- {
-     // 2012 is a leap year
--    BOOST_CHECK(equal_week("2011-12-31", "2012-01-01"));
--    BOOST_CHECK(equal_week("2012-01-01", "2011-12-31"));
-+    BOOST_CHECK(equal_week("2011-12-31 00:00:00", "2012-01-01 00:00:00"));
-+    BOOST_CHECK(equal_week("2012-01-01 00:00:00", "2011-12-31 00:00:00"));
- }
- 
- 
- BOOST_AUTO_TEST_CASE(test2)
- {
-     // 2012 is a leap year
--    BOOST_CHECK(equal_week("2012-12-31", "2013-01-01"));
--    BOOST_CHECK(equal_week("2013-01-01", "2012-12-31"));
-+    BOOST_CHECK(equal_week("2012-12-31 00:00:00", "2013-01-01 00:00:00"));
-+    BOOST_CHECK(equal_week("2013-01-01 00:00:00", "2012-12-31 00:00:00"));
- }
- 
- 
- BOOST_AUTO_TEST_CASE(test3)
- {
-     // Saturday and Sunday
--    BOOST_CHECK(equal_week("2014-01-04", "2014-01-05"));
--    BOOST_CHECK(equal_week("2014-01-05", "2014-01-04"));
-+    BOOST_CHECK(equal_week("2014-01-04 00:00:00", "2014-01-05 00:00:00"));
-+    BOOST_CHECK(equal_week("2014-01-05 00:00:00", "2014-01-04 00:00:00"));
- 
-     // Sunday and Monday
--    BOOST_CHECK(!equal_week("2014-01-05", "2014-01-06"));
--    BOOST_CHECK(!equal_week("2014-01-06", "2014-01-05"));
-+    BOOST_CHECK(!equal_week("2014-01-05 00:00:00", "2014-01-06 00:00:00"));
-+    BOOST_CHECK(!equal_week("2014-01-06 00:00:00", "2014-01-05 00:00:00"));
- 
-     // Monday and Tuesday
--    BOOST_CHECK(equal_week("2014-01-06", "2014-01-07"));
--    BOOST_CHECK(equal_week("2014-01-07", "2014-01-06"));
-+    BOOST_CHECK(equal_week("2014-01-06 00:00:00", "2014-01-07 00:00:00"));
-+    BOOST_CHECK(equal_week("2014-01-07 00:00:00", "2014-01-06 00:00:00"));
- }
- 
- 
- BOOST_AUTO_TEST_CASE(test4)
- {
-     // 2014-12-31 is a Wednesday, 2015-01-01 is a Thursday
--    BOOST_CHECK(equal_week("2014-12-31", "2015-01-01"));
--    BOOST_CHECK(equal_week("2015-01-01", "2014-12-31"));
-+    BOOST_CHECK(equal_week("2014-12-31 00:00:00", "2015-01-01 00:00:00"));
-+    BOOST_CHECK(equal_week("2015-01-01 00:00:00", "2014-12-31 00:00:00"));
- }
- 
- 
- BOOST_AUTO_TEST_CASE(test5)
- {
-     // 2017-12-31 is a Sunday, 2018-01-01 is a Monday
--    BOOST_CHECK(!equal_week("2017-12-31", "2018-01-01"));
--    BOOST_CHECK(!equal_week("2018-01-01", "2017-12-31"));
-+    BOOST_CHECK(!equal_week("2017-12-31 00:00:00", "2018-01-01 00:00:00"));
-+    BOOST_CHECK(!equal_week("2018-01-01 00:00:00", "2017-12-31 00:00:00"));
- }
-diff --git testsuite/scan-datetime.cc testsuite/scan-datetime.cc
-new file mode 100644
-index 0000000..8f0d1c0
---- /dev/null
-+++ testsuite/scan-datetime.cc
-@@ -0,0 +1,30 @@
-+
-+#define BOOST_TEST_DYN_LINK
-+#define BOOST_TEST_MODULE snapper
-+
-+#include <boost/test/unit_test.hpp>
-+
-+#include "../snapper/AppUtil.h"
-+
-+using namespace snapper;
-+
-+
-+BOOST_AUTO_TEST_CASE(test1)
-+{
-+    time_t t1 = scan_datetime("2020-03-04 12:34:56", true);
-+
-+    struct tm tmp1;
-+    memset(&tmp1, 0, sizeof(tmp1));
-+    gmtime_r(&t1, &tmp1);
-+
-+    BOOST_CHECK_EQUAL(tmp1.tm_year, 2020 - 1900);
-+    BOOST_CHECK_EQUAL(tmp1.tm_mon, 3 - 1);
-+    BOOST_CHECK_EQUAL(tmp1.tm_mday, 4);
-+
-+    BOOST_CHECK_EQUAL(tmp1.tm_yday, 31 + 28 + 4);
-+    BOOST_CHECK_EQUAL(tmp1.tm_wday, 3);
-+
-+    BOOST_CHECK_EQUAL(tmp1.tm_hour, 12);
-+    BOOST_CHECK_EQUAL(tmp1.tm_min, 34);
-+    BOOST_CHECK_EQUAL(tmp1.tm_sec, 56);
-+}
diff --git a/srcpkgs/snapper/patches/0002-fix-32bit-musl-build.patch b/srcpkgs/snapper/patches/0002-fix-32bit-musl-build.patch
new file mode 100644
index 000000000000..41eb8053a62d
--- /dev/null
+++ b/srcpkgs/snapper/patches/0002-fix-32bit-musl-build.patch
@@ -0,0 +1,13 @@
+diff --git client/cleanup.cc client/cleanup.cc
+index 801c0f5..e57a0a8 100644
+--- client/cleanup.cc
++++ client/cleanup.cc
+@@ -51,7 +51,7 @@ struct Parameters
+     MinFreeLimit free_limit;
+ 
+ 
+-    void read(const ProxyConfig& config, const char* name, long int& value)
++    void read(const ProxyConfig& config, const char* name, time_t& value)
+     {
+        const map<string, string>& raw = config.getAllValues();
+        map<string, string>::const_iterator pos = raw.find(name);
diff --git a/srcpkgs/snapper/patches/0003-backport-fix-jsonc-linkage.patch b/srcpkgs/snapper/patches/0003-backport-fix-jsonc-linkage.patch
deleted file mode 100644
index 2582dfb1d87c..000000000000
--- a/srcpkgs/snapper/patches/0003-backport-fix-jsonc-linkage.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-This patch fixes the issue, that the build doesn't link against json-c
-when --disable-zypp flag is enabled.
-See openSUSE/snapper#617
-
-diff --git configure.ac configure.ac
-index 839d012..06e4721 100644
---- configure.ac
-+++ configure.ac
-@@ -194,9 +194,7 @@ fi
- 
- PKG_CHECK_MODULES(DBUS, dbus-1)
- PKG_CHECK_MODULES(XML2, libxml-2.0)
--if test "x$with_zypp" = "xyes"; then
--   PKG_CHECK_MODULES(JSONC, json-c, [], [AC_MSG_WARN([Cannot find json-c. Please install libjson-c-devel])])
--fi
-+PKG_CHECK_MODULES(JSONC, json-c, [], [AC_MSG_WARN([Cannot find json-c. Please install libjson-c-devel])])
- 
- AC_CHECK_HEADER(acl/libacl.h,[],[AC_MSG_ERROR([Cannout find libacl headers. Please install libacl-devel])])
- 
diff --git a/srcpkgs/snapper/template b/srcpkgs/snapper/template
index 481f94c13c5e..bd58ab951c24 100644
--- a/srcpkgs/snapper/template
+++ b/srcpkgs/snapper/template
@@ -1,6 +1,6 @@
 # Template file for 'snapper'
 pkgname=snapper
-version=0.8.15
+version=0.9.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-zypp --disable-systemd --with-conf=/etc/conf.d"
@@ -13,11 +13,11 @@ makedepends="acl-devel boost-devel dbus-devel e2fsprogs-devel libbtrfs-devel
  json-c-devel"
 depends="dbus"
 short_desc="Tool for Linux filesystem snapshot management"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="FollieHiyuki <folliekazetani@protonmail.com>"
 license="GPL-2.0-only"
 homepage="http://snapper.io"
 distfiles="https://github.com/openSUSE/snapper/archive/v${version}.tar.gz"
-checksum=fe0e32912275713f8fad17dbe510f32dbba8526365a849e3f7d6c786d43cfca2
+checksum=ca7b17d0213aa5281ff08d968b4e029b78bb3870eb79fd7bc7f879b17f5c969e
 lib32disabled=yes
 
 if [ "$XBPS_TARGET_LIBC" = musl ]

From abfc3059b7ba10a22cca0d51338b619e688ed1f4 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Sun, 25 Apr 2021 20:25:46 +0200
Subject: [PATCH 1727/2024] babeld: update to 1.10.

---
 srcpkgs/babeld/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/babeld/template b/srcpkgs/babeld/template
index cfff942a9cd0..c8a90adea73b 100644
--- a/srcpkgs/babeld/template
+++ b/srcpkgs/babeld/template
@@ -1,6 +1,6 @@
 # Template file for 'babeld'
 pkgname=babeld
-version=1.9.2
+version=1.10
 revision=1
 wrksrc=babeld-babeld-${version}
 build_style=gnu-makefile
@@ -9,7 +9,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="MIT"
 homepage="https://www.irif.fr/~jch/software/babel/"
 distfiles="https://github.com/jech/babeld/archive/babeld-${version}.tar.gz"
-checksum=c8c8c3698afb00caa5a5c9bbbb0a22b56d79ad3f9775382915ba979ac88c4e8f
+checksum=d44a0ca3cf67595e1ed67ca219c975c3c011c6046028be75df254715c4611d31
 patch_args="-Np1"
 
 pre_build() {

From e2aa1767dbe8fa02549d80dd45ed5db7a422a742 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Tue, 20 Apr 2021 12:52:24 +0200
Subject: [PATCH 1728/2024] libdvdread: update to 6.1.2.

---
 srcpkgs/libdvdread/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libdvdread/template b/srcpkgs/libdvdread/template
index 453a54cc5b66..463805e0301a 100644
--- a/srcpkgs/libdvdread/template
+++ b/srcpkgs/libdvdread/template
@@ -1,6 +1,6 @@
 # Template file for 'libdvdread'
 pkgname=libdvdread
-version=6.1.1
+version=6.1.2
 revision=1
 build_style=gnu-configure
 configure_args="--with-libdvdcss"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.videolan.org/developers/libdvdnav.html"
 distfiles="https://get.videolan.org/libdvdread/${version}/libdvdread-${version}.tar.bz2"
-checksum=3e357309a17c5be3731385b9eabda6b7e3fa010f46022a06f104553bf8e21796
+checksum=cc190f553758ced7571859e301f802cb4821f164d02bfacfd320c14a4e0da763
 
 libdvdread-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} libdvdcss-devel"

From 126d449eb4e536c734d874aba2223a2e9e0f3499 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Mon, 26 Apr 2021 01:04:18 +0300
Subject: [PATCH 1729/2024] hugo: enable `extended` option by default

Sass support is nice to have even though most people might not
use it. Also fix to use the right `Pygments` package name and
remove `git` in hostmakedepends.
---
 srcpkgs/hugo/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index ee37134f2681..1a241f234e9b 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,12 +1,11 @@
 # Template file for 'hugo'
 pkgname=hugo
 version=0.82.1
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/gohugoio/hugo"
 go_build_tags="$(vopt_if extended extended)"
-hostmakedepends="git"
-depends="$(vopt_if pygments python-Pygments)"
+depends="$(vopt_if pygments python3-Pygments)"
 short_desc="Fast & Modern Static Website Engine"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
@@ -15,6 +14,7 @@ distfiles="https://github.com/gohugoio/hugo/archive/v${version}.tar.gz"
 checksum=3190ae848fdb1a04339c233faab5934c422d85cf85ea3b0c0b5a842239c84e75
 
 build_options="pygments extended"
+build_options_default="extended"
 desc_option_pygments="Alternative syntax highlighter"
 desc_option_extended="SASS/SCSS build support for Hugo"
 

From fc0b98bd60c3865a87ffa52f207054b5b7bf399e Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Mon, 26 Apr 2021 00:26:08 +0300
Subject: [PATCH 1730/2024] gallery-dl: update to 1.17.3

---
 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 0e339265881a..2249ecce51d0 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.2
+version=1.17.3
 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=a486c10c6d00abe1f7f2d650b0a99d98b8499586d8b1fcd421e6f30420ebf704
+checksum=350ea07d5d36e0ba982a5bfb869f3226195be196e0012401f350857ceb025c42
 
 do_check() {
 	make test

From c1454e93d482e538121911f4c5ce8cb2c2ee3dc5 Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Sun, 25 Apr 2021 10:39:00 +0200
Subject: [PATCH 1731/2024] python3-pikepdf: update to 2.11.2.

---
 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 ec24f17799c5..d16b86b156a3 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.11.1
+version=2.11.2
 revision=2
 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=810488f80a1d93652498222f9d1391d9287b3b842971d7a8878e69a287c2476f
+checksum=0958a07ebf12d62427babadd6a922409cb358d0415a5219a9269d8fab2aa487e
 
 pre_build() {
 	vsed -e '/setuptools_scm_git_archive/d' -i setup.py

From 1dca6b09cae2f4154785855354df513676310eb4 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Sun, 25 Apr 2021 12:33:47 +0200
Subject: [PATCH 1732/2024] chroma: update to 0.9.1.

---
 srcpkgs/chroma/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chroma/template b/srcpkgs/chroma/template
index 8215a0ac027e..9cba6b119227 100644
--- a/srcpkgs/chroma/template
+++ b/srcpkgs/chroma/template
@@ -1,6 +1,6 @@
 # Template file for 'chroma'
 pkgname=chroma
-version=0.8.2
+version=0.9.1
 revision=1
 build_style=go
 go_import_path="github.com/alecthomas/${pkgname}"
@@ -12,7 +12,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"
 homepage="https://github.com/alecthomas/chroma"
 distfiles="https://github.com/alecthomas/chroma/archive/v${version}.tar.gz"
-checksum=b7b9bd2ff49a18127dd00cee0d8e1d262b861b0641f711cbf9c615431f2b9499
+checksum=@f351e7aa08f9632d37d8aa6358b362f2ea86447a69a6a9d82fb75e5c833d73dd
 
 do_check() {
 	go test -v

From 4ac636d5004b173d8fee9a97280204cd650673f0 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Mon, 26 Apr 2021 00:29:47 +0300
Subject: [PATCH 1733/2024] cointop: update to 1.6.4

---
 srcpkgs/cointop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cointop/template b/srcpkgs/cointop/template
index f6fba09c681a..b2e5d1f98ba9 100644
--- a/srcpkgs/cointop/template
+++ b/srcpkgs/cointop/template
@@ -1,6 +1,6 @@
 # Template file for 'cointop'
 pkgname=cointop
-version=1.6.3
+version=1.6.4
 revision=1
 build_style=go
 go_import_path="github.com/miguelmota/${pkgname}"
@@ -9,4 +9,4 @@ maintainer="FollieHiyuki <folliekazetani@protonmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/miguelmota/cointop"
 distfiles="https://github.com/miguelmota/cointop/archive/v${version}.tar.gz"
-checksum=636f3cfb5f9d748e874ede149acb6b96c7b2be8d39b73ef22abb9dd0d214358e
+checksum=da9698695e955dad148f989abcd716c683788d2378e088a6f52c275f44f9447c

From 560b13f427fc45e6e36eefca7bb57921f750aad8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 25 Apr 2021 19:07:32 +0200
Subject: [PATCH 1734/2024] electron9: remove package

---
 .../musl-patches/chromium-musl-crashpad.patch |   23 -
 ...omium-musl-default-pthread-stacksize.patch |   31 -
 .../musl-patches/chromium-musl-sandbox.patch  |  176 -
 ...chromium-musl_canonicalize_file_name.patch |   13 -
 .../musl-patches/chromium-musl_cdefs.patch    |   45 -
 ...omium-musl_define_temp_failure_retry.patch |   18 -
 .../musl-patches/chromium-musl_dns.patch      |   61 -
 .../musl-patches/chromium-musl_exeinfo.patch  |   96 -
 .../chromium-musl_fpstate_t.patch             |   48 -
 .../chromium-musl_getcontext.patch            |   25 -
 .../musl-patches/chromium-musl_mallinfo.patch |   61 -
 .../chromium-musl_pread_pwrite64.patch        |   18 -
 .../chromium-musl_push_back.patch             |   13 -
 .../chromium-musl_stack_size.patch            |   41 -
 .../chromium-musl_stack_trace.patch           |   44 -
 .../chromium-musl_tcp_listen.patch            |   14 -
 .../musl-patches/chromium-musl_wordsize.patch |   24 -
 .../chromium-musl_xxx_ppc64le.patch           |  187 -
 .../files/patches/chromium-83-gcc-10.patch    |   64 -
 ...rithm-header-in-crx_install_error.cc.patch |   29 -
 ...struction-of-ServiceWorkerObjectHost.patch |  138 -
 ...chromium-chromium_atk_optional.patch.patch |   15 -
 ...chromium-clean-up-a-call-to-set_utf8.patch |   34 -
 .../files/patches/chromium-ffmpeg-4.3.patch   |   21 -
 ...omium-fix-template-specialization-01.patch |   64 -
 ...c-CrossVariantMojoAssociatedReceiver.patch |   56 -
 .../chromium-gcc-aarch64-zlib-crc-01.patch    |  131 -
 .../chromium-gcc-aarch64-zlib-crc-02.patch    |   35 -
 ...-move-assignement-operators-noexcept.patch |   66 -
 .../files/patches/chromium-gcc-shared.patch   |   20 -
 .../patches/chromium-gcc-webui-template.patch |   67 -
 ...eader-to-get-the-definition-of-std-u.patch |   32 -
 ...-numeric_limits-is-defined-in-limits.patch |   29 -
 .../files/patches/chromium-libc_malloc.patch  |   26 -
 ...mplete-type-in-AXTree-for-NodeSetSiz.patch |   62 -
 ...link-custom-iterators-STL-compatible.patch |   95 -
 .../files/patches/chromium-skia-harmony.patch |   14 -
 .../files/patches/chromium-time64.patch       |   51 -
 .../patches/chromium-toolchain-host.patch     |   11 -
 ...l-in-SDR-HDR-DisplayColorSpaces-CrOS.patch |  436 --
 ...rmont-AFDO-profile-from-83-4103.97-1.patch |   41 -
 ...lvermont-AFDO-profile-from-83-4103.9.patch |   41 -
 ...oadwell-AFDO-profile-from-83-4103.97.patch |   41 -
 ...ncrementing-VERSION-to-83.0.4103.120.patch |   29 -
 ...PW-bookkeeping-out-of-forked-process.patch |  150 -
 ...ort-GCPW-login-to-permitted-accounts.patch |  197 -
 ...dle-lsa_account_rights-size-properly.patch |   55 -
 ...ncrementing-VERSION-to-83.0.4103.121.patch |   29 -
 ...ceManageAccountBrowserTest.ClearMana.patch |   43 -
 ...ncrementing-VERSION-to-83.0.4103.122.patch |   29 -
 ...n-to-be-removed-getAllFieldPositions.patch |  172 -
 .../files/patches/chromium-xxx-ppc64le.patch  | 3737 -----------------
 ...a-script-to-list-patch-targets.patch.patch |   42 -
 .../patches/electron-Build-fixes.patch.patch  |   47 -
 ...ectron-dont-assume-python-is-python2.patch |   17 -
 ...lectron-exclude-content-test-patches.patch |   10 -
 .../sndio-files/audio_manager_openbsd.cc      |  148 -
 .../files/sndio-files/audio_manager_openbsd.h |   65 -
 .../files/sndio-files/sndio_input.cc          |  201 -
 .../electron9/files/sndio-files/sndio_input.h |   91 -
 .../files/sndio-files/sndio_output.cc         |  183 -
 .../files/sndio-files/sndio_output.h          |   86 -
 ...a_audio_linux_audio_manager_linux.cc.patch |   43 -
 ...src_3rdparty_chromium_media_BUILD.gn.patch |   12 -
 ...dparty_chromium_media_audio_BUILD.gn.patch |   23 -
 ...ty_chromium_media_media__options.gni.patch |   12 -
 srcpkgs/electron9/template                    |  354 --
 srcpkgs/electron9/update                      |    2 -
 srcpkgs/removed-packages/template             |    3 +-
 69 files changed, 2 insertions(+), 8335 deletions(-)
 delete mode 100644 srcpkgs/electron9/files/musl-patches/chromium-musl-crashpad.patch
 delete mode 100644 srcpkgs/electron9/files/musl-patches/chromium-musl-default-pthread-stacksize.patch
 delete mode 100644 srcpkgs/electron9/files/musl-patches/chromium-musl-sandbox.patch
 delete mode 100644 srcpkgs/electron9/files/musl-patches/chromium-musl_canonicalize_file_name.patch
 delete mode 100644 srcpkgs/electron9/files/musl-patches/chromium-musl_cdefs.patch
 delete mode 100644 srcpkgs/electron9/files/musl-patches/chromium-musl_define_temp_failure_retry.patch
 delete mode 100644 srcpkgs/electron9/files/musl-patches/chromium-musl_dns.patch
 delete mode 100644 srcpkgs/electron9/files/musl-patches/chromium-musl_exeinfo.patch
 delete mode 100644 srcpkgs/electron9/files/musl-patches/chromium-musl_fpstate_t.patch
 delete mode 100644 srcpkgs/electron9/files/musl-patches/chromium-musl_getcontext.patch
 delete mode 100644 srcpkgs/electron9/files/musl-patches/chromium-musl_mallinfo.patch
 delete mode 100644 srcpkgs/electron9/files/musl-patches/chromium-musl_pread_pwrite64.patch
 delete mode 100644 srcpkgs/electron9/files/musl-patches/chromium-musl_push_back.patch
 delete mode 100644 srcpkgs/electron9/files/musl-patches/chromium-musl_stack_size.patch
 delete mode 100644 srcpkgs/electron9/files/musl-patches/chromium-musl_stack_trace.patch
 delete mode 100644 srcpkgs/electron9/files/musl-patches/chromium-musl_tcp_listen.patch
 delete mode 100644 srcpkgs/electron9/files/musl-patches/chromium-musl_wordsize.patch
 delete mode 100644 srcpkgs/electron9/files/musl-patches/chromium-musl_xxx_ppc64le.patch
 delete mode 100644 srcpkgs/electron9/files/patches/chromium-83-gcc-10.patch
 delete mode 100644 srcpkgs/electron9/files/patches/chromium-add-missing-algorithm-header-in-crx_install_error.cc.patch
 delete mode 100644 srcpkgs/electron9/files/patches/chromium-avoid-double-destruction-of-ServiceWorkerObjectHost.patch
 delete mode 100644 srcpkgs/electron9/files/patches/chromium-chromium_atk_optional.patch.patch
 delete mode 100644 srcpkgs/electron9/files/patches/chromium-clean-up-a-call-to-set_utf8.patch
 delete mode 100644 srcpkgs/electron9/files/patches/chromium-ffmpeg-4.3.patch
 delete mode 100644 srcpkgs/electron9/files/patches/chromium-fix-template-specialization-01.patch
 delete mode 100644 srcpkgs/electron9/files/patches/chromium-gcc-CrossVariantMojoAssociatedReceiver.patch
 delete mode 100644 srcpkgs/electron9/files/patches/chromium-gcc-aarch64-zlib-crc-01.patch
 delete mode 100644 srcpkgs/electron9/files/patches/chromium-gcc-aarch64-zlib-crc-02.patch
 delete mode 100644 srcpkgs/electron9/files/patches/chromium-gcc-move-assignement-operators-noexcept.patch
 delete mode 100644 srcpkgs/electron9/files/patches/chromium-gcc-shared.patch
 delete mode 100644 srcpkgs/electron9/files/patches/chromium-gcc-webui-template.patch
 delete mode 100644 srcpkgs/electron9/files/patches/chromium-include-memory-header-to-get-the-definition-of-std-u.patch
 delete mode 100644 srcpkgs/electron9/files/patches/chromium-iwyu-std-numeric_limits-is-defined-in-limits.patch
 delete mode 100644 srcpkgs/electron9/files/patches/chromium-libc_malloc.patch
 delete mode 100644 srcpkgs/electron9/files/patches/chromium-libstdc-fix-incomplete-type-in-AXTree-for-NodeSetSiz.patch
 delete mode 100644 srcpkgs/electron9/files/patches/chromium-make-some-of-blink-custom-iterators-STL-compatible.patch
 delete mode 100644 srcpkgs/electron9/files/patches/chromium-skia-harmony.patch
 delete mode 100644 srcpkgs/electron9/files/patches/chromium-time64.patch
 delete mode 100644 srcpkgs/electron9/files/patches/chromium-toolchain-host.patch
 delete mode 100644 srcpkgs/electron9/files/patches/chromium-upstream-0001-Revert-ui-fill-in-SDR-HDR-DisplayColorSpaces-CrOS.patch
 delete mode 100644 srcpkgs/electron9/files/patches/chromium-upstream-0002-Roll-ChromeOS-Airmont-AFDO-profile-from-83-4103.97-1.patch
 delete mode 100644 srcpkgs/electron9/files/patches/chromium-upstream-0003-Roll-ChromeOS-Silvermont-AFDO-profile-from-83-4103.9.patch
 delete mode 100644 srcpkgs/electron9/files/patches/chromium-upstream-0004-Roll-ChromeOS-Broadwell-AFDO-profile-from-83-4103.97.patch
 delete mode 100644 srcpkgs/electron9/files/patches/chromium-upstream-0005-Incrementing-VERSION-to-83.0.4103.120.patch
 delete mode 100644 srcpkgs/electron9/files/patches/chromium-upstream-0006-Move-GCPW-bookkeeping-out-of-forked-process.patch
 delete mode 100644 srcpkgs/electron9/files/patches/chromium-upstream-0007-Support-GCPW-login-to-permitted-accounts.patch
 delete mode 100644 srcpkgs/electron9/files/patches/chromium-upstream-0008-Handle-lsa_account_rights-size-properly.patch
 delete mode 100644 srcpkgs/electron9/files/patches/chromium-upstream-0009-Incrementing-VERSION-to-83.0.4103.121.patch
 delete mode 100644 srcpkgs/electron9/files/patches/chromium-upstream-0010-Disable-flaky-DiceManageAccountBrowserTest.ClearMana.patch
 delete mode 100644 srcpkgs/electron9/files/patches/chromium-upstream-0011-Incrementing-VERSION-to-83.0.4103.122.patch
 delete mode 100644 srcpkgs/electron9/files/patches/chromium-v8-remove-soon-to-be-removed-getAllFieldPositions.patch
 delete mode 100644 srcpkgs/electron9/files/patches/chromium-xxx-ppc64le.patch
 delete mode 100644 srcpkgs/electron9/files/patches/electron-Add-a-script-to-list-patch-targets.patch.patch
 delete mode 100644 srcpkgs/electron9/files/patches/electron-Build-fixes.patch.patch
 delete mode 100644 srcpkgs/electron9/files/patches/electron-dont-assume-python-is-python2.patch
 delete mode 100644 srcpkgs/electron9/files/patches/electron-exclude-content-test-patches.patch
 delete mode 100644 srcpkgs/electron9/files/sndio-files/audio_manager_openbsd.cc
 delete mode 100644 srcpkgs/electron9/files/sndio-files/audio_manager_openbsd.h
 delete mode 100644 srcpkgs/electron9/files/sndio-files/sndio_input.cc
 delete mode 100644 srcpkgs/electron9/files/sndio-files/sndio_input.h
 delete mode 100644 srcpkgs/electron9/files/sndio-files/sndio_output.cc
 delete mode 100644 srcpkgs/electron9/files/sndio-files/sndio_output.h
 delete mode 100644 srcpkgs/electron9/files/sndio-patches/media_audio_linux_audio_manager_linux.cc.patch
 delete mode 100644 srcpkgs/electron9/files/sndio-patches/src_3rdparty_chromium_media_BUILD.gn.patch
 delete mode 100644 srcpkgs/electron9/files/sndio-patches/src_3rdparty_chromium_media_audio_BUILD.gn.patch
 delete mode 100644 srcpkgs/electron9/files/sndio-patches/src_3rdparty_chromium_media_media__options.gni.patch
 delete mode 100644 srcpkgs/electron9/template
 delete mode 100644 srcpkgs/electron9/update

diff --git a/srcpkgs/electron9/files/musl-patches/chromium-musl-crashpad.patch b/srcpkgs/electron9/files/musl-patches/chromium-musl-crashpad.patch
deleted file mode 100644
index 70cffa3002bb..000000000000
--- a/srcpkgs/electron9/files/musl-patches/chromium-musl-crashpad.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/third_party/crashpad/crashpad/util/linux/ptracer.cc
-+++ b/third_party/crashpad/crashpad/util/linux/ptracer.cc
-@@ -26,6 +26,7 @@
- 
- #if defined(ARCH_CPU_X86_FAMILY)
- #include <asm/ldt.h>
-+#include <asm/ptrace-abi.h>
- #endif
- 
- namespace crashpad {
-
---- a/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h
-+++ b/third_party/crashpad/crashpad/compat/linux/sys/ptrace.h
-@@ -17,7 +17,9 @@
- 
- #include_next <sys/ptrace.h>
- 
-+#if defined(__GLIBC__)
- #include <sys/cdefs.h>
-+#endif
- 
- // https://sourceware.org/bugzilla/show_bug.cgi?id=22433
- #if !defined(PTRACE_GET_THREAD_AREA) && !defined(PT_GET_THREAD_AREA) && \
diff --git a/srcpkgs/electron9/files/musl-patches/chromium-musl-default-pthread-stacksize.patch b/srcpkgs/electron9/files/musl-patches/chromium-musl-default-pthread-stacksize.patch
deleted file mode 100644
index d0c1361b8ed1..000000000000
--- a/srcpkgs/electron9/files/musl-patches/chromium-musl-default-pthread-stacksize.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/base/threading/platform_thread_linux.cc b/base/threading/platform_thread_linux.cc
-index 095c49b..5044bb8 100644
---- a/base/threading/platform_thread_linux.cc
-+++ b/base/threading/platform_thread_linux.cc
-@@ -186,7 +186,7 @@ void TerminateOnThread() {}
- 
- size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) {
- #if !defined(THREAD_SANITIZER)
--  return 0;
-+  return (1 << 23);
- #else
-   // ThreadSanitizer bloats the stack heavily. Evidence has been that the
-   // default stack size isn't enough for some browser tests.
-diff --git a/chrome/app/shutdown_signal_handlers_posix.cc b/chrome/app/shutdown_signal_handlers_posix.cc
-index 621d441..be21106 100644
---- a/chrome/app/shutdown_signal_handlers_posix.cc
-+++ b/chrome/app/shutdown_signal_handlers_posix.cc
-@@ -187,11 +187,11 @@ void InstallShutdownSignalHandlers(
-   g_shutdown_pipe_read_fd = pipefd[0];
-   g_shutdown_pipe_write_fd = pipefd[1];
- #if !defined(ADDRESS_SANITIZER)
--  const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2;
-+  const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2 *8;
- #else
-   // ASan instrumentation bloats the stack frames, so we need to increase the
-   // stack size to avoid hitting the guard page.
--  const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4;
-+  const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4 *8;
- #endif
-   ShutdownDetector* detector = new ShutdownDetector(
-       g_shutdown_pipe_read_fd, std::move(shutdown_callback), task_runner);
diff --git a/srcpkgs/electron9/files/musl-patches/chromium-musl-sandbox.patch b/srcpkgs/electron9/files/musl-patches/chromium-musl-sandbox.patch
deleted file mode 100644
index f485f6cc75af..000000000000
--- a/srcpkgs/electron9/files/musl-patches/chromium-musl-sandbox.patch
+++ /dev/null
@@ -1,176 +0,0 @@
-diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
-index 348ab6e..4550f9e 100644
---- ./sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
-+++ ./sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
-@@ -139,21 +139,11 @@ namespace sandbox {
- // present (as in newer versions of posix_spawn).
- ResultExpr RestrictCloneToThreadsAndEPERMFork() {
-   const Arg<unsigned long> flags(0);
--
--  // TODO(mdempsky): Extend DSL to support (flags & ~mask1) == mask2.
--  const uint64_t kAndroidCloneMask = CLONE_VM | CLONE_FS | CLONE_FILES |
--                                     CLONE_SIGHAND | CLONE_THREAD |
--                                     CLONE_SYSVSEM;
--  const uint64_t kObsoleteAndroidCloneMask = kAndroidCloneMask | CLONE_DETACHED;
--
--  const uint64_t kGlibcPthreadFlags =
--      CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_THREAD |
--      CLONE_SYSVSEM | CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID;
--  const BoolExpr glibc_test = flags == kGlibcPthreadFlags;
--
--  const BoolExpr android_test =
--      AnyOf(flags == kAndroidCloneMask, flags == kObsoleteAndroidCloneMask,
--            flags == kGlibcPthreadFlags);
-+  const int required = CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
-+                       CLONE_THREAD | CLONE_SYSVSEM;
-+  const int safe = CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID |
-+                   CLONE_DETACHED;
-+  const BoolExpr thread_clone_ok = (flags&~safe)==required;
- 
-   // The following two flags are the two important flags in any vfork-emulating
-   // clone call. EPERM any clone call that contains both of them.
-@@ -163,7 +153,7 @@ ResultExpr RestrictCloneToThreadsAndEPERMFork() {
-       AnyOf((flags & (CLONE_VM | CLONE_THREAD)) == 0,
-             (flags & kImportantCloneVforkFlags) == kImportantCloneVforkFlags);
- 
--  return If(IsAndroid() ? android_test : glibc_test, Allow())
-+  return If(thread_clone_ok, Allow())
-       .ElseIf(is_fork_or_clone_vfork, Error(EPERM))
-       .Else(CrashSIGSYSClone());
- }
-diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-index 7dbcc87..589262f 100644
---- ./sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-+++ ./sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-@@ -391,6 +391,7 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) {
- #if defined(__i386__)
-     case __NR_waitpid:
- #endif
-+    case __NR_set_tid_address:
-       return true;
-     case __NR_clone:  // Should be parameter-restricted.
-     case __NR_setns:  // Privileged.
-@@ -403,7 +404,6 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) {
- #if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
-     case __NR_set_thread_area:
- #endif
--    case __NR_set_tid_address:
-     case __NR_unshare:
- #if !defined(__mips__) && !defined(__aarch64__)
-     case __NR_vfork:
-@@ -513,6 +513,8 @@ bool SyscallSets::IsAllowedAddressSpaceAccess(int sysno) {
-     case __NR_mlock:
-     case __NR_munlock:
-     case __NR_munmap:
-+    case __NR_mremap:
-+    case __NR_membarrier:
-       return true;
-     case __NR_madvise:
-     case __NR_mincore:
-@@ -530,7 +532,6 @@ bool SyscallSets::IsAllowedAddressSpaceAccess(int sysno) {
-     case __NR_modify_ldt:
- #endif
-     case __NR_mprotect:
--    case __NR_mremap:
-     case __NR_msync:
-     case __NR_munlockall:
-     case __NR_readahead:
-diff --git a/sandbox/linux/system_headers/arm64_linux_syscalls.h b/sandbox/linux/system_headers/arm64_linux_syscalls.h
-index 59d0eab..7ae7002 100644
---- ./sandbox/linux/system_headers/arm64_linux_syscalls.h
-+++ ./sandbox/linux/system_headers/arm64_linux_syscalls.h
-@@ -1063,4 +1063,8 @@
- #define __NR_memfd_create 279
- #endif
- 
-+#if !defined(__NR_membarrier)
-+#define __NR_membarrier 283
-+#endif
-+
- #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_ARM64_LINUX_SYSCALLS_H_
-diff --git a/sandbox/linux/system_headers/arm_linux_syscalls.h b/sandbox/linux/system_headers/arm_linux_syscalls.h
-index 1addd53..7843b5e 100644
---- ./sandbox/linux/system_headers/arm_linux_syscalls.h
-+++ ./sandbox/linux/system_headers/arm_linux_syscalls.h
-@@ -1385,6 +1385,10 @@
- #define __NR_memfd_create (__NR_SYSCALL_BASE+385)
- #endif
- 
-+#if !defined(__NR_membarrier)
-+#define __NR_membarrier (__NR_SYSCALL_BASE+389)
-+#endif
-+
- // ARM private syscalls.
- #if !defined(__ARM_NR_BASE)
- #define __ARM_NR_BASE (__NR_SYSCALL_BASE + 0xF0000)
-diff --git a/sandbox/linux/system_headers/mips64_linux_syscalls.h b/sandbox/linux/system_headers/mips64_linux_syscalls.h
-index ec75815..612fcfa 100644
---- ./sandbox/linux/system_headers/mips64_linux_syscalls.h
-+++ ./sandbox/linux/system_headers/mips64_linux_syscalls.h
-@@ -1271,4 +1271,8 @@
- #define __NR_memfd_create (__NR_Linux + 314)
- #endif
- 
-+#if !defined(__NR_membarrier)
-+#define __NR_membarrier (__NR_Linux + 318)
-+#endif
-+
- #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_MIPS64_LINUX_SYSCALLS_H_
-diff --git a/sandbox/linux/system_headers/mips_linux_syscalls.h b/sandbox/linux/system_headers/mips_linux_syscalls.h
-index ddbf97f..1742acd 100644
---- ./sandbox/linux/system_headers/mips_linux_syscalls.h
-+++ ./sandbox/linux/system_headers/mips_linux_syscalls.h
-@@ -1433,4 +1433,8 @@
- #define __NR_memfd_create (__NR_Linux + 354)
- #endif
- 
-+#if !defined(__NR_membarrier)
-+#define __NR_membarrier (__NR_Linux + 358)
-+#endif
-+
- #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_MIPS_LINUX_SYSCALLS_H_
-diff --git a/sandbox/linux/system_headers/x86_32_linux_syscalls.h b/sandbox/linux/system_headers/x86_32_linux_syscalls.h
-index a6afc62..7ed0a3b 100644
---- ./sandbox/linux/system_headers/x86_32_linux_syscalls.h
-+++ ./sandbox/linux/system_headers/x86_32_linux_syscalls.h
-@@ -1422,5 +1422,9 @@
- #define __NR_memfd_create 356
- #endif
- 
-+#if !defined(__NR_membarrier)
-+#define __NR_membarrier 375
-+#endif
-+
- #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_X86_32_LINUX_SYSCALLS_H_
- 
-diff --git a/sandbox/linux/system_headers/x86_64_linux_syscalls.h b/sandbox/linux/system_headers/x86_64_linux_syscalls.h
-index 349504a..ea3c7c9 100644
---- ./sandbox/linux/system_headers/x86_64_linux_syscalls.h
-+++ ./sandbox/linux/system_headers/x86_64_linux_syscalls.h
-@@ -1290,5 +1290,9 @@
- #define __NR_memfd_create 319
- #endif
- 
-+#if !defined(__NR_membarrier)
-+#define __NR_membarrier 324
-+#endif
-+
- #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_X86_64_LINUX_SYSCALLS_H_
- 
-diff --git a/services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc b/services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc
-index 017f13c..50aeec3 100644
---- ./services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc
-+++ ./services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc
-@@ -88,10 +88,10 @@ ResultExpr RendererProcessPolicy::EvaluateSyscall(int sysno) const {
-     case __NR_sysinfo:
-     case __NR_times:
-     case __NR_uname:
--      return Allow();
--    case __NR_sched_getaffinity:
-     case __NR_sched_getparam:
-     case __NR_sched_getscheduler:
-+      return Allow();
-+    case __NR_sched_getaffinity:
-     case __NR_sched_setscheduler:
-       return sandbox::RestrictSchedTarget(GetPolicyPid(), sysno);
-     case __NR_prlimit64:
diff --git a/srcpkgs/electron9/files/musl-patches/chromium-musl_canonicalize_file_name.patch b/srcpkgs/electron9/files/musl-patches/chromium-musl_canonicalize_file_name.patch
deleted file mode 100644
index 05614daa7576..000000000000
--- a/srcpkgs/electron9/files/musl-patches/chromium-musl_canonicalize_file_name.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/third_party/nasm/config/config-linux.h b/third_party/nasm/config/config-linux.h
-index 7eb7c20..882b736 100644
---- a/third_party/nasm/config/config-linux.h
-+++ b/third_party/nasm/config/config-linux.h
-@@ -117,7 +117,7 @@
- #define HAVE_ACCESS 1
- 
- /* Define to 1 if you have the `canonicalize_file_name' function. */
--#define HAVE_CANONICALIZE_FILE_NAME 1
-+/* #undef HAVE_CANONICALIZE_FILE_NAME */
- 
- /* Define to 1 if you have the `cpu_to_le16' intrinsic function. */
- /* #undef HAVE_CPU_TO_LE16 */
diff --git a/srcpkgs/electron9/files/musl-patches/chromium-musl_cdefs.patch b/srcpkgs/electron9/files/musl-patches/chromium-musl_cdefs.patch
deleted file mode 100644
index fc7dc06ff21b..000000000000
--- a/srcpkgs/electron9/files/musl-patches/chromium-musl_cdefs.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/base/allocator/allocator_shim_internals.h b/base/allocator/allocator_shim_internal
-s.h
-index 0196f89..bb42b5d 100644
---- a/base/allocator/allocator_shim_internals.h
-+++ b/base/allocator/allocator_shim_internals.h
-@@ -7,7 +7,9 @@
-
- #if defined(__GNUC__)
-
-+#if defined(__GLIBC__)
- #include <sys/cdefs.h>  // for __THROW
-+#endif
-
- #ifndef __THROW  // Not a glibc system
- #ifdef _NOEXCEPT  // LLVM libc++ uses noexcept instead
-diff --git a/third_party/libsync/src/include/sync/sync.h b/third_party/libsync/src/include/sync/sync.h
-index 50ed0ac..7552a49 100644
---- a/third_party/libsync/src/include/sync/sync.h
-+++ b/third_party/libsync/src/include/sync/sync.h
-@@ -19,12 +19,13 @@
- #ifndef __SYS_CORE_SYNC_H
- #define __SYS_CORE_SYNC_H
- 
--#include <sys/cdefs.h>
- #include <stdint.h>
- 
- #include <linux/types.h>
- 
--__BEGIN_DECLS
-+#ifdef __cplusplus
-+extern "C" {
-+#endif /* __cplusplus */
- 
- struct sync_legacy_merge_data {
-  int32_t fd2;
-@@ -158,6 +159,8 @@ struct sync_pt_info *sync_pt_info(struct sync_fence_info_data *info,
-                                   struct sync_pt_info *itr);
- void sync_fence_info_free(struct sync_fence_info_data *info);
- 
--__END_DECLS
-+#ifdef __cplusplus
-+}
-+#endif /* __cplusplus */
- 
- #endif /* __SYS_CORE_SYNC_H */
diff --git a/srcpkgs/electron9/files/musl-patches/chromium-musl_define_temp_failure_retry.patch b/srcpkgs/electron9/files/musl-patches/chromium-musl_define_temp_failure_retry.patch
deleted file mode 100644
index 61db658f849e..000000000000
--- a/srcpkgs/electron9/files/musl-patches/chromium-musl_define_temp_failure_retry.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/sandbox/linux/suid/sandbox.c	2019-11-19 09:28:05.000000000 +0800
-+++ b/sandbox/linux/suid/sandbox.c	2020-04-24 11:50:12.719880728 +0800
-@@ -42,6 +42,15 @@
- #define CLONE_NEWNET 0x40000000
- #endif
- 
-+#ifndef TEMP_FAILURE_RETRY
-+#define TEMP_FAILURE_RETRY(expression) \
-+  (__extension__                                                             \
-+    ({ long int __result;                                                    \
-+       do __result = (long int) (expression);                                \
-+       while (__result == -1L && errno == EINTR);                            \
-+       __result; }))
-+#endif
-+
- static bool DropRoot();
- 
- #define HANDLE_EINTR(x) TEMP_FAILURE_RETRY(x)
diff --git a/srcpkgs/electron9/files/musl-patches/chromium-musl_dns.patch b/srcpkgs/electron9/files/musl-patches/chromium-musl_dns.patch
deleted file mode 100644
index f49d8bd0afaf..000000000000
--- a/srcpkgs/electron9/files/musl-patches/chromium-musl_dns.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff --git a/net/dns/dns_config_service_posix.cc b/net/dns/dns_config_service_posix.cc
-index 2f94832..2dd1a98 100644
---- a/net/dns/dns_config_service_posix.cc
-+++ b/net/dns/dns_config_service_posix.cc
-@@ -150,7 +150,7 @@ ConfigParsePosixResult ReadDnsConfig(DnsConfig* dns_config) {
- #if !defined(OS_ANDROID)
-   ConfigParsePosixResult result;
- // TODO(fuchsia): Use res_ninit() when it's implemented on Fuchsia.
--#if defined(OS_OPENBSD) || defined(OS_FUCHSIA)
-+#if defined(OS_OPENBSD) || defined(OS_FUCHSIA) || (defined(OS_LINUX) && !defined(__GLIBC__))
-   // Note: res_ninit in glibc always returns 0 and sets RES_INIT.
-   // res_init behaves the same way.
-   memset(&_res, 0, sizeof(_res));
-@@ -173,7 +173,7 @@ ConfigParsePosixResult ReadDnsConfig(DnsConfig* dns_config) {
- #else
-   res_nclose(&res);
- #endif  // defined(OS_MACOSX) || defined(OS_FREEBSD)
--#endif  // defined(OS_OPENBSD)
-+#endif  // defined(OS_OPENBSD) || defined(OS_FUCHSIA) || (defined(OS_LINUX) && !defined(__GLIBC__))
- 
- #if defined(OS_MACOSX) && !defined(OS_IOS)
-   ConfigParsePosixResult error = DnsConfigWatcher::CheckDnsConfig();
-diff --git a/net/dns/dns_reloader.cc b/net/dns/dns_reloader.cc
-index 952cff4..4b366f4 100644
---- a/net/dns/dns_reloader.cc
-+++ b/net/dns/dns_reloader.cc
-@@ -4,7 +4,7 @@
- 
- #include "net/dns/dns_reloader.h"
- 
--#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \
-+#if defined(OS_POSIX) && defined(__GLIBC__) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \
-     !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
- 
- #include <resolv.h>
-diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc
-index e8dea46..c86a830 100644
---- a/net/dns/host_resolver_manager.cc
-+++ b/net/dns/host_resolver_manager.cc
-@@ -2386,7 +2386,7 @@ HostResolverManager::HostResolverManager(
-   NetworkChangeNotifier::AddConnectionTypeObserver(this);
-   if (system_dns_config_notifier_)
-     system_dns_config_notifier_->AddObserver(this);
--#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \
-+#if defined(OS_POSIX) && defined(__GLIBC__) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \
-     !defined(OS_ANDROID)
-   EnsureDnsReloaderInit();
- #endif
-diff --git a/net/dns/host_resolver_proc.cc b/net/dns/host_resolver_proc.cc
-index 0824540..3384978 100644
---- a/net/dns/host_resolver_proc.cc
-+++ b/net/dns/host_resolver_proc.cc
-@@ -197,7 +197,7 @@ int SystemHostResolverCall(const std::string& host,
-   base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
-                                                 base::BlockingType::WILL_BLOCK);
- 
--#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \
-+#if defined(OS_POSIX) && defined(__GLIBC__) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \
-     !defined(OS_ANDROID) && !defined(OS_FUCHSIA)
-   DnsReloaderMaybeReload();
- #endif
diff --git a/srcpkgs/electron9/files/musl-patches/chromium-musl_exeinfo.patch b/srcpkgs/electron9/files/musl-patches/chromium-musl_exeinfo.patch
deleted file mode 100644
index f1afc7c1b176..000000000000
--- a/srcpkgs/electron9/files/musl-patches/chromium-musl_exeinfo.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-diff --git a/base/debug/stack_trace_posix.cc b/base/debug/stack_trace_posix.cc
-index de2f356..f697c66 100644
---- a/base/debug/stack_trace_posix.cc
-+++ b/base/debug/stack_trace_posix.cc
-@@ -27,7 +27,7 @@
- #if !defined(USE_SYMBOLIZE)
- #include <cxxabi.h>
- #endif
--#if !defined(__UCLIBC__) && !defined(_AIX)
-+#if defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(_AIX)
- #include <execinfo.h>
- #endif
- 
-@@ -86,7 +86,7 @@ void DemangleSymbols(std::string* text) {
-   // Note: code in this function is NOT async-signal safe (std::string uses
-   // malloc internally).
- 
--#if !defined(__UCLIBC__) && !defined(_AIX)
-+#if defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(_AIX)
-   std::string::size_type search_from = 0;
-   while (search_from < text->size()) {
-     // Look for the start of a mangled symbol, from search_from.
-@@ -121,7 +121,7 @@ void DemangleSymbols(std::string* text) {
-       search_from = mangled_start + 2;
-     }
-   }
--#endif  // !defined(__UCLIBC__) && !defined(_AIX)
-+#endif  // defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(_AIX)
- }
- #endif  // !defined(USE_SYMBOLIZE)
- 
-@@ -133,7 +133,7 @@ class BacktraceOutputHandler {
-   virtual ~BacktraceOutputHandler() = default;
- };
- 
--#if !defined(__UCLIBC__) && !defined(_AIX)
-+#if defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(_AIX)
- void OutputPointer(void* pointer, BacktraceOutputHandler* handler) {
-   // This should be more than enough to store a 64-bit number in hex:
-   // 16 hex digits + 1 for null-terminator.
-@@ -216,7 +216,7 @@ void ProcessBacktrace(void* const* trace,
-   }
- #endif  // defined(USE_SYMBOLIZE)
- }
--#endif  // !defined(__UCLIBC__) && !defined(_AIX)
-+#endif  // defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(_AIX)
- 
- void PrintToStderr(const char* output) {
-   // NOTE: This code MUST be async-signal safe (it's used by in-process
-@@ -828,7 +828,7 @@ size_t CollectStackTrace(void** trace, size_t count) {
-   // NOTE: This code MUST be async-signal safe (it's used by in-process
-   // stack dumping signal handler). NO malloc or stdio is allowed here.
- 
--#if !defined(__UCLIBC__) && !defined(_AIX)
-+#if defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(_AIX)
-   // Though the backtrace API man page does not list any possible negative
-   // return values, we take no chance.
-   return base::saturated_cast<size_t>(backtrace(trace, count));
-@@ -841,13 +841,13 @@ void StackTrace::PrintWithPrefix(const char* prefix_string) const {
- // NOTE: This code MUST be async-signal safe (it's used by in-process
- // stack dumping signal handler). NO malloc or stdio is allowed here.
- 
--#if !defined(__UCLIBC__) && !defined(_AIX)
-+#if defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(_AIX)
-   PrintBacktraceOutputHandler handler;
-   ProcessBacktrace(trace_, count_, prefix_string, &handler);
- #endif
- }
- 
--#if !defined(__UCLIBC__) && !defined(_AIX)
-+#if defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(_AIX)
- void StackTrace::OutputToStreamWithPrefix(std::ostream* os,
-                                           const char* prefix_string) const {
-   StreamBacktraceOutputHandler handler(os);
-diff --git a/third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h b/third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h
-index 798f150..97acc7c 100644
---- a/third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h
-+++ b/third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h
-@@ -14,7 +14,7 @@
- #define ENABLE_CRASH_OVERRIDES 1
- 
- /* Define to 1 if you have the `backtrace' function. */
--#define HAVE_BACKTRACE 1
-+/* #undef HAVE_BACKTRACE */
- 
- /* Define to 1 if you have the <CrashReporterClient.h> header file. */
- /* #undef HAVE_CRASHREPORTERCLIENT_H */
-@@ -55,7 +55,7 @@
- #define HAVE_ERRNO_H 1
- 
- /* Define to 1 if you have the <execinfo.h> header file. */
--#define HAVE_EXECINFO_H 1
-+/* #undef HAVE_EXECINFO_H */
- 
- /* Define to 1 if you have the <fcntl.h> header file. */
- #define HAVE_FCNTL_H 1
diff --git a/srcpkgs/electron9/files/musl-patches/chromium-musl_fpstate_t.patch b/srcpkgs/electron9/files/musl-patches/chromium-musl_fpstate_t.patch
deleted file mode 100644
index d8c41ccd9a03..000000000000
--- a/srcpkgs/electron9/files/musl-patches/chromium-musl_fpstate_t.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
-index 6ee6cc1..a8f9ccc 100644
---- a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
-@@ -49,7 +49,7 @@ uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
- }
- 
- void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
--                                    const struct _libc_fpstate* fp) {
-+                                    const struct _fpstate* fp) {
-   const greg_t* regs = uc->uc_mcontext.gregs;
- 
-   out->context_flags = MD_CONTEXT_X86_FULL |
-@@ -97,7 +97,7 @@ uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
- }
- 
- void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
--                                    const struct _libc_fpstate* fpregs) {
-+                                    const struct _fpstate* fpregs) {
-   const greg_t* regs = uc->uc_mcontext.gregs;
- 
-   out->context_flags = MD_CONTEXT_AMD64_FULL;
-diff --git a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
-index f830618..f3dde1f 100644
---- a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
-+++ b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
-@@ -50,7 +50,7 @@ struct UContextReader {
-   //   info: the collection of register structures.
- #if defined(__i386__) || defined(__x86_64)
-   static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
--                             const struct _libc_fpstate* fp);
-+                             const struct _fpstate* fp);
- #elif defined(__aarch64__)
-   static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
-                              const struct fpsimd_context* fpregs);
-diff --git a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
-index d1dc331..d1cc562 100644
---- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
-+++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
-@@ -48,7 +48,7 @@ class ExceptionHandler;
- #if defined(__aarch64__)
- typedef struct fpsimd_context fpstate_t;
- #elif !defined(__ARM_EABI__) && !defined(__mips__)
--typedef struct _libc_fpstate fpstate_t;
-+typedef struct _fpstate fpstate_t;
- #endif
- 
- // These entries store a list of memory regions that the client wants included
diff --git a/srcpkgs/electron9/files/musl-patches/chromium-musl_getcontext.patch b/srcpkgs/electron9/files/musl-patches/chromium-musl_getcontext.patch
deleted file mode 100644
index 7697243a9104..000000000000
--- a/srcpkgs/electron9/files/musl-patches/chromium-musl_getcontext.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc b/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
-index b895f6d..4f13352 100644
---- a/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
-@@ -490,7 +490,9 @@ bool ExceptionHandler::SimulateSignalDelivery(int sig) {
-   siginfo.si_code = SI_USER;
-   siginfo.si_pid = getpid();
-   ucontext_t context;
-+#if defined(__GLIBC__)
-   getcontext(&context);
-+#endif
-   return HandleSignal(sig, &siginfo, &context);
- }
- 
-@@ -675,8 +677,10 @@ bool ExceptionHandler::WriteMinidump() {
-   sys_prctl(PR_SET_DUMPABLE, 1, 0, 0, 0);
- 
-   CrashContext context;
-+#if defined(__GLIBC__)
-   int getcontext_result = getcontext(&context.context);
-   if (getcontext_result)
-+#endif
-     return false;
- 
- #if defined(__i386__)
diff --git a/srcpkgs/electron9/files/musl-patches/chromium-musl_mallinfo.patch b/srcpkgs/electron9/files/musl-patches/chromium-musl_mallinfo.patch
deleted file mode 100644
index 941313e49397..000000000000
--- a/srcpkgs/electron9/files/musl-patches/chromium-musl_mallinfo.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff --git a/base/process/process_metrics_posix.cc b/base/process/process_metrics_posix.cc
-index 044bd8d..0521321 100644
---- a/base/process/process_metrics_posix.cc
-+++ b/base/process/process_metrics_posix.cc
-@@ -110,14 +110,14 @@ size_t ProcessMetrics::GetMallocUsage() {
-   malloc_statistics_t stats = {0};
-   malloc_zone_statistics(nullptr, &stats);
-   return stats.size_in_use;
--#elif defined(OS_LINUX) || defined(OS_ANDROID)
-+#elif (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_ANDROID)
-   struct mallinfo minfo = mallinfo();
- #if BUILDFLAG(USE_TCMALLOC)
-   return minfo.uordblks;
- #else
-   return minfo.hblkhd + minfo.arena;
- #endif
--#elif defined(OS_FUCHSIA)
-+#else
-   // TODO(fuchsia): Not currently exposed. https://crbug.com/735087.
-   return 0;
- #endif
-diff --git a/base/trace_event/malloc_dump_provider.cc b/base/trace_event/malloc_dump_provider.cc
-index e89597c..eca258c 100644
---- a/base/trace_event/malloc_dump_provider.cc
-+++ b/base/trace_event/malloc_dump_provider.cc
-@@ -132,7 +132,7 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args,
-   }
- #elif defined(OS_FUCHSIA)
- // TODO(fuchsia): Port, see https://crbug.com/706592.
--#else
-+#elif defined(OS_LINUX) && defined(__GLIBC__)
-   struct mallinfo info = mallinfo();
-   DCHECK_GE(info.arena + info.hblkhd, info.uordblks);
- 
-diff --git a/third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h b/third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h
-index aa98242..97acc7c 100644
---- a/third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h
-+++ b/third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h
-@@ -130,7 +130,7 @@
- /* #undef HAVE_MALLCTL */
- 
- /* Define to 1 if you have the `mallinfo' function. */
--#define HAVE_MALLINFO 1
-+/* #undef HAVE_MALLINFO */
- 
- /* Define to 1 if you have the <malloc.h> header file. */
- #define HAVE_MALLOC_H 1
-diff --git a/third_party/swiftshader/third_party/llvm-7.0/configs/linux/include/llvm/Config/config.h b/third_party/swiftshader/third_party/llvm-7.0/configs/linux/include/llvm/Config/config.h
-index 6e17020..d4a9ed0 100644
---- a/third_party/swiftshader/third_party/llvm-7.0/configs/linux/include/llvm/Config/config.h
-+++ b/third_party/swiftshader/third_party/llvm-7.0/configs/linux/include/llvm/Config/config.h
-@@ -122,7 +122,7 @@
- /* #undef HAVE_MALLCTL */
-
- /* Define to 1 if you have the `mallinfo' function. */
--#define HAVE_MALLINFO 1
-+/* #undef HAVE_MALLINFO */
-
- /* Define to 1 if you have the <malloc.h> header file. */
- #define HAVE_MALLOC_H 1
-
diff --git a/srcpkgs/electron9/files/musl-patches/chromium-musl_pread_pwrite64.patch b/srcpkgs/electron9/files/musl-patches/chromium-musl_pread_pwrite64.patch
deleted file mode 100644
index 2aeaaeb7593f..000000000000
--- a/srcpkgs/electron9/files/musl-patches/chromium-musl_pread_pwrite64.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/third_party/lss/linux_syscall_support.h b/third_party/lss/linux_syscall_support.h
-index 5d9c2e8..2682349 100644
---- a/third_party/lss/linux_syscall_support.h
-+++ b/third_party/lss/linux_syscall_support.h
-@@ -166,6 +166,13 @@ extern "C" {
- # undef __NR_waitpid
- #endif
- 
-+#ifdef pread64
-+#undef pread64
-+#endif
-+#ifdef pwrite64
-+#undef pwrite64
-+#endif
-+
- /* As glibc often provides subtly incompatible data structures (and implicit
-  * wrapper functions that convert them), we provide our own kernel data
-  * structures for use by the system calls.
diff --git a/srcpkgs/electron9/files/musl-patches/chromium-musl_push_back.patch b/srcpkgs/electron9/files/musl-patches/chromium-musl_push_back.patch
deleted file mode 100644
index cff340287da5..000000000000
--- a/srcpkgs/electron9/files/musl-patches/chromium-musl_push_back.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/net/socket/udp_socket_posix.cc b/net/socket/udp_socket_posix.cc
-index 08bf79c..3ee5353 100644
---- a/net/socket/udp_socket_posix.cc
-+++ b/net/socket/udp_socket_posix.cc
-@@ -1194,7 +1194,7 @@ SendResult UDPSocketPosixSender::InternalSendmmsgBuffers(
-     msg_iov->push_back({const_cast<char*>(buffer->data()), buffer->length()});
-   msgvec->reserve(buffers.size());
-   for (size_t j = 0; j < buffers.size(); j++)
--    msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, nullptr, 0, 0}, 0});
-+    msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, 0, nullptr, 0, 0, 0}, 0});
-   int result = HANDLE_EINTR(Sendmmsg(fd, &msgvec[0], buffers.size(), 0));
-   SendResult send_result(0, 0, std::move(buffers));
-   if (result < 0) {
diff --git a/srcpkgs/electron9/files/musl-patches/chromium-musl_stack_size.patch b/srcpkgs/electron9/files/musl-patches/chromium-musl_stack_size.patch
deleted file mode 100644
index cf41d27ade6e..000000000000
--- a/srcpkgs/electron9/files/musl-patches/chromium-musl_stack_size.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/third_party/blink/renderer/platform/wtf/stack_util.cc b/third_party/blink/renderer/platform/wtf/stack_util.cc
-index b242164..1a0b519 100644
---- a/third_party/blink/renderer/platform/wtf/stack_util.cc
-+++ b/third_party/blink/renderer/platform/wtf/stack_util.cc
-@@ -28,7 +28,7 @@
- // FIXME: On Mac OSX and Linux, this method cannot estimate stack size
- // correctly for the main thread.
- 
--#elif defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
-+#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
-     defined(OS_FUCHSIA)
-   // pthread_getattr_np() can fail if the thread is not invoked by
-   // pthread_create() (e.g., the main thread of blink_unittests).
-@@ -55,6 +55,9 @@ size_t GetUnderestimatedStackSize() {
-   pthread_attr_destroy(&attr);
- #endif
- 
-+#if defined(OS_LINUX) && !defined(__GLIBC__)
-+  return 0;
-+#else
-   // Return a 512k stack size, (conservatively) assuming the following:
-   //  - that size is much lower than the pthreads default (x86 pthreads has a 2M
-   //    default.)
-@@ -62,6 +65,8 @@ size_t GetUnderestimatedStackSize() {
-   //    low as 512k.
-   //
-   return 512 * 1024;
-+#endif
-+
- #elif defined(OS_MACOSX)
-   // pthread_get_stacksize_np() returns too low a value for the main thread on
-   // OSX 10.9,
-@@ -97,7 +102,7 @@ return Threading::ThreadStackSize();
- }
- 
- void* GetStackStart() {
--#if defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
-+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
-     defined(OS_FUCHSIA)
-   pthread_attr_t attr;
-   int error;
diff --git a/srcpkgs/electron9/files/musl-patches/chromium-musl_stack_trace.patch b/srcpkgs/electron9/files/musl-patches/chromium-musl_stack_trace.patch
deleted file mode 100644
index 9a1f2b044583..000000000000
--- a/srcpkgs/electron9/files/musl-patches/chromium-musl_stack_trace.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/base/debug/stack_trace.cc b/base/debug/stack_trace.cc
-index d8ca822..ffe1f08 100644
---- a/base/debug/stack_trace.cc
-+++ b/base/debug/stack_trace.cc
-@@ -225,7 +225,9 @@ void StackTrace::Print() const {
- }
-
- void StackTrace::OutputToStream(std::ostream* os) const {
-+#if defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(_AIX)
-   OutputToStreamWithPrefix(os, nullptr);
-+#endif
- }
-
- std::string StackTrace::ToString() const {
-@@ -233,14 +233,14 @@ std::string StackTrace::ToString() const {
- }
- std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const {
-   std::stringstream stream;
--#if !defined(__UCLIBC__) && !defined(_AIX)
-+#if defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(_AIX)
-   OutputToStreamWithPrefix(&stream, prefix_string);
- #endif
-   return stream.str();
- }
- 
- std::ostream& operator<<(std::ostream& os, const StackTrace& s) {
--#if !defined(__UCLIBC__) & !defined(_AIX)
-+#if defined(__GLIBC__) && !defined(__UCLIBC__) & !defined(_AIX)
-   s.OutputToStream(&os);
- #else
-   os << "StackTrace::OutputToStream not implemented.";
-diff --git a/base/logging.cc b/base/logging.cc
-index 36b8bfc..dd830fe 100644
---- a/base/logging.cc
-+++ b/base/logging.cc
-@@ -607,7 +607,7 @@ LogMessage::LogMessage(const char* file, int line, LogSeverity severity,
- LogMessage::~LogMessage() {
-   size_t stack_start = stream_.tellp();
- #if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && !defined(__UCLIBC__) && \
--    !defined(OS_AIX)
-+    !defined(OS_AIX) && defined(__GLIBC__)
-   if (severity_ == LOG_FATAL && !base::debug::BeingDebugged()) {
-     // Include a stack trace on a fatal, unless a debugger is attached.
-     base::debug::StackTrace stack_trace;
diff --git a/srcpkgs/electron9/files/musl-patches/chromium-musl_tcp_listen.patch b/srcpkgs/electron9/files/musl-patches/chromium-musl_tcp_listen.patch
deleted file mode 100644
index fa62317b11ac..000000000000
--- a/srcpkgs/electron9/files/musl-patches/chromium-musl_tcp_listen.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/content/public/common/socket_permission_request.h b/content/public/common/socket_permission_request.h
-index 7316621..6171219 100644
---- a/content/public/common/socket_permission_request.h
-+++ b/content/public/common/socket_permission_request.h
-@@ -9,6 +9,9 @@
- 
- #include <string>
- 
-+#ifdef TCP_LISTEN
-+#undef TCP_LISTEN
-+#endif
- 
- namespace content {
- 
diff --git a/srcpkgs/electron9/files/musl-patches/chromium-musl_wordsize.patch b/srcpkgs/electron9/files/musl-patches/chromium-musl_wordsize.patch
deleted file mode 100644
index 6208cffafbe3..000000000000
--- a/srcpkgs/electron9/files/musl-patches/chromium-musl_wordsize.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h b/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h
-index d03c7a8..78ca9dd 100644
---- a/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h
-+++ b/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h
-@@ -36,6 +36,7 @@
- #include <elf.h>
- #include <link.h>
- #include <stddef.h>
-+#include <limits.h>
- 
- #include "common/memory_range.h"
- 
-@@ -51,9 +52,9 @@ class ElfCoreDump {
-   typedef ElfW(Phdr) Phdr;
-   typedef ElfW(Word) Word;
-   typedef ElfW(Addr) Addr;
--#if __WORDSIZE == 32
-+#if ULONG_MAX == 0xffffffff
-   static const int kClass = ELFCLASS32;
--#elif __WORDSIZE == 64
-+#elif ULONG_MAX == 0xffffffffffffffff
-   static const int kClass = ELFCLASS64;
- #else
- #error "Unsupported __WORDSIZE for ElfCoreDump."
diff --git a/srcpkgs/electron9/files/musl-patches/chromium-musl_xxx_ppc64le.patch b/srcpkgs/electron9/files/musl-patches/chromium-musl_xxx_ppc64le.patch
deleted file mode 100644
index c5ae3ea18ac0..000000000000
--- a/srcpkgs/electron9/files/musl-patches/chromium-musl_xxx_ppc64le.patch
+++ /dev/null
@@ -1,187 +0,0 @@
-From 5aadb50aa4d5220ff38c25fc7c5333ffd0abbc27 Mon Sep 17 00:00:00 2001
-From: Daniel Kolesa <daniel@octaforge.org>
-Date: Sun, 13 Sep 2020 00:10:49 +0200
-Subject: [PATCH] ppc64le musl bits
-
----
- sandbox/linux/bpf_dsl/seccomp_macros.h                     | 6 +++---
- sandbox/linux/seccomp-bpf/syscall.cc                       | 4 ++--
- .../abseil-cpp/absl/base/internal/unscaledcycleclock.h     | 2 +-
- .../src/client/linux/dump_writer_common/thread_info.cc     | 7 +++++--
- .../src/client/linux/dump_writer_common/ucontext_reader.cc | 7 +++++--
- .../breakpad/src/client/linux/handler/exception_handler.cc | 5 +++++
- .../crashpad/crashpad/snapshot/linux/signal_context.h      | 2 +-
- third_party/crashpad/crashpad/util/linux/thread_info.h     | 1 +
- third_party/lss/linux_syscall_support.h                    | 4 ++++
- 9 files changed, 27 insertions(+), 11 deletions(-)
-
-diff --git a/sandbox/linux/bpf_dsl/seccomp_macros.h b/sandbox/linux/bpf_dsl/seccomp_macros.h
-index a6aec544e0..2a4a7f1bca 100644
---- a/sandbox/linux/bpf_dsl/seccomp_macros.h
-+++ b/sandbox/linux/bpf_dsl/seccomp_macros.h
-@@ -16,7 +16,7 @@
- #if defined(__mips__)
- // sys/user.h in eglibc misses size_t definition
- #include <stddef.h>
--#elif defined(__powerpc64__)
-+#elif defined(__powerpc64__) && defined(__GLIBC__)
- // Manually define greg_t on ppc64
- typedef unsigned long long greg_t;
- #endif
-@@ -361,11 +361,11 @@ typedef struct pt_regs regs_struct;
- #define SECCOMP_ARCH AUDIT_ARCH_PPC64
- #endif
- 
--#define SECCOMP_REG(_ctx, _reg) ((_ctx)->uc_mcontext.regs->gpr[_reg])
-+#define SECCOMP_REG(_ctx, _reg) (((struct pt_regs *)(_ctx)->uc_mcontext.regs)->gpr[_reg])
- 
- #define SECCOMP_RESULT(_ctx) SECCOMP_REG(_ctx, 3)
- #define SECCOMP_SYSCALL(_ctx) SECCOMP_REG(_ctx, 0)
--#define SECCOMP_IP(_ctx) (_ctx)->uc_mcontext.regs->nip
-+#define SECCOMP_IP(_ctx) ((struct pt_regs *)(_ctx)->uc_mcontext.regs)->nip
- #define SECCOMP_PARM1(_ctx) SECCOMP_REG(_ctx, 3)
- #define SECCOMP_PARM2(_ctx) SECCOMP_REG(_ctx, 4)
- #define SECCOMP_PARM3(_ctx) SECCOMP_REG(_ctx, 5)
-diff --git a/sandbox/linux/seccomp-bpf/syscall.cc b/sandbox/linux/seccomp-bpf/syscall.cc
-index 10fa5fd070..30b7b3851f 100644
---- a/sandbox/linux/seccomp-bpf/syscall.cc
-+++ b/sandbox/linux/seccomp-bpf/syscall.cc
-@@ -497,9 +497,9 @@ void Syscall::PutValueInUcontext(intptr_t ret_val, ucontext_t* ctx) {
-   // Same as MIPS, need to invert ret and set error register (cr0.SO)
-   if (ret_val <= -1 && ret_val >= -4095) {
-     ret_val = -ret_val;
--    ctx->uc_mcontext.regs->ccr |= (1 << 28);
-+    ((struct pt_regs *)ctx->uc_mcontext.regs)->ccr |= (1 << 28);
-   } else {
--    ctx->uc_mcontext.regs->ccr &= ~(1 << 28);
-+    ((struct pt_regs *)ctx->uc_mcontext.regs)->ccr &= ~(1 << 28);
-   }
- #endif
-   SECCOMP_RESULT(ctx) = static_cast<greg_t>(ret_val);
-diff --git a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
-index cdce9bf8a8..73d77dda4d 100644
---- a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
-+++ b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
-@@ -46,7 +46,7 @@
- 
- // The following platforms have an implementation of a hardware counter.
- #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
--  defined(__powerpc__) || defined(__ppc__) || \
-+  ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \
-   defined(_M_IX86) || defined(_M_X64)
- #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
- #else
-diff --git a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
-index 03afec7a58..0264ecf135 100644
---- a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
-@@ -273,6 +273,9 @@ void ThreadInfo::FillCPUContext(RawContextCPU* out) const {
- 
- #elif defined(__powerpc64__)
- 
-+#include <asm/elf.h>
-+#include <asm/ptrace.h>
-+
- uintptr_t ThreadInfo::GetInstructionPointer() const {
-     return mcontext.gp_regs[PT_NIP];
- }
-@@ -290,9 +293,9 @@ void ThreadInfo::FillCPUContext(RawContextCPU* out) const {
-     out->ctr = mcontext.gp_regs[PT_CTR];
-     
-     for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
--        out->float_save.fpregs[i] = mcontext.fp_regs[i];
-+        out->float_save.fpregs[i] = ((uint64_t *)&mcontext.fp_regs)[i];
- 
--    out->float_save.fpscr = mcontext.fp_regs[NFPREG-1];
-+    out->float_save.fpscr = ((uint64_t *)&mcontext.fp_regs)[ELF_NFPREG-1];
- 
-     for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++)
-         out->vector_save.save_vr[i] = \
-diff --git a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
-index 7620cf6f79..54e373611f 100644
---- a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
-@@ -257,6 +257,9 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) {
- 
- #elif defined(__powerpc64__)
- 
-+#include <asm/elf.h>
-+#include <asm/ptrace.h>
-+
- uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
-     return uc->uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP];
- }
-@@ -280,9 +283,9 @@ void UContextReader::FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
-     out->ctr = uc->uc_mcontext.gp_regs[PT_CTR];
-     
-     for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
--        out->float_save.fpregs[i] = uc->uc_mcontext.fp_regs[i];
-+        out->float_save.fpregs[i] = ((uint64_t *)&uc->uc_mcontext.fp_regs)[i];
- 
--    out->float_save.fpscr = uc->uc_mcontext.fp_regs[NFPREG-1];
-+    out->float_save.fpscr = ((uint64_t *)&uc->uc_mcontext.fp_regs)[ELF_NFPREG-1];
- 
-     for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++)
-         out->vector_save.save_vr[i] =
-diff --git a/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc b/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
-index 826c9e0c21..9bb4f6a3e4 100644
---- a/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
-@@ -105,6 +105,11 @@
- #define PR_SET_PTRACER 0x59616d61
- #endif
- 
-+/* musl hack, can't include asm/ptrace.h as that causes conflicts */
-+#if defined(__powerpc64__) && !defined(PT_NIP)
-+#define PT_NIP 32
-+#endif
-+
- namespace google_breakpad {
- 
- namespace {
-diff --git a/third_party/crashpad/crashpad/snapshot/linux/signal_context.h b/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
-index a1f2da2591..e6a5bd72ab 100644
---- a/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
-+++ b/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
-@@ -469,7 +469,7 @@ struct MContext64 {
-   SignalThreadContext64 gp_regs;
-   SignalFloatContext64  fp_regs;
-   SignalVectorContext64 *v_regs;
--  int64_t vmx_reserve[69];
-+  int64_t vmx_reserve[101];
- };
- 
- struct ContextTraits64 : public Traits64 {
-diff --git a/third_party/crashpad/crashpad/util/linux/thread_info.h b/third_party/crashpad/crashpad/util/linux/thread_info.h
-index dea0d1f39e..b203e5b2f2 100644
---- a/third_party/crashpad/crashpad/util/linux/thread_info.h
-+++ b/third_party/crashpad/crashpad/util/linux/thread_info.h
-@@ -30,6 +30,7 @@
- 
- #if defined(ARCH_CPU_PPC64_FAMILY)
- #include <sys/ucontext.h>
-+#include <asm/ptrace.h>
- #endif
- 
- namespace crashpad {
-diff --git a/third_party/lss/linux_syscall_support.h b/third_party/lss/linux_syscall_support.h
-index 4c02137faa..259c5726d7 100644
---- a/third_party/lss/linux_syscall_support.h
-+++ b/third_party/lss/linux_syscall_support.h
-@@ -4223,9 +4223,13 @@ struct kernel_statfs {
-     }
-   #endif
-   #if defined(__NR_fstatat64)
-+    // musl does #define fstatat64 fstatat
-+    #undef fstatat64
-     LSS_INLINE _syscall4(int,   fstatat64,        int,   d,
-                          const char *,      p,
-                          struct kernel_stat64 *,   b,    int,   f)
-+    // set it back like it was
-+    #define fstatat64 fstatat
-   #endif
-   #if defined(__NR_waitpid)
-     // waitpid is polyfilled below when not available.
--- 
-2.28.0
-
diff --git a/srcpkgs/electron9/files/patches/chromium-83-gcc-10.patch b/srcpkgs/electron9/files/patches/chromium-83-gcc-10.patch
deleted file mode 100644
index 974b49cde703..000000000000
--- a/srcpkgs/electron9/files/patches/chromium-83-gcc-10.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From e473f41284ccc8fa4bc4622d087194b18a1ec23a Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Tue, 7 Apr 2020 16:37:10 +0000
-Subject: [PATCH] GCC: fix includes for gcc-10
-
----
- chrome/browser/search/background/ntp_backgrounds.h              | 1 +
- third_party/webrtc/call/rtx_receive_stream.h                    | 1 +
- .../webrtc/modules/audio_processing/aec3/clockdrift_detector.h  | 1 +
- ui/gfx/linux/drm_util_linux.h                                   | 2 ++
- 5 files changed, 6 insertions(+)
-
-diff --git a/chrome/browser/search/background/ntp_backgrounds.h b/chrome/browser/search/background/ntp_backgrounds.h
-index 7afc0a2..ea5818e 100644
---- a/chrome/browser/search/background/ntp_backgrounds.h
-+++ b/chrome/browser/search/background/ntp_backgrounds.h
-@@ -6,6 +6,7 @@
- #define CHROME_BROWSER_SEARCH_BACKGROUND_NTP_BACKGROUNDS_H_
- 
- #include <array>
-+#include <cstddef>
- 
- class GURL;
- 
-diff --git a/third_party/webrtc/call/rtx_receive_stream.h b/third_party/webrtc/call/rtx_receive_stream.h
-index 8ffa440..113a816 100644
---- a/third_party/webrtc/call/rtx_receive_stream.h
-+++ b/third_party/webrtc/call/rtx_receive_stream.h
-@@ -12,6 +12,7 @@
- #define CALL_RTX_RECEIVE_STREAM_H_
- 
- #include <map>
-+#include <cstdint>
- 
- #include "call/rtp_packet_sink_interface.h"
- 
-diff --git a/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h b/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h
-index 22528c9..69e624e 100644
---- a/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h
-+++ b/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h
-@@ -12,6 +12,7 @@
- #define MODULES_AUDIO_PROCESSING_AEC3_CLOCKDRIFT_DETECTOR_H_
- 
- #include <array>
-+#include <cstddef>
- 
- namespace webrtc {
- 
-diff --git a/ui/gfx/linux/drm_util_linux.h b/ui/gfx/linux/drm_util_linux.h
-index 86ff2eb..990f12c 100644
---- a/ui/gfx/linux/drm_util_linux.h
-+++ b/ui/gfx/linux/drm_util_linux.h
-@@ -7,6 +7,8 @@
- 
- #include "ui/gfx/buffer_types.h"
- 
-+#include <cstdint>
-+
- namespace ui {
- 
- int GetFourCCFormatFromBufferFormat(gfx::BufferFormat format);
--- 
-2.24.1
-
diff --git a/srcpkgs/electron9/files/patches/chromium-add-missing-algorithm-header-in-crx_install_error.cc.patch b/srcpkgs/electron9/files/patches/chromium-add-missing-algorithm-header-in-crx_install_error.cc.patch
deleted file mode 100644
index 570f7b319534..000000000000
--- a/srcpkgs/electron9/files/patches/chromium-add-missing-algorithm-header-in-crx_install_error.cc.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 2b9d6daa0ab5ce45ec5555466d5a5a583a020ea8 Mon Sep 17 00:00:00 2001
-From: Daniel Playfair Cal <daniel.playfair.cal@gmail.com>
-Date: Sat, 18 Apr 2020 00:27:38 +0000
-Subject: [PATCH] Add missing algorithm header in crx_install_error.cc
-
-This is needed for the use of std::find.
-
-Change-Id: I2dc43b3887c467986c5346be5a9e27a987e1e5b3
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2152333
-Reviewed-by: Ken Rockot <rockot@google.com>
-Commit-Queue: Ken Rockot <rockot@google.com>
-Cr-Commit-Position: refs/heads/master@{#760272}
----
- extensions/browser/install/crx_install_error.cc | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/extensions/browser/install/crx_install_error.cc b/extensions/browser/install/crx_install_error.cc
-index a9765bb0a5a..bd0d3e35a16 100644
---- a/extensions/browser/install/crx_install_error.cc
-+++ b/extensions/browser/install/crx_install_error.cc
-@@ -4,6 +4,8 @@
- 
- #include "extensions/browser/install/crx_install_error.h"
- 
-+#include <algorithm>
-+
- #include "base/logging.h"
- #include "extensions/browser/install/sandboxed_unpacker_failure_reason.h"
- 
diff --git a/srcpkgs/electron9/files/patches/chromium-avoid-double-destruction-of-ServiceWorkerObjectHost.patch b/srcpkgs/electron9/files/patches/chromium-avoid-double-destruction-of-ServiceWorkerObjectHost.patch
deleted file mode 100644
index 5e1df005c961..000000000000
--- a/srcpkgs/electron9/files/patches/chromium-avoid-double-destruction-of-ServiceWorkerObjectHost.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-From bd59ce32629ef684624821419c43967b73d2989e Mon Sep 17 00:00:00 2001
-From: Hiroki Nakagawa <nhiroki@chromium.org>
-Date: Fri, 8 May 2020 08:25:31 +0000
-Subject: [PATCH] ServiceWorker: Avoid double destruction of
- ServiceWorkerObjectHost on connection error
-
-This CL avoids the case where ServiceWorkerObjectHost is destroyed twice
-on ServiceWorkerObjectHost::OnConnectionError() when Chromium is built
-with the GCC build toolchain.
-
-> How does the issue happen?
-
-ServiceWorkerObjectHost has a cyclic reference like this:
-
-ServiceWorkerObjectHost
-  --([1] scoped_refptr)--> ServiceWorkerVersion
-    --([2] std::unique_ptr)--> ServiceWorkerProviderHost
-      --([3] std::unique_ptr)--> ServiceWorkerContainerHost
-        --([4] std::unique_ptr)--> ServiceWorkerObjectHost
-
-Note that ServiceWorkerContainerHost manages ServiceWorkerObjectHost in
-map<int64_t version_id, std::unique_ptr<ServiceWorkerObjectHost>>.
-
-When ServiceWorkerObjectHost::OnConnectionError() is called, the
-function removes the reference [4] from the map, and destroys
-ServiceWorkerObjectHost. If the object host has the last reference [1]
-to ServiceWorkerVersion, the destruction also cuts off the references
-[2] and [3], and destroys ServiceWorkerProviderHost and
-ServiceWorkerContainerHost.
-
-This seems to work well on the Chromium's default toolchain, but not
-work on the GCC toolchain. According to the report, destruction of
-ServiceWorkerContainerHost happens while the map owned by the container
-host is erasing the ServiceWorkerObjectHost, and this results in crash
-due to double destruction of the object host.
-
-I don't know the reason why this happens only on the GCC toolchain, but
-I suspect the order of object destruction on std::map::erase() could be
-different depending on the toolchains.
-
-> How does this CL fix this?
-
-The ideal fix is to redesign the ownership model of
-ServiceWorkerVersion, but it's not feasible in the short term.
-
-Instead, this CL avoids destruction of ServiceWorkerObjectHost on
-std::map::erase(). The new code takes the ownership of the object host
-from the map first, and then erases the entry from the map. This
-separates timings to erase the map entry and to destroy the object host,
-so the crash should no longer happen.
-
-Bug: 1056598
-Change-Id: Id30654cb575bc557c42044d6f0c6f1f9bfaed613
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2094496
-Reviewed-by: Makoto Shimazu <shimazu@chromium.org>
-Commit-Queue: Hiroki Nakagawa <nhiroki@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#766770}
----
- .../service_worker_container_host.cc          | 10 +++++
- .../service_worker_object_host_unittest.cc    | 38 +++++++++++++++++++
- 2 files changed, 48 insertions(+)
-
-diff --git a/content/browser/service_worker/service_worker_container_host.cc b/content/browser/service_worker/service_worker_container_host.cc
-index ec7fb1449af..98c62093b0e 100644
---- a/content/browser/service_worker/service_worker_container_host.cc
-+++ b/content/browser/service_worker/service_worker_container_host.cc
-@@ -669,6 +669,16 @@ void ServiceWorkerContainerHost::RemoveServiceWorkerObjectHost(
-     int64_t version_id) {
-   DCHECK_CURRENTLY_ON(ServiceWorkerContext::GetCoreThreadId());
-   DCHECK(base::Contains(service_worker_object_hosts_, version_id));
-+
-+  // ServiceWorkerObjectHost to be deleted may have the last reference to
-+  // ServiceWorkerVersion that indirectly owns this ServiceWorkerContainerHost.
-+  // If we erase the object host directly from the map, |this| could be deleted
-+  // during the map operation and may crash. To avoid the case, we take the
-+  // ownership of the object host from the map first, and then erase the entry
-+  // from the map. See https://crbug.com/1056598 for details.
-+  std::unique_ptr<ServiceWorkerObjectHost> to_be_deleted =
-+      std::move(service_worker_object_hosts_[version_id]);
-+  DCHECK(to_be_deleted);
-   service_worker_object_hosts_.erase(version_id);
- }
- 
-diff --git a/content/browser/service_worker/service_worker_object_host_unittest.cc b/content/browser/service_worker/service_worker_object_host_unittest.cc
-index 408d7c1f9d1..6eab59040ab 100644
---- a/content/browser/service_worker/service_worker_object_host_unittest.cc
-+++ b/content/browser/service_worker/service_worker_object_host_unittest.cc
-@@ -200,6 +200,19 @@ class ServiceWorkerObjectHostTest : public testing::Test {
-     return registration_info;
-   }
- 
-+  void CallOnConnectionError(ServiceWorkerContainerHost* container_host,
-+                             int64_t version_id) {
-+    // ServiceWorkerObjectHost has the last reference to the version.
-+    ServiceWorkerObjectHost* object_host =
-+        GetServiceWorkerObjectHost(container_host, version_id);
-+    EXPECT_TRUE(object_host->version_->HasOneRef());
-+
-+    // Make sure that OnConnectionError induces destruction of the version and
-+    // the object host.
-+    object_host->receivers_.Clear();
-+    object_host->OnConnectionError();
-+  }
-+
-   BrowserTaskEnvironment task_environment_;
-   std::unique_ptr<EmbeddedWorkerTestHelper> helper_;
-   scoped_refptr<ServiceWorkerRegistration> registration_;
-@@ -409,5 +422,30 @@ TEST_F(ServiceWorkerObjectHostTest, DispatchExtendableMessageEvent_FromClient) {
-             events[0]->source_info_for_client->client_type);
- }
- 
-+// This is a regression test for https://crbug.com/1056598.
-+TEST_F(ServiceWorkerObjectHostTest, OnConnectionError) {
-+  const GURL scope("https://www.example.com/");
-+  const GURL script_url("https://www.example.com/service_worker.js");
-+  Initialize(std::make_unique<EmbeddedWorkerTestHelper>(base::FilePath()));
-+  SetUpRegistration(scope, script_url);
-+
-+  // Create the provider host.
-+  ASSERT_EQ(blink::ServiceWorkerStatusCode::kOk,
-+            StartServiceWorker(version_.get()));
-+
-+  // Set up the case where the last reference to the version is owned by the
-+  // service worker object host.
-+  ServiceWorkerContainerHost* container_host =
-+      version_->provider_host()->container_host();
-+  ServiceWorkerVersion* version_rawptr = version_.get();
-+  version_ = nullptr;
-+  ASSERT_TRUE(version_rawptr->HasOneRef());
-+
-+  // Simulate the connection error that induces the object host destruction.
-+  // This shouldn't crash.
-+  CallOnConnectionError(container_host, version_rawptr->version_id());
-+  base::RunLoop().RunUntilIdle();
-+}
-+
- }  // namespace service_worker_object_host_unittest
- }  // namespace content
diff --git a/srcpkgs/electron9/files/patches/chromium-chromium_atk_optional.patch.patch b/srcpkgs/electron9/files/patches/chromium-chromium_atk_optional.patch.patch
deleted file mode 100644
index 667b4a7a00c5..000000000000
--- a/srcpkgs/electron9/files/patches/chromium-chromium_atk_optional.patch.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/build/config/ui.gni	2020-06-25 00:39:28.000000000 +0200
-+++ -	2020-08-22 18:01:01.182749726 +0200
-@@ -47,8 +47,10 @@
- # Make sure glib is not used if building for ChromeOS/Chromecast
- assert(!use_glib || (is_linux && !is_chromeos && !is_chromecast))
- 
--# Whether to use atk, the Accessibility ToolKit library
--use_atk = is_desktop_linux && !is_chromecast && use_glib
-+declare_args() {
-+  # Whether to use atk, the Accessibility ToolKit library
-+  use_atk = is_desktop_linux && !is_chromecast && use_glib
-+}
- # =============================================
- #   PLEASE DO NOT ADD MORE FLAGS TO THIS FILE
- # =============================================
diff --git a/srcpkgs/electron9/files/patches/chromium-clean-up-a-call-to-set_utf8.patch b/srcpkgs/electron9/files/patches/chromium-clean-up-a-call-to-set_utf8.patch
deleted file mode 100644
index 01384c039417..000000000000
--- a/srcpkgs/electron9/files/patches/chromium-clean-up-a-call-to-set_utf8.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From ede390a0b18e4565abf8ac1e1ff717e1d43fc320 Mon Sep 17 00:00:00 2001
-From: Paul Wankadia <junyer@chromium.org>
-Date: Tue, 14 Apr 2020 16:54:51 +0000
-Subject: [PATCH] Clean up a call to set_utf8().
-
-This is part of an effort to rewrite calls to utf8() and set_utf8()
-(in RE2::Options) as calls to encoding() and set_encoding(),
-respectively. utf8() and set_utf8() have been marked as the "legacy"
-interface since 2008, so it is long past time that we get rid of them.
-
-R=parastoog@google.com
-
-Change-Id: I62c48cd575a55b519d5264ed857f927c163068b2
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2145261
-Reviewed-by: Parastoo Geranmayeh <parastoog@google.com>
-Commit-Queue: Paul Wankadia <junyer@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#758886}
----
- components/autofill/core/browser/address_rewriter.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/components/autofill/core/browser/address_rewriter.cc b/components/autofill/core/browser/address_rewriter.cc
-index 1b85a50974c..030a5aba146 100644
---- a/components/autofill/core/browser/address_rewriter.cc
-+++ b/components/autofill/core/browser/address_rewriter.cc
-@@ -57,7 +57,7 @@ void CompileRulesFromData(const std::string& data_string,
-                           CompiledRuleVector* compiled_rules) {
-   base::StringPiece data = data_string;
-   re2::RE2::Options options;
--  options.set_utf8(true);
-+  options.set_encoding(RE2::Options::EncodingUTF8);
-   options.set_word_boundary(true);
- 
-   size_t token_end = 0;
diff --git a/srcpkgs/electron9/files/patches/chromium-ffmpeg-4.3.patch b/srcpkgs/electron9/files/patches/chromium-ffmpeg-4.3.patch
deleted file mode 100644
index 6abb886ab990..000000000000
--- a/srcpkgs/electron9/files/patches/chromium-ffmpeg-4.3.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/media/base/media.cc b/media/base/media.cc
-index c282ee49a03..a298b40c79b 100644
---- a/media/base/media.cc
-+++ b/media/base/media.cc
-@@ -14,6 +14,7 @@
- #include "third_party/libyuv/include/libyuv.h"
- 
- #if BUILDFLAG(ENABLE_FFMPEG)
-+#include <limits>
- #include "third_party/ffmpeg/ffmpeg_features.h"  // nogncheck
- extern "C" {
- #include <libavutil/cpu.h>
-@@ -41,7 +42,7 @@ class MediaInitializer {
- 
- #if BUILDFLAG(USE_ALLOCATOR_SHIM)
-     // Remove allocation limit from ffmpeg, so calls go down to shim layer.
--    av_max_alloc(0);
-+    av_max_alloc(std::numeric_limits<size_t>::max());
- #endif  // BUILDFLAG(USE_ALLOCATOR_SHIM)
- 
- #endif  // BUILDFLAG(ENABLE_FFMPEG)
diff --git a/srcpkgs/electron9/files/patches/chromium-fix-template-specialization-01.patch b/srcpkgs/electron9/files/patches/chromium-fix-template-specialization-01.patch
deleted file mode 100644
index 8562f7da82cf..000000000000
--- a/srcpkgs/electron9/files/patches/chromium-fix-template-specialization-01.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-GCC: fix template specialization in WTF::VectorMover
-
-GCC complains that explicit specialization in non-namespace scope
-is happening for MoveOverlappingImpl. However, secialization is
-not really necessary here with templates and can be moved
-into MoveOverlappingImpl method without changing generated code.
-
-Bug: 819294
-Change-Id: I90b893b9701748302f7b900fbcc2c341685fe0d3
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2126290
-Reviewed-by: Kent Tamura <tkent@chromium.org>
-Commit-Queue: Kent Tamura <tkent@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#756880}
-
-diff --git a/third_party/blink/renderer/platform/wtf/vector.h b/third_party/blink/renderer/platform/wtf/vector.h
-index 632d308..82aaf96 100644
---- a/third_party/blink/renderer/platform/wtf/vector.h
-+++ b/third_party/blink/renderer/platform/wtf/vector.h
-@@ -205,30 +205,23 @@
-     }
-   }
- 
--  template <bool = Allocator::kIsGarbageCollected>
--  static void MoveOverlappingImpl(const T* src, const T* src_end, T* dst);
--  template <>
--  static void MoveOverlappingImpl<false>(const T* src,
--                                         const T* src_end,
--                                         T* dst) {
--    memmove(dst, src,
--            reinterpret_cast<const char*>(src_end) -
--                reinterpret_cast<const char*>(src));
--  }
--  template <>
--  static void MoveOverlappingImpl<true>(const T* src,
--                                        const T* src_end,
--                                        T* dst) {
--    if (src == dst)
--      return;
--    if (dst < src) {
--      for (; src < src_end; ++src, ++dst)
--        AtomicWriteMemcpy<sizeof(T)>(dst, src);
-+  static void MoveOverlappingImpl(const T* src, const T* src_end, T* dst) {
-+    if (Allocator::kIsGarbageCollected) {
-+      if (src == dst)
-+        return;
-+      if (dst < src) {
-+        for (; src < src_end; ++src, ++dst)
-+          AtomicWriteMemcpy<sizeof(T)>(dst, src);
-+      } else {
-+        --src_end;
-+        T* dst_end = dst + (src_end - src);
-+        for (; src_end >= src; --src_end, --dst_end)
-+          AtomicWriteMemcpy<sizeof(T)>(dst_end, src_end);
-+      }
-     } else {
--      --src_end;
--      T* dst_end = dst + (src_end - src);
--      for (; src_end >= src; --src_end, --dst_end)
--        AtomicWriteMemcpy<sizeof(T)>(dst_end, src_end);
-+      memmove(dst, src,
-+              reinterpret_cast<const char*>(src_end) -
-+                  reinterpret_cast<const char*>(src));
-     }
-   }
diff --git a/srcpkgs/electron9/files/patches/chromium-gcc-CrossVariantMojoAssociatedReceiver.patch b/srcpkgs/electron9/files/patches/chromium-gcc-CrossVariantMojoAssociatedReceiver.patch
deleted file mode 100644
index 86eb951300ce..000000000000
--- a/srcpkgs/electron9/files/patches/chromium-gcc-CrossVariantMojoAssociatedReceiver.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From f92da6993e45b28a7e0c82b1aed89aae95f72931 Mon Sep 17 00:00:00 2001
-From: Jose Dapena Paz <jdapena@igalia.com>
-Date: Wed, 17 Jun 2020 22:57:35 +0000
-Subject: [PATCH] GCC: remove noexcept declaration in CrossVariantMojoAssociatedReceive/Remote
-
-It breaks compilation of blink::WebServiceRegistrationObjectInfo that includes
-WebServiceWorkerObjectInfo instance. This one uses default move constructor
-without noexcept declaration, but has as members CrossVariantMojoAssociatedReceive
-and CrossVariantMojoAssociatedRemote with noexcept declaration in move constructor.
-declared noexcept.
-
-As resolved in other places, noexcept is not really much useful with -fno-exception
-and our codebase is not prepare to add it consistently. Clang will not report
-exception declaration incompatibilities in case -fno-exception is used, but GCC
-fails.
-
-Bug: 819294
-Change-Id: Id5c46c271a8a92352d769de9c3c263d3dce4c9c7
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2247791
-Commit-Queue: Dave Tapuska <dtapuska@chromium.org>
-Reviewed-by: Dave Tapuska <dtapuska@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#779526}
----
-
-diff --git a/third_party/blink/public/platform/cross_variant_mojo_util.h b/third_party/blink/public/platform/cross_variant_mojo_util.h
-index 92c69ce..9945e00 100644
---- a/third_party/blink/public/platform/cross_variant_mojo_util.h
-+++ b/third_party/blink/public/platform/cross_variant_mojo_util.h
-@@ -131,10 +131,10 @@
-   CrossVariantMojoAssociatedReceiver() = default;
-   ~CrossVariantMojoAssociatedReceiver() = default;
- 
--  CrossVariantMojoAssociatedReceiver(
--      CrossVariantMojoAssociatedReceiver&&) noexcept = default;
-+  CrossVariantMojoAssociatedReceiver(CrossVariantMojoAssociatedReceiver&&) =
-+      default;
-   CrossVariantMojoAssociatedReceiver& operator=(
--      CrossVariantMojoAssociatedReceiver&&) noexcept = default;
-+      CrossVariantMojoAssociatedReceiver&&) = default;
- 
-   CrossVariantMojoAssociatedReceiver(
-       const CrossVariantMojoAssociatedReceiver&) = delete;
-@@ -166,10 +166,10 @@
-   CrossVariantMojoAssociatedRemote() = default;
-   ~CrossVariantMojoAssociatedRemote() = default;
- 
--  CrossVariantMojoAssociatedRemote(
--      CrossVariantMojoAssociatedRemote&&) noexcept = default;
-+  CrossVariantMojoAssociatedRemote(CrossVariantMojoAssociatedRemote&&) =
-+      default;
-   CrossVariantMojoAssociatedRemote& operator=(
--      CrossVariantMojoAssociatedRemote&&) noexcept = default;
-+      CrossVariantMojoAssociatedRemote&&) = default;
- 
-   CrossVariantMojoAssociatedRemote(const CrossVariantMojoAssociatedRemote&) =
-       delete;
diff --git a/srcpkgs/electron9/files/patches/chromium-gcc-aarch64-zlib-crc-01.patch b/srcpkgs/electron9/files/patches/chromium-gcc-aarch64-zlib-crc-01.patch
deleted file mode 100644
index 2d6587d37b7e..000000000000
--- a/srcpkgs/electron9/files/patches/chromium-gcc-aarch64-zlib-crc-01.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-[zlib] Make insert string a little less #ifdef-ie
-
-Remove one level of #ifdef indent to make that part of the code easier
-to read. Change the accelerated routine name to end in _simd as is our
-way elsewhere in chromium zlib.
-
-Minor: adjust the comments around the performance claims, and move the
-important comments re CHROMIUM_ZLIB_NO_CASTAGNOLI into that block.
-
-Bug: 1032721
-Change-Id: Icb4044f3b87277d67f0ff004ac70813af0a91f5b
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2148893
-Reviewed-by: Chris Blume <cblume@chromium.org>
-Reviewed-by: Adenilson Cavalcanti <cavalcantii@chromium.org>
-Commit-Queue: Noel Gordon <noel@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#760408}
-
-diff --git a/third_party/zlib/contrib/optimizations/insert_string.h b/third_party/zlib/contrib/optimizations/insert_string.h
-index 1826601..d3bc33c 100644
---- a/third_party/zlib/contrib/optimizations/insert_string.h
-+++ b/third_party/zlib/contrib/optimizations/insert_string.h
-
-@@ -4,45 +4,47 @@
-  * Use of this source code is governed by a BSD-style license that can be
-  * found in the Chromium source repository LICENSE file.
-  */
--#ifdef _MSC_VER
-+
-+#if defined(_MSC_VER)
- #define INLINE __inline
- #else
- #define INLINE inline
- #endif
- 
- #include "cpu_features.h"
--/* Optimized insert_string block */
--#if defined(CRC32_SIMD_SSE42_PCLMUL) || defined(CRC32_ARMV8_CRC32)
--#define TARGET_CPU_WITH_CRC
-+
- // clang-format off
- #if defined(CRC32_SIMD_SSE42_PCLMUL)
--  /* Required to make MSVC bot build pass. */
--  #include <smmintrin.h>
--  #if defined(__GNUC__) || defined(__clang__)
--    #undef TARGET_CPU_WITH_CRC
-+  #include <smmintrin.h>  /* Required to make MSVC bot build pass. */
-+
-+  #if defined(__clang__) || defined(__GNUC__)
-     #define TARGET_CPU_WITH_CRC __attribute__((target("sse4.2")))
-+  #else
-+    #define TARGET_CPU_WITH_CRC
-   #endif
- 
-   #define _cpu_crc32_u32 _mm_crc32_u32
- 
- #elif defined(CRC32_ARMV8_CRC32)
-   #if defined(__clang__)
--    #undef TARGET_CPU_WITH_CRC
-     #define __crc32cw __builtin_arm_crc32cw
-   #endif
- 
--  #define _cpu_crc32_u32 __crc32cw
--
-   #if defined(__aarch64__)
-     #define TARGET_CPU_WITH_CRC __attribute__((target("crc")))
-   #else  // !defined(__aarch64__)
-     #define TARGET_CPU_WITH_CRC __attribute__((target("armv8-a,crc")))
-   #endif  // defined(__aarch64__)
-+
-+  #define _cpu_crc32_u32 __crc32cw
-+
- #endif
- // clang-format on
-+
-+#if defined(TARGET_CPU_WITH_CRC)
-+
- TARGET_CPU_WITH_CRC
--local INLINE Pos insert_string_optimized(deflate_state* const s,
--                                         const Pos str) {
-+local INLINE Pos insert_string_simd(deflate_state* const s, const Pos str) {
-   Pos ret;
-   unsigned *ip, val, h = 0;
- 
-@@ -64,7 +66,8 @@
-   s->prev[str & s->w_mask] = ret;
-   return ret;
- }
--#endif /* Optimized insert_string block */
-+
-+#endif // TARGET_CPU_WITH_CRC
- 
- /* ===========================================================================
-  * Update a hash value with the given input byte
-@@ -99,24 +102,22 @@
- }
- 
- local INLINE Pos insert_string(deflate_state* const s, const Pos str) {
--/* String dictionary insertion: faster symbol hashing has a positive impact
-- * on data compression speeds (around 20% on Intel and 36% on Arm Cortex big
-- * cores).
-- * A misfeature is that the generated compressed output will differ from
-- * vanilla zlib (even though it is still valid 'DEFLATE-d' content).
-+/* insert_string_simd string dictionary insertion: this SIMD symbol hashing
-+ * significantly improves data compression speed.
-  *
-- * We offer here a way to disable the optimization if there is the expectation
-- * that compressed content should match when compared to vanilla zlib.
-+ * Note: the generated compressed output is a valid DEFLATE stream but will
-+ * differ from vanilla zlib output ...
-  */
--#if !defined(CHROMIUM_ZLIB_NO_CASTAGNOLI)
--  /* TODO(cavalcantii): unify CPU features code. */
--#if defined(CRC32_ARMV8_CRC32)
--  if (arm_cpu_enable_crc32)
--    return insert_string_optimized(s, str);
--#elif defined(CRC32_SIMD_SSE42_PCLMUL)
-+#if defined(CHROMIUM_ZLIB_NO_CASTAGNOLI)
-+/* ... so this build-time option can used to disable the SIMD symbol hasher
-+ * if matching vanilla zlib DEFLATE output is required.
-+ */ (;) /* FALLTHOUGH */
-+#elif defined(TARGET_CPU_WITH_CRC) && defined(CRC32_SIMD_SSE42_PCLMUL)
-   if (x86_cpu_enable_simd)
--    return insert_string_optimized(s, str);
--#endif
-+    return insert_string_simd(s, str);
-+#elif defined(TARGET_CPU_WITH_CRC) && defined(CRC32_ARMV8_CRC32)
-+  if (arm_cpu_enable_crc32)
-+    return insert_string_simd(s, str);
- #endif
-   return insert_string_c(s, str);
- }
diff --git a/srcpkgs/electron9/files/patches/chromium-gcc-aarch64-zlib-crc-02.patch b/srcpkgs/electron9/files/patches/chromium-gcc-aarch64-zlib-crc-02.patch
deleted file mode 100644
index 62968dc7cd6f..000000000000
--- a/srcpkgs/electron9/files/patches/chromium-gcc-aarch64-zlib-crc-02.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Define crc32 intrinsic builtin for gcc
-
-This will fix the build for gcc@aarch64, enabling building V8
-with gcc for aarch64.
-
-Bug: 1066302
-Change-Id: I4818d6384553a877f6c1c240b7f0c66c8db69b1e
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2315440
-Reviewed-by: Mike Klein <mtklein@google.com>
-Reviewed-by: Adenilson Cavalcanti <cavalcantii@chromium.org>
-Commit-Queue: Adenilson Cavalcanti <cavalcantii@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#792504}
-
-diff --git a/third_party/zlib/contrib/optimizations/insert_string.h b/third_party/zlib/contrib/optimizations/insert_string.h
-index d3bc33c..9f634ae 100644
---- a/third_party/zlib/contrib/optimizations/insert_string.h
-+++ b/third_party/zlib/contrib/optimizations/insert_string.h
-
-@@ -28,11 +28,15 @@
- #elif defined(CRC32_ARMV8_CRC32)
-   #if defined(__clang__)
-     #define __crc32cw __builtin_arm_crc32cw
-+  #elif defined(__GNUC__)
-+    #define __crc32cw __builtin_aarch64_crc32cw
-   #endif
- 
--  #if defined(__aarch64__)
-+  #if defined(__aarch64__) && defined(__clang__)
-     #define TARGET_CPU_WITH_CRC __attribute__((target("crc")))
--  #else  // !defined(__aarch64__)
-+  #elif defined(__aarch64__) && defined(__GNUC__)
-+    #define TARGET_CPU_WITH_CRC __attribute__((target("+crc")))
-+  #elif defined(__clang__) // !defined(__aarch64__)
-     #define TARGET_CPU_WITH_CRC __attribute__((target("armv8-a,crc")))
-   #endif  // defined(__aarch64__)
diff --git a/srcpkgs/electron9/files/patches/chromium-gcc-move-assignement-operators-noexcept.patch b/srcpkgs/electron9/files/patches/chromium-gcc-move-assignement-operators-noexcept.patch
deleted file mode 100644
index 56918cdf3788..000000000000
--- a/srcpkgs/electron9/files/patches/chromium-gcc-move-assignement-operators-noexcept.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 911bdcd8cc5475be4ec4228cfbc85fc38f52857e Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Wed, 27 May 2020 10:00:41 +0000
-Subject: [PATCH] GCC: make base::{flat_map,flat_tree} move assignement operators noexcept
-
-Move assigment operator in ui::ColorSet is noexcept. Because this
-class has a member of type base::flat_map, move assignment operators
-of base::flat_map and base::flat_tree must be noexcept too.
-base::flat_tree noexcept is conditional to avoid build failure with
-NaCl.
-
-Otherwise GCC fails like this:
-
-../../ui/color/color_set.cc:14:11: error: function
-'ui::ColorSet& ui::ColorSet::operator=(ui::ColorSet&&)' defaulted on its
-redeclaration with an exception-specification that differs from the
-implicit exception-specification ''
-   14 | ColorSet& ColorSet::operator=(ColorSet&&) noexcept = default;
-      |           ^~~~~~~~
-
-Bug: 819294
-Change-Id: I10ce31851effc9ce78f2b5cbbb7148c339f065a7
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2179245
-Commit-Queue: Jan Wilken Dörrie <jdoerrie@chromium.org>
-Reviewed-by: Daniel Cheng <dcheng@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#772175}
----
-
-diff --git a/base/containers/flat_map.h b/base/containers/flat_map.h
-index ed82c5d..1af6b40 100644
---- a/base/containers/flat_map.h
-+++ b/base/containers/flat_map.h
-@@ -202,7 +202,7 @@
-   ~flat_map() = default;
- 
-   flat_map& operator=(const flat_map&) = default;
--  flat_map& operator=(flat_map&&) = default;
-+  flat_map& operator=(flat_map&&) noexcept = default;
-   // Takes the first if there are duplicates in the initializer list.
-   flat_map& operator=(std::initializer_list<value_type> ilist);
- 
-diff --git a/base/containers/flat_tree.h b/base/containers/flat_tree.h
-index 9412ff6..ce6e92b 100644
---- a/base/containers/flat_tree.h
-+++ b/base/containers/flat_tree.h
-@@ -125,7 +125,8 @@
-   // Assume that move assignment invalidates iterators and references.
- 
-   flat_tree& operator=(const flat_tree&);
--  flat_tree& operator=(flat_tree&&);
-+  flat_tree& operator=(flat_tree&&) noexcept(
-+      std::is_nothrow_move_assignable<underlying_type>::value);
-   // Takes the first if there are duplicates in the initializer list.
-   flat_tree& operator=(std::initializer_list<value_type> ilist);
- 
-@@ -518,7 +519,9 @@
-     const flat_tree&) -> flat_tree& = default;
- 
- template <class Key, class Value, class GetKeyFromValue, class KeyCompare>
--auto flat_tree<Key, Value, GetKeyFromValue, KeyCompare>::operator=(flat_tree &&)
-+auto flat_tree<Key, Value, GetKeyFromValue, KeyCompare>::
-+operator=(flat_tree&&) noexcept(
-+    std::is_nothrow_move_assignable<underlying_type>::value)
-     -> flat_tree& = default;
- 
- template <class Key, class Value, class GetKeyFromValue, class KeyCompare>
diff --git a/srcpkgs/electron9/files/patches/chromium-gcc-shared.patch b/srcpkgs/electron9/files/patches/chromium-gcc-shared.patch
deleted file mode 100644
index 098b68322422..000000000000
--- a/srcpkgs/electron9/files/patches/chromium-gcc-shared.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/build/toolchain/gcc_toolchain.gni	2019-11-19 02:27:43.000000000 +0100
-+++ -	2020-07-21 00:59:09.201421469 +0200
-@@ -371,7 +371,7 @@
-       # .TOC file, overwrite it, otherwise, don't change it.
-       tocfile = sofile + ".TOC"
- 
--      link_command = "$ld -shared -Wl,-soname=\"$soname\" {{ldflags}}${extra_ldflags} -o \"$unstripped_sofile\" @\"$rspfile\""
-+      link_command = "$ld -shared -Wl,-soname=\"$soname\" {{ldflags}}${extra_ldflags} -o \"$unstripped_sofile\" -shared @\"$rspfile\""
- 
-       # Generate a map file to be used for binary size analysis.
-       # Map file adds ~10% to the link time on a z620.
-@@ -450,7 +450,7 @@
-         unstripped_sofile = sofile
-       }
- 
--      command = "$ld -shared {{ldflags}}${extra_ldflags} -o \"$unstripped_sofile\" -Wl,-soname=\"$soname\" @\"$rspfile\""
-+      command = "$ld -shared {{ldflags}}${extra_ldflags} -o \"$unstripped_sofile\" -Wl,-soname=\"$soname\" -shared @\"$rspfile\""
- 
-       if (defined(invoker.strip)) {
-         strip_command = "${invoker.strip} -o \"$sofile\" \"$unstripped_sofile\""
diff --git a/srcpkgs/electron9/files/patches/chromium-gcc-webui-template.patch b/srcpkgs/electron9/files/patches/chromium-gcc-webui-template.patch
deleted file mode 100644
index 884e45b2d830..000000000000
--- a/srcpkgs/electron9/files/patches/chromium-gcc-webui-template.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From aa4ba19043db1f41bb0982d4b50f4f00151930f4 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Tue, 26 May 2020 15:29:49 +0000
-Subject: [PATCH] GCC: fix template specialization in content::WebUI
-
-GCC complains that explicit specialization in non-namespace scope
-is happening for GetValue. Move the methods outside
-the class definition.
-
-Bug: 819294
-Change-Id: I109472a0b6fa7ddab3529bc92bba680252b40f67
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2128307
-Reviewed-by: Camille Lamy <clamy@chromium.org>
-Commit-Queue: Camille Lamy <clamy@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#771818}
----
-
-diff --git a/content/public/browser/web_ui.h b/content/public/browser/web_ui.h
-index 4e6aa0e..fa6f10c 100644
---- a/content/public/browser/web_ui.h
-+++ b/content/public/browser/web_ui.h
-@@ -138,22 +138,6 @@
-   template <typename T>
-   static T GetValue(const base::Value& value);
- 
--  template <>
--  inline bool GetValue<bool>(const base::Value& value) {
--    return value.GetBool();
--  }
--
--  template <>
--  inline int GetValue<int>(const base::Value& value) {
--    return value.GetInt();
--  }
--
--  template <>
--  inline const std::string& GetValue<const std::string&>(
--      const base::Value& value) {
--    return value.GetString();
--  }
--
-   template <typename Is, typename... Args>
-   struct Call;
- 
-@@ -169,6 +153,22 @@
-   };
- };
- 
-+template <>
-+inline bool WebUI::GetValue<bool>(const base::Value& value) {
-+  return value.GetBool();
-+}
-+
-+template <>
-+inline int WebUI::GetValue<int>(const base::Value& value) {
-+  return value.GetInt();
-+}
-+
-+template <>
-+inline const std::string& WebUI::GetValue<const std::string&>(
-+    const base::Value& value) {
-+  return value.GetString();
-+}
-+
- }  // namespace content
- 
- #endif  // CONTENT_PUBLIC_BROWSER_WEB_UI_H_
diff --git a/srcpkgs/electron9/files/patches/chromium-include-memory-header-to-get-the-definition-of-std-u.patch b/srcpkgs/electron9/files/patches/chromium-include-memory-header-to-get-the-definition-of-std-u.patch
deleted file mode 100644
index eb30ad2437f1..000000000000
--- a/srcpkgs/electron9/files/patches/chromium-include-memory-header-to-get-the-definition-of-std-u.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 40d994e4aa2e4d5077c1810e4623549618a19c05 Mon Sep 17 00:00:00 2001
-From: Piotr Tworek <ptworek@vewd.com>
-Date: Mon, 27 Apr 2020 16:31:46 +0000
-Subject: [PATCH] Include "memory" header to get the definition of
- std::unique_ptr.
-
-Right now the code im the affected fails to build when using libstdc++
-instead of bundled libcxx. Apparently libcxx pulls the necessary header
-indirectly.
-
-Change-Id: Ie5e86f228434ab16d622ae7a912d9ce607258931
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2164645
-Reviewed-by: Jochen Eisinger <jochen@chromium.org>
-Commit-Queue: Jochen Eisinger <jochen@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#762881}
----
- .../blink/renderer/core/html/trust_token_attribute_parsing.h    | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/third_party/blink/renderer/core/html/trust_token_attribute_parsing.h b/third_party/blink/renderer/core/html/trust_token_attribute_parsing.h
-index f5a7ab03892..ef19cfaf680 100644
---- a/third_party/blink/renderer/core/html/trust_token_attribute_parsing.h
-+++ b/third_party/blink/renderer/core/html/trust_token_attribute_parsing.h
-@@ -5,6 +5,8 @@
- #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_HTML_TRUST_TOKEN_ATTRIBUTE_PARSING_H_
- #define THIRD_PARTY_BLINK_RENDERER_CORE_HTML_TRUST_TOKEN_ATTRIBUTE_PARSING_H_
- 
-+#include <memory>
-+
- #include "base/optional.h"
- #include "services/network/public/mojom/trust_tokens.mojom-blink-forward.h"
- #include "third_party/blink/renderer/core/core_export.h"
diff --git a/srcpkgs/electron9/files/patches/chromium-iwyu-std-numeric_limits-is-defined-in-limits.patch b/srcpkgs/electron9/files/patches/chromium-iwyu-std-numeric_limits-is-defined-in-limits.patch
deleted file mode 100644
index 39be41002a45..000000000000
--- a/srcpkgs/electron9/files/patches/chromium-iwyu-std-numeric_limits-is-defined-in-limits.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 74f76a6be385ef056b0be2362c32c728141cca16 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Fri, 17 Apr 2020 16:04:12 +0000
-Subject: [PATCH] IWYU: std::numeric_limits is defined in limits
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Change-Id: Ifbc379adc5bb7242c21e7da0bcfc28f49e4dd06f
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2153111
-Reviewed-by: François Doray <fdoray@chromium.org>
-Commit-Queue: François Doray <fdoray@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#760075}
----
- .../graph/policies/background_tab_loading_policy_helpers.cc      | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/chrome/browser/performance_manager/graph/policies/background_tab_loading_policy_helpers.cc b/chrome/browser/performance_manager/graph/policies/background_tab_loading_policy_helpers.cc
-index 4881c010bb9..593501d16a7 100644
---- a/chrome/browser/performance_manager/graph/policies/background_tab_loading_policy_helpers.cc	2020-06-25 00:39:31.000000000 +0200
-+++ -	2020-08-22 18:33:55.879464820 +0200
-@@ -3,6 +3,7 @@
- // found in the LICENSE file.
- 
- #include "chrome/browser/performance_manager/graph/policies/background_tab_loading_policy_helpers.h"
-+#include <limits>
- #include "base/logging.h"
- 
- namespace performance_manager {
diff --git a/srcpkgs/electron9/files/patches/chromium-libc_malloc.patch b/srcpkgs/electron9/files/patches/chromium-libc_malloc.patch
deleted file mode 100644
index 27cd2cefc46d..000000000000
--- a/srcpkgs/electron9/files/patches/chromium-libc_malloc.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/base/process/memory_linux.cc.orig	2017-09-15 08:41:43.000000000 +0000
-+++ b/base/process/memory_linux.cc	2017-09-15 08:44:39.804995469 +0000
-@@ -21,6 +21,12 @@
- #include "third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h"
- #endif
- 
-+#if defined(LIBC_GLIBC)
-+extern "C" {
-+extern void *__libc_malloc(size_t size);
-+}
-+#endif
-+
- namespace base {
- 
- size_t g_oom_size = 0U;
---- a/base/process/memory_linux.cc.orig	2017-09-15 08:46:55.000000000 +0000
-+++ b/base/process/memory_linux.cc	2017-09-15 08:51:34.422016858 +0000
-@@ -107,7 +107,7 @@
-     (!defined(LIBC_GLIBC) && !defined(USE_TCMALLOC))
-   *result = malloc(size);
- #elif defined(LIBC_GLIBC) && !defined(USE_TCMALLOC)
--  *result = __libc_malloc(size);
-+  *result = ::__libc_malloc(size);
- #elif defined(USE_TCMALLOC)
-   *result = tc_malloc_skip_new_handler(size);
- #endif
diff --git a/srcpkgs/electron9/files/patches/chromium-libstdc-fix-incomplete-type-in-AXTree-for-NodeSetSiz.patch b/srcpkgs/electron9/files/patches/chromium-libstdc-fix-incomplete-type-in-AXTree-for-NodeSetSiz.patch
deleted file mode 100644
index 5e9d37aae54f..000000000000
--- a/srcpkgs/electron9/files/patches/chromium-libstdc-fix-incomplete-type-in-AXTree-for-NodeSetSiz.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From aeef68888d4c00b69facead2b934095a8cd17329 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Mon, 20 Apr 2020 18:21:43 +0000
-Subject: [PATCH] libstdc++: fix incomplete-type in AXTree for
- NodeSetSizePosInSetInfo
-
-has only forward declaration of NodeSetSizePosInSetInfo. Therefore,
-move declaration from ax_tree.cc.
-
-std: :unordered_map<T, U> requires U to be fully declared. ax_tree.h
-Bug: 957519
-Change-Id: Ic1f4bf3ebfea229ece84251e46d4461b31873868
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2132403
-Reviewed-by: David Tseng <dtseng@chromium.org>
-Commit-Queue: David Tseng <dtseng@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#760588}
----
- ui/accessibility/ax_tree.cc | 10 ++--------
- ui/accessibility/ax_tree.h  |  9 ++++++++-
- 2 files changed, 10 insertions(+), 9 deletions(-)
-
-diff --git a/ui/accessibility/ax_tree.cc b/ui/accessibility/ax_tree.cc
-index 7b8d9b1b161..e9154028d66 100644
---- a/ui/accessibility/ax_tree.cc
-+++ b/ui/accessibility/ax_tree.cc
-@@ -567,14 +567,8 @@ struct AXTreeUpdateState {
-   const AXTree& tree;
- };
- 
--struct AXTree::NodeSetSizePosInSetInfo {
--  NodeSetSizePosInSetInfo() = default;
--  ~NodeSetSizePosInSetInfo() = default;
--
--  int32_t pos_in_set = 0;
--  int32_t set_size = 0;
--  base::Optional<int> lowest_hierarchical_level;
--};
-+AXTree::NodeSetSizePosInSetInfo::NodeSetSizePosInSetInfo() = default;
-+AXTree::NodeSetSizePosInSetInfo::~NodeSetSizePosInSetInfo() = default;
- 
- struct AXTree::OrderedSetContent {
-   explicit OrderedSetContent(const AXNode* ordered_set = nullptr)
-diff --git a/ui/accessibility/ax_tree.h b/ui/accessibility/ax_tree.h
-index a51ca8de4c8..8c1c57517ac 100644
---- a/ui/accessibility/ax_tree.h
-+++ b/ui/accessibility/ax_tree.h
-@@ -328,7 +328,14 @@ class AX_EXPORT AXTree : public AXNode::OwnerTree {
-   bool enable_extra_mac_nodes_ = false;
- 
-   // Contains pos_in_set and set_size data for an AXNode.
--  struct NodeSetSizePosInSetInfo;
-+  struct NodeSetSizePosInSetInfo {
-+    NodeSetSizePosInSetInfo();
-+    ~NodeSetSizePosInSetInfo();
-+
-+    int32_t pos_in_set = 0;
-+    int32_t set_size = 0;
-+    base::Optional<int> lowest_hierarchical_level;
-+  };
- 
-   // Represents the content of an ordered set which includes the ordered set
-   // items and the ordered set container if it exists.
diff --git a/srcpkgs/electron9/files/patches/chromium-make-some-of-blink-custom-iterators-STL-compatible.patch b/srcpkgs/electron9/files/patches/chromium-make-some-of-blink-custom-iterators-STL-compatible.patch
deleted file mode 100644
index 30cbdefcc65f..000000000000
--- a/srcpkgs/electron9/files/patches/chromium-make-some-of-blink-custom-iterators-STL-compatible.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From d3cabbc7321d349a9bffda482df5afc0d4df1ac2 Mon Sep 17 00:00:00 2001
-From: Piotr Tworek <ptworek@vewd.com>
-Date: Thu, 30 Apr 2020 21:33:47 +0000
-Subject: [PATCH] Make some of blink custom iterators STL compatible.
-
-Blink has recently started using functions like std::any_of with some of
-the custom iterators it provides. On Linux this works in the default
-setup using libcxx, but fails with even the most recent versions of
-libstdc++. In all cases the error message (text in bug report) complains
-about lack of matching std::__iterator_category definition.
-
-From what I understand the error message is basically saying those
-iterators are not STL compatible due to missing traits as described
-in https://en.cppreference.com/w/cpp/iterator/iterator_traits. Such
-traits are provided by custom iterators defined in //base, or //cc.
-
-This patch adds the necessary traits to iterators that are currently
-affected by this problem.
-
-Bug: 1076869
-Change-Id: I9950a7100c32499ba96647317fa70b87dc22eaf9
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2174199
-Reviewed-by: Kentaro Hara <haraken@chromium.org>
-Commit-Queue: Piotr Tworek <ptworek@vewd.com>
-Cr-Commit-Position: refs/heads/master@{#764426}
----
- .../core/layout/ng/ng_physical_container_fragment.h  |  6 ++++++
- .../blink/renderer/platform/wtf/hash_iterators.h     | 12 ++++++++++++
- third_party/blink/renderer/platform/wtf/hash_table.h |  6 ++++++
- 3 files changed, 24 insertions(+)
-
-diff --git a/third_party/blink/renderer/core/layout/ng/ng_physical_container_fragment.h b/third_party/blink/renderer/core/layout/ng/ng_physical_container_fragment.h
-index 1256e77c146..8b93107f2fc 100644
---- a/third_party/blink/renderer/core/layout/ng/ng_physical_container_fragment.h
-+++ b/third_party/blink/renderer/core/layout/ng/ng_physical_container_fragment.h
-@@ -38,6 +38,12 @@ class CORE_EXPORT NGPhysicalContainerFragment : public NGPhysicalFragment {
-       STACK_ALLOCATED();
- 
-      public:
-+      using iterator_category = std::bidirectional_iterator_tag;
-+      using value_type = NGLink;
-+      using difference_type = ptrdiff_t;
-+      using pointer = value_type*;
-+      using reference = value_type&;
-+
-       ConstIterator(const NGLink* current) : current_(current) {}
- 
-       const NGLink& operator*() const { return *PostLayoutOrCurrent(); }
-diff --git a/third_party/blink/renderer/platform/wtf/hash_iterators.h b/third_party/blink/renderer/platform/wtf/hash_iterators.h
-index f8e66e6be85..6003d02c509 100644
---- a/third_party/blink/renderer/platform/wtf/hash_iterators.h
-+++ b/third_party/blink/renderer/platform/wtf/hash_iterators.h
-@@ -53,6 +53,12 @@ struct HashTableConstIteratorAdapter<HashTableType,
-   typedef HashTableConstValuesIterator<HashTableType, KeyType, MappedType>
-       ValuesIterator;
- 
-+  using iterator_category = std::bidirectional_iterator_tag;
-+  using value_type = HashTableType;
-+  using difference_type = ptrdiff_t;
-+  using pointer = value_type*;
-+  using reference = value_type&;
-+
-   HashTableConstIteratorAdapter() = default;
-   HashTableConstIteratorAdapter(
-       const typename HashTableType::const_iterator& impl)
-@@ -94,6 +100,12 @@ struct HashTableIteratorAdapter<HashTableType,
-   typedef HashTableValuesIterator<HashTableType, KeyType, MappedType>
-       ValuesIterator;
- 
-+  using iterator_category = std::bidirectional_iterator_tag;
-+  using value_type = HashTableType;
-+  using difference_type = ptrdiff_t;
-+  using pointer = value_type*;
-+  using reference = value_type&;
-+
-   HashTableIteratorAdapter() = default;
-   HashTableIteratorAdapter(const typename HashTableType::iterator& impl)
-       : impl_(impl) {}
-diff --git a/third_party/blink/renderer/platform/wtf/hash_table.h b/third_party/blink/renderer/platform/wtf/hash_table.h
-index f596fb5d41e..5a4468d6bd1 100644
---- a/third_party/blink/renderer/platform/wtf/hash_table.h
-+++ b/third_party/blink/renderer/platform/wtf/hash_table.h
-@@ -2204,6 +2204,12 @@ struct HashTableConstIteratorAdapter {
-   STACK_ALLOCATED();
- 
-  public:
-+  using iterator_category = std::bidirectional_iterator_tag;
-+  using value_type = HashTableType;
-+  using difference_type = ptrdiff_t;
-+  using pointer = value_type*;
-+  using reference = value_type&;
-+
-   HashTableConstIteratorAdapter() = default;
-   HashTableConstIteratorAdapter(
-       const typename HashTableType::const_iterator& impl)
diff --git a/srcpkgs/electron9/files/patches/chromium-skia-harmony.patch b/srcpkgs/electron9/files/patches/chromium-skia-harmony.patch
deleted file mode 100644
index 1cb8aebf240d..000000000000
--- a/srcpkgs/electron9/files/patches/chromium-skia-harmony.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/third_party/skia/src/ports/SkFontHost_FreeType.cpp.orig	2019-07-19 11:08:34.770972665 +0000
-+++ b/third_party/skia/src/ports/SkFontHost_FreeType.cpp	2019-07-19 11:08:44.274442065 +0000
-@@ -128,9 +128,9 @@ public:
-         : fGetVarDesignCoordinates(nullptr)
-         , fGetVarAxisFlags(nullptr)
-         , fLibrary(nullptr)
--        , fIsLCDSupported(false)
-+        , fIsLCDSupported(true)
-         , fLightHintingIsYOnly(false)
--        , fLCDExtra(0)
-+        , fLCDExtra(2)
-     {
-         if (FT_New_Library(&gFTMemory, &fLibrary)) {
-             return;
diff --git a/srcpkgs/electron9/files/patches/chromium-time64.patch b/srcpkgs/electron9/files/patches/chromium-time64.patch
deleted file mode 100644
index 0330ce057f41..000000000000
--- a/srcpkgs/electron9/files/patches/chromium-time64.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Description: allow sandboxed code to call gettime64
- Add __NR_clock_gettime64 and __NR_clock_nanosleep_time64 to syscall whitelist
- and clock selection parameter filtering code.
-
- Add __NR_utimensat_time64 to syscall whitelist
-
- Conditionalise additions on the new calls existing, because they do not exist
- on 64-bit architectures.
-Author: Peter Michael Green <plugwash@raspbian.org>
-
-Index: chromium-83.0.4103.116/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
-===================================================================
---- a/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
-+++ b/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
-@@ -148,7 +148,11 @@ ResultExpr EvaluateSyscallImpl(int fs_de
-     return Allow();
- #endif
- 
-+#ifdef __NR_clock_gettime64
-+  if (sysno == __NR_clock_gettime || sysno == __NR_clock_gettime64 || sysno == __NR_clock_nanosleep || sysno == __NR_clock_nanosleep_time64) {
-+#else
-   if (sysno == __NR_clock_gettime || sysno == __NR_clock_nanosleep) {
-+#endif
-     return RestrictClockID();
-   }
- 
-Index: chromium-83.0.4103.116/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-===================================================================
---- a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-+++ b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-@@ -38,6 +38,10 @@ bool SyscallSets::IsAllowedGettime(int s
-     case __NR_clock_getres:     // Allowed only on Android with parameters
-                                 // filtered by RestrictClokID().
-     case __NR_clock_gettime:    // Parameters filtered by RestrictClockID().
-+#ifdef __NR_clock_gettime64
-+    case __NR_clock_gettime64:    // Parameters filtered by RestrictClockID().
-+    case __NR_clock_nanosleep_time64:  // Parameters filtered by RestrictClockID().
-+#endif
-     case __NR_clock_nanosleep:  // Parameters filtered by RestrictClockID().
-     case __NR_clock_settime:    // Privileged.
- #if defined(__i386__) || \
-@@ -159,6 +163,9 @@ bool SyscallSets::IsFileSystem(int sysno
-     case __NR_utime:
- #endif
-     case __NR_utimensat:  // New.
-+#ifdef __NR_utimensat_time64
-+    case __NR_utimensat_time64:
-+#endif
-       return true;
-     default:
-       return false;
diff --git a/srcpkgs/electron9/files/patches/chromium-toolchain-host.patch b/srcpkgs/electron9/files/patches/chromium-toolchain-host.patch
deleted file mode 100644
index 0dace261a08c..000000000000
--- a/srcpkgs/electron9/files/patches/chromium-toolchain-host.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/build/toolchain/linux/unbundle/BUILD.gn	2020-07-21 17:36:34.064748261 +0200
-+++ -	2020-07-21 17:39:03.115740522 +0200
-@@ -35,7 +35,7 @@
-   extra_ldflags = getenv("BUILD_LDFLAGS")
- 
-   toolchain_args = {
--    current_cpu = current_cpu
-+    current_cpu = host_cpu
-     current_os = current_os
-   }
- }
diff --git a/srcpkgs/electron9/files/patches/chromium-upstream-0001-Revert-ui-fill-in-SDR-HDR-DisplayColorSpaces-CrOS.patch b/srcpkgs/electron9/files/patches/chromium-upstream-0001-Revert-ui-fill-in-SDR-HDR-DisplayColorSpaces-CrOS.patch
deleted file mode 100644
index 6616357f899b..000000000000
--- a/srcpkgs/electron9/files/patches/chromium-upstream-0001-Revert-ui-fill-in-SDR-HDR-DisplayColorSpaces-CrOS.patch
+++ /dev/null
@@ -1,436 +0,0 @@
-From 44f5d255245153ac3f5aa4b6530810ca93ff46e6 Mon Sep 17 00:00:00 2001
-From: Miguel Casas <mcasas@chromium.org>
-Date: Mon, 22 Jun 2020 20:24:57 +0000
-Subject: [PATCH 01/12] Revert "ui: fill in SDR/HDR DisplayColorSpaces, CrOS"
-
-This reverts commit 07199ff111cb3b31da0752adc62ffbe05101dfde.
-
-Said commit inadvertently instructed the compositor to use the
-EDID-provided ColorSpace as target for rastering, causing colours
-to be accurate, but washed out.
-
-Original Commit description ----------------------------------------
-This CL adds code for populating the necessary gfx::DisplayColorSpaces
-in CreateManagedDisplayInfo for supporting SDR and HDR target color
-spaces (depending on the monitor capabilities and the big hdr flag).
-
-It needs a sibling CL to allow AR/B30 FBs on CrOs crrev.com/c/2078655,
-Tested with that CL and by playing an HDR video: the primary
-framebuffer format in /sys/kernel/debug/dri/0//state correctly changes
-to XB30, whereas when there are not HDR quads in the BufferQueue, it's
-XR24.
-
-Bug: 958166
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2072621
-Reviewed-by: ccameron <ccameron@chromium.org>
-Commit-Queue: Miguel Casas <mcasas@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#745461}
-
-
-(cherry picked from commit f807a5774bc1af6ef43c408bd0a1a0b0d55e2c4a)
-
-Bug: b:158126931, 958166
-Change-Id: Iee5c9a431a9c0f9f6a5b4d229ab70183c264ad9b
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2232761
-Auto-Submit: Miguel Casas <mcasas@chromium.org>
-Reviewed-by: ccameron <ccameron@chromium.org>
-Commit-Queue: ccameron <ccameron@chromium.org>
-Commit-Queue: Miguel Casas <mcasas@chromium.org>
-Cr-Original-Commit-Position: refs/heads/master@{#775775}
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2258293
-Reviewed-by: Miguel Casas <mcasas@chromium.org>
-Cr-Commit-Position: refs/branch-heads/4103@{#724}
-Cr-Branched-From: 8ad47e8d21f6866e4a37f47d83a860d41debf514-refs/heads/master@{#756066}
----
- ui/compositor/compositor.cc                   |  10 ++
- ui/display/fake/fake_display_snapshot.cc      |  21 +--
- ui/display/fake/fake_display_snapshot.h       |   8 +-
- ui/display/manager/display_change_observer.cc |  69 ++-------
- ui/display/manager/display_change_observer.h  |   2 -
- .../display_change_observer_unittest.cc       | 134 +-----------------
- 6 files changed, 25 insertions(+), 219 deletions(-)
-
-diff --git a/ui/compositor/compositor.cc b/ui/compositor/compositor.cc
-index e94d022afcc..dd4f89d7676 100644
---- a/ui/compositor/compositor.cc
-+++ b/ui/compositor/compositor.cc
-@@ -444,6 +444,16 @@ void Compositor::SetDisplayColorSpaces(
-   if (display_color_spaces_ == display_color_spaces)
-     return;
-   display_color_spaces_ = display_color_spaces;
-+  // TODO(crbug.com/1012846): Remove this flag and provision when HDR is fully
-+  // supported on ChromeOS.
-+#if defined(OS_CHROMEOS)
-+  if (display_color_spaces_.SupportsHDR() &&
-+      !base::CommandLine::ForCurrentProcess()->HasSwitch(
-+          switches::kEnableUseHDRTransferFunction)) {
-+    display_color_spaces_ =
-+        gfx::DisplayColorSpaces(gfx::ColorSpace::CreateSRGB());
-+  }
-+#endif
- 
-   host_->SetRasterColorSpace(display_color_spaces_.GetRasterColorSpace());
-   // Always force the ui::Compositor to re-draw all layers, because damage
-diff --git a/ui/display/fake/fake_display_snapshot.cc b/ui/display/fake/fake_display_snapshot.cc
-index 3568c296327..94da2c4e398 100644
---- a/ui/display/fake/fake_display_snapshot.cc
-+++ b/ui/display/fake/fake_display_snapshot.cc
-@@ -163,8 +163,7 @@ std::unique_ptr<FakeDisplaySnapshot> Builder::Build() {
-       id_, origin_, physical_size, type_, is_aspect_preserving_scaling_,
-       has_overscan_, privacy_screen_state_, has_color_correction_matrix_,
-       color_correction_in_linear_space_, name_, std::move(modes_),
--      current_mode_, native_mode_, product_code_, maximum_cursor_size_,
--      color_space_, bits_per_channel_);
-+      current_mode_, native_mode_, product_code_, maximum_cursor_size_);
- }
- 
- Builder& Builder::SetId(int64_t id) {
-@@ -265,16 +264,6 @@ Builder& Builder::SetPrivacyScreen(PrivacyScreenState state) {
-   return *this;
- }
- 
--Builder& Builder::SetColorSpace(const gfx::ColorSpace& color_space) {
--  color_space_ = color_space;
--  return *this;
--}
--
--Builder& Builder::SetBitsPerChannel(uint32_t bits_per_channel) {
--  bits_per_channel_ = bits_per_channel;
--  return *this;
--}
--
- const DisplayMode* Builder::AddOrFindDisplayMode(const gfx::Size& size) {
-   for (auto& mode : modes_) {
-     if (mode->size() == size)
-@@ -316,9 +305,7 @@ FakeDisplaySnapshot::FakeDisplaySnapshot(
-     const DisplayMode* current_mode,
-     const DisplayMode* native_mode,
-     int64_t product_code,
--    const gfx::Size& maximum_cursor_size,
--    const gfx::ColorSpace& color_space,
--    uint32_t bits_per_channel)
-+    const gfx::Size& maximum_cursor_size)
-     : DisplaySnapshot(display_id,
-                       origin,
-                       physical_size,
-@@ -328,8 +315,8 @@ FakeDisplaySnapshot::FakeDisplaySnapshot(
-                       privacy_screen_state,
-                       has_color_correction_matrix,
-                       color_correction_in_linear_space,
--                      color_space,
--                      bits_per_channel,
-+                      gfx::ColorSpace(),
-+                      8u /* bits_per_channel */,
-                       display_name,
-                       base::FilePath(),
-                       std::move(modes),
-diff --git a/ui/display/fake/fake_display_snapshot.h b/ui/display/fake/fake_display_snapshot.h
-index d521fb34078..833ac744d08 100644
---- a/ui/display/fake/fake_display_snapshot.h
-+++ b/ui/display/fake/fake_display_snapshot.h
-@@ -70,8 +70,6 @@ class FAKE_DISPLAY_EXPORT FakeDisplaySnapshot : public DisplaySnapshot {
-     // Sets physical_size for high DPI display.
-     Builder& SetHighDPI();
-     Builder& SetPrivacyScreen(PrivacyScreenState state);
--    Builder& SetColorSpace(const gfx::ColorSpace& color_space);
--    Builder& SetBitsPerChannel(uint32_t bits_per_channel);
- 
-    private:
-     // Returns a display mode with |size|. If there is no existing mode, insert
-@@ -96,8 +94,6 @@ class FAKE_DISPLAY_EXPORT FakeDisplaySnapshot : public DisplaySnapshot {
-     DisplayModeList modes_;
-     const DisplayMode* current_mode_ = nullptr;
-     const DisplayMode* native_mode_ = nullptr;
--    gfx::ColorSpace color_space_;
--    uint32_t bits_per_channel_ = 8u;
- 
-     DISALLOW_COPY_AND_ASSIGN(Builder);
-   };
-@@ -116,9 +112,7 @@ class FAKE_DISPLAY_EXPORT FakeDisplaySnapshot : public DisplaySnapshot {
-                       const DisplayMode* current_mode,
-                       const DisplayMode* native_mode,
-                       int64_t product_code,
--                      const gfx::Size& maximum_cursor_size,
--                      const gfx::ColorSpace& color_space,
--                      uint32_t bits_per_channel);
-+                      const gfx::Size& maximum_cursor_size);
-   ~FakeDisplaySnapshot() override;
- 
-   // Creates a display snapshot from the provided |spec| string. Returns null if
-diff --git a/ui/display/manager/display_change_observer.cc b/ui/display/manager/display_change_observer.cc
-index 28dbd10ec19..799d896d8e7 100644
---- a/ui/display/manager/display_change_observer.cc
-+++ b/ui/display/manager/display_change_observer.cc
-@@ -77,55 +77,6 @@ ManagedDisplayInfo::ManagedDisplayModeList GetModeListWithAllRefreshRates(
-   return display_mode_list;
- }
- 
--// Constructs the raster DisplayColorSpaces out of |snapshot_color_space|,
--// including the HDR ones if present and |allow_high_bit_depth| is set.
--gfx::DisplayColorSpaces FillDisplayColorSpaces(
--    const gfx::ColorSpace& snapshot_color_space,
--    bool allow_high_bit_depth) {
--  // ChromeOS VMs (e.g. amd64-generic or betty) have INVALID Primaries; just
--  // pass the color space along.
--  if (!snapshot_color_space.IsValid()) {
--    return gfx::DisplayColorSpaces(snapshot_color_space,
--                                   DisplaySnapshot::PrimaryFormat());
--  }
--
--  constexpr auto kSDRTransferId = gfx::ColorSpace::TransferID::IEC61966_2_1;
--  const auto primary_id = snapshot_color_space.GetPrimaryID();
--
--  gfx::ColorSpace sdr_color_space;
--  if (primary_id == gfx::ColorSpace::PrimaryID::CUSTOM) {
--    skcms_Matrix3x3 primary_matrix{};
--    snapshot_color_space.GetPrimaryMatrix(&primary_matrix);
--    sdr_color_space =
--        gfx::ColorSpace::CreateCustom(primary_matrix, kSDRTransferId);
--  } else {
--    sdr_color_space = gfx::ColorSpace(primary_id, kSDRTransferId);
--  }
--  gfx::DisplayColorSpaces display_color_spaces(
--      sdr_color_space, DisplaySnapshot::PrimaryFormat());
--
--  if (allow_high_bit_depth) {
--    gfx::ColorSpace hdr_color_space;
--    if (primary_id == gfx::ColorSpace::PrimaryID::CUSTOM) {
--      skcms_Matrix3x3 primary_matrix{};
--      snapshot_color_space.GetPrimaryMatrix(&primary_matrix);
--      hdr_color_space = gfx::ColorSpace::CreatePiecewiseHDR(
--          primary_id, 0.99, 2.0, &primary_matrix);
--    } else {
--      hdr_color_space =
--          gfx::ColorSpace::CreatePiecewiseHDR(primary_id, 0.99, 2.0);
--    }
--
--    display_color_spaces.SetOutputColorSpaceAndBufferFormat(
--        gfx::ContentColorUsage::kHDR, false /* needs_alpha */, hdr_color_space,
--        gfx::BufferFormat::RGBA_1010102);
--    display_color_spaces.SetOutputColorSpaceAndBufferFormat(
--        gfx::ContentColorUsage::kHDR, true /* needs_alpha */, hdr_color_space,
--        gfx::BufferFormat::RGBA_1010102);
--  }
--  return display_color_spaces;
--}
--
- }  // namespace
- 
- // static
-@@ -386,23 +337,21 @@ ManagedDisplayInfo DisplayChangeObserver::CreateManagedDisplayInfo(
-   if (dpi)
-     new_info.set_device_dpi(dpi);
- 
--#if !defined(OS_CHROMEOS)
-   // TODO(crbug.com/1012846): This should configure the HDR color spaces.
-   gfx::DisplayColorSpaces display_color_spaces(
-       snapshot->color_space(), DisplaySnapshot::PrimaryFormat());
-   new_info.set_display_color_spaces(display_color_spaces);
-   new_info.set_bits_per_channel(snapshot->bits_per_channel());
--#else
--  // TODO(crbug.com/1012846): Remove kEnableUseHDRTransferFunction usage when
--  // HDR is fully supported on ChromeOS.
--  const bool allow_high_bit_depth =
--      base::CommandLine::ForCurrentProcess()->HasSwitch(
--          switches::kEnableUseHDRTransferFunction);
--  new_info.set_display_color_spaces(
--      FillDisplayColorSpaces(snapshot->color_space(), allow_high_bit_depth));
-+
-+  // TODO(crbug.com/1012846): Remove this flag and provision when HDR is fully
-+  // supported on ChromeOS.
-+#if defined(OS_CHROMEOS)
-   constexpr int32_t kNormalBitDepth = 8;
--  new_info.set_bits_per_channel(
--      allow_high_bit_depth ? snapshot->bits_per_channel() : kNormalBitDepth);
-+  if (new_info.bits_per_channel() > kNormalBitDepth &&
-+      !base::CommandLine::ForCurrentProcess()->HasSwitch(
-+          switches::kEnableUseHDRTransferFunction)) {
-+    new_info.set_bits_per_channel(kNormalBitDepth);
-+  }
- #endif
- 
-   new_info.set_refresh_rate(mode_info->refresh_rate());
-diff --git a/ui/display/manager/display_change_observer.h b/ui/display/manager/display_change_observer.h
-index 5c17ce60977..0e896e24e5e 100644
---- a/ui/display/manager/display_change_observer.h
-+++ b/ui/display/manager/display_change_observer.h
-@@ -60,8 +60,6 @@ class DISPLAY_MANAGER_EXPORT DisplayChangeObserver
-   DISPLAY_EXPORT static float FindDeviceScaleFactor(float dpi);
- 
-  private:
--  friend class DisplayChangeObserverTest;
--
-   void UpdateInternalDisplay(
-       const DisplayConfigurator::DisplayStateList& display_states);
- 
-diff --git a/ui/display/manager/display_change_observer_unittest.cc b/ui/display/manager/display_change_observer_unittest.cc
-index 1b2907137f9..bb900209bac 100644
---- a/ui/display/manager/display_change_observer_unittest.cc
-+++ b/ui/display/manager/display_change_observer_unittest.cc
-@@ -14,11 +14,8 @@
- #include "ui/display/display_switches.h"
- #include "ui/display/fake/fake_display_snapshot.h"
- #include "ui/display/manager/display_configurator.h"
--#include "ui/display/manager/display_manager.h"
- #include "ui/display/manager/managed_display_info.h"
--#include "ui/display/screen.h"
- #include "ui/display/types/display_mode.h"
--#include "ui/events/devices/device_data_manager.h"
- #include "ui/gfx/geometry/rect.h"
- #include "ui/gfx/geometry/size.h"
- 
-@@ -63,13 +60,6 @@ class DisplayChangeObserverTest : public testing::Test,
-     Test::SetUp();
-   }
- 
--  // Pass through method to be called by individual test cases.
--  ManagedDisplayInfo CreateManagedDisplayInfo(DisplayChangeObserver* observer,
--                                              const DisplaySnapshot* snapshot,
--                                              const DisplayMode* mode_info) {
--    return observer->CreateManagedDisplayInfo(snapshot, mode_info);
--  }
--
-  private:
-   base::test::ScopedFeatureList scoped_feature_list_;
- 
-@@ -185,8 +175,7 @@ TEST_P(DisplayChangeObserverTest, GetEmptyExternalManagedDisplayModeList) {
-   FakeDisplaySnapshot display_snapshot(
-       123, gfx::Point(), gfx::Size(), DISPLAY_CONNECTION_TYPE_UNKNOWN, false,
-       false, PrivacyScreenState::kNotSupported, false, false, std::string(), {},
--      nullptr, nullptr, 0, gfx::Size(), gfx::ColorSpace(),
--      /*bits_per_channel=*/8u);
-+      nullptr, nullptr, 0, gfx::Size());
- 
-   ManagedDisplayInfo::ManagedDisplayModeList display_modes =
-       DisplayChangeObserver::GetExternalManagedDisplayModeList(
-@@ -305,127 +294,6 @@ TEST_P(DisplayChangeObserverTest,
-   }
- }
- 
--TEST_P(DisplayChangeObserverTest, InvalidDisplayColorSpaces) {
--  const std::unique_ptr<DisplaySnapshot> display_snapshot =
--      FakeDisplaySnapshot::Builder()
--          .SetId(123)
--          .SetName("AmazingFakeDisplay")
--          .SetNativeMode(MakeDisplayMode(1920, 1080, true, 60))
--          .SetColorSpace(gfx::ColorSpace())
--          .Build();
--
--  ui::DeviceDataManager::CreateInstance();
--  DisplayManager manager(nullptr);
--  const auto display_mode = MakeDisplayMode(1920, 1080, true, 60);
--  DisplayChangeObserver observer(&manager);
--  const ManagedDisplayInfo display_info = CreateManagedDisplayInfo(
--      &observer, display_snapshot.get(), display_mode.get());
--
--  EXPECT_EQ(display_info.bits_per_channel(), 8u);
--  const auto display_color_spaces = display_info.display_color_spaces();
--  EXPECT_FALSE(display_color_spaces.SupportsHDR());
--
--  EXPECT_EQ(
--      DisplaySnapshot::PrimaryFormat(),
--      display_color_spaces.GetOutputBufferFormat(gfx::ContentColorUsage::kSRGB,
--                                                 /*needs_alpha=*/true));
--
--  const auto color_space = display_color_spaces.GetRasterColorSpace();
--  // DisplayColorSpaces will fix an invalid ColorSpace to return sRGB.
--  EXPECT_TRUE(color_space.IsValid());
--  EXPECT_EQ(color_space, gfx::ColorSpace::CreateSRGB());
--}
--
--TEST_P(DisplayChangeObserverTest, SDRDisplayColorSpaces) {
--  const std::unique_ptr<DisplaySnapshot> display_snapshot =
--      FakeDisplaySnapshot::Builder()
--          .SetId(123)
--          .SetName("AmazingFakeDisplay")
--          .SetNativeMode(MakeDisplayMode(1920, 1080, true, 60))
--          .SetColorSpace(gfx::ColorSpace::CreateSRGB())
--          .Build();
--
--  ui::DeviceDataManager::CreateInstance();
--  DisplayManager manager(nullptr);
--  const auto display_mode = MakeDisplayMode(1920, 1080, true, 60);
--  DisplayChangeObserver observer(&manager);
--  const ManagedDisplayInfo display_info = CreateManagedDisplayInfo(
--      &observer, display_snapshot.get(), display_mode.get());
--
--  EXPECT_EQ(display_info.bits_per_channel(), 8u);
--
--  const auto display_color_spaces = display_info.display_color_spaces();
--  EXPECT_FALSE(display_color_spaces.SupportsHDR());
--
--  EXPECT_EQ(
--      DisplaySnapshot::PrimaryFormat(),
--      display_color_spaces.GetOutputBufferFormat(gfx::ContentColorUsage::kSRGB,
--                                                 /*needs_alpha=*/true));
--
--  const auto color_space = display_color_spaces.GetRasterColorSpace();
--  EXPECT_TRUE(color_space.IsValid());
--  EXPECT_EQ(color_space.GetPrimaryID(), gfx::ColorSpace::PrimaryID::BT709);
--  EXPECT_EQ(color_space.GetTransferID(),
--            gfx::ColorSpace::TransferID::IEC61966_2_1);
--}
--
--#if defined(OS_CHROMEOS)
--TEST_P(DisplayChangeObserverTest, HDRDisplayColorSpaces) {
--  // TODO(crbug.com/1012846): Remove this flag and provision when HDR is fully
--  // supported on ChromeOS.
--  base::CommandLine::ForCurrentProcess()->AppendSwitch(
--      switches::kEnableUseHDRTransferFunction);
--
--  const std::unique_ptr<DisplaySnapshot> display_snapshot =
--      FakeDisplaySnapshot::Builder()
--          .SetId(123)
--          .SetName("AmazingFakeDisplay")
--          .SetNativeMode(MakeDisplayMode(1920, 1080, true, 60))
--          .SetColorSpace(gfx::ColorSpace::CreateHDR10(100.0f))
--          .SetBitsPerChannel(10u)
--          .Build();
--
--  ui::DeviceDataManager::CreateInstance();
--  DisplayManager manager(nullptr);
--  const auto display_mode = MakeDisplayMode(1920, 1080, true, 60);
--  DisplayChangeObserver observer(&manager);
--  const ManagedDisplayInfo display_info = CreateManagedDisplayInfo(
--      &observer, display_snapshot.get(), display_mode.get());
--
--  EXPECT_EQ(display_info.bits_per_channel(), 10u);
--
--  const auto display_color_spaces = display_info.display_color_spaces();
--  EXPECT_TRUE(display_color_spaces.SupportsHDR());
--
--  // |display_color_spaces| still supports SDR rendering.
--  EXPECT_EQ(
--      DisplaySnapshot::PrimaryFormat(),
--      display_color_spaces.GetOutputBufferFormat(gfx::ContentColorUsage::kSRGB,
--                                                 /*needs_alpha=*/true));
--
--  const auto sdr_color_space =
--      display_color_spaces.GetOutputColorSpace(gfx::ContentColorUsage::kSRGB,
--                                               /*needs_alpha=*/true);
--  EXPECT_TRUE(sdr_color_space.IsValid());
--  EXPECT_EQ(sdr_color_space.GetPrimaryID(), gfx::ColorSpace::PrimaryID::BT2020);
--  EXPECT_EQ(sdr_color_space.GetTransferID(),
--            gfx::ColorSpace::TransferID::IEC61966_2_1);
--
--  EXPECT_EQ(
--      display_color_spaces.GetOutputBufferFormat(gfx::ContentColorUsage::kHDR,
--                                                 /*needs_alpha=*/true),
--      gfx::BufferFormat::RGBA_1010102);
--
--  const auto hdr_color_space =
--      display_color_spaces.GetOutputColorSpace(gfx::ContentColorUsage::kHDR,
--                                               /*needs_alpha=*/true);
--  EXPECT_TRUE(hdr_color_space.IsValid());
--  EXPECT_EQ(hdr_color_space.GetPrimaryID(), gfx::ColorSpace::PrimaryID::BT2020);
--  EXPECT_EQ(hdr_color_space.GetTransferID(),
--            gfx::ColorSpace::TransferID::PIECEWISE_HDR);
--}
--#endif
--
- INSTANTIATE_TEST_SUITE_P(All,
-                          DisplayChangeObserverTest,
-                          ::testing::Values(false, true));
--- 
-2.28.0
-
diff --git a/srcpkgs/electron9/files/patches/chromium-upstream-0002-Roll-ChromeOS-Airmont-AFDO-profile-from-83-4103.97-1.patch b/srcpkgs/electron9/files/patches/chromium-upstream-0002-Roll-ChromeOS-Airmont-AFDO-profile-from-83-4103.97-1.patch
deleted file mode 100644
index 4f45ef8980fb..000000000000
--- a/srcpkgs/electron9/files/patches/chromium-upstream-0002-Roll-ChromeOS-Airmont-AFDO-profile-from-83-4103.97-1.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From d8cb454e79dc1635133e377645e5591aebaac61d Mon Sep 17 00:00:00 2001
-From: Chrome Release Autoroll
- <chromium-release-autoroll@skia-public.iam.gserviceaccount.com>
-Date: Thu, 25 Jun 2020 08:51:59 +0000
-Subject: [PATCH 02/12] Roll ChromeOS Airmont AFDO profile from
- 83-4103.97-1592214618-benchmark-83.0.4103.117-r1 to
- 83-4103.112-1592823658-benchmark-83.0.4103.119-r1
-
-If this roll has caused a breakage, revert this CL and stop the roller
-using the controls here:
-https://autoroll.skia.org/r/cros-afdo-airmont-chromium-stable
-Please CC c-compiler-chrome@google.com on the revert to ensure that a human
-is aware of the problem.
-
-To report a problem with the AutoRoller itself, please file a bug:
-https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug
-
-Documentation for the AutoRoller is here:
-https://skia.googlesource.com/buildbot/+doc/master/autoroll/README.md
-
-Tbr: c-compiler-chrome@google.com
-Change-Id: I9b5ffbc96b05ed5fd1ce64136398784171f34af7
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2266013
-Reviewed-by: Chrome Release Autoroll <chromium-release-autoroll@skia-public.iam.gserviceaccount.com>
-Commit-Queue: Chrome Release Autoroll <chromium-release-autoroll@skia-public.iam.gserviceaccount.com>
-Cr-Commit-Position: refs/branch-heads/4103@{#725}
-Cr-Branched-From: 8ad47e8d21f6866e4a37f47d83a860d41debf514-refs/heads/master@{#756066}
----
- chromeos/profiles/airmont.afdo.newest.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/chromeos/profiles/airmont.afdo.newest.txt b/chromeos/profiles/airmont.afdo.newest.txt
-index 7298eabbcad..130b8fe862d 100644
---- a/chromeos/profiles/airmont.afdo.newest.txt
-+++ b/chromeos/profiles/airmont.afdo.newest.txt
-@@ -1 +1 @@
--chromeos-chrome-amd64-airmont-83-4103.97-1592214618-benchmark-83.0.4103.117-r1-redacted.afdo.xz
-+chromeos-chrome-amd64-airmont-83-4103.112-1592823658-benchmark-83.0.4103.119-r1-redacted.afdo.xz
--- 
-2.28.0
-
diff --git a/srcpkgs/electron9/files/patches/chromium-upstream-0003-Roll-ChromeOS-Silvermont-AFDO-profile-from-83-4103.9.patch b/srcpkgs/electron9/files/patches/chromium-upstream-0003-Roll-ChromeOS-Silvermont-AFDO-profile-from-83-4103.9.patch
deleted file mode 100644
index 7729ece77cf9..000000000000
--- a/srcpkgs/electron9/files/patches/chromium-upstream-0003-Roll-ChromeOS-Silvermont-AFDO-profile-from-83-4103.9.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From e7fb38d8927a7d14beba0fed4d14d0110af3ed1f Mon Sep 17 00:00:00 2001
-From: Chrome Release Autoroll
- <chromium-release-autoroll@skia-public.iam.gserviceaccount.com>
-Date: Thu, 25 Jun 2020 08:55:40 +0000
-Subject: [PATCH 03/12] Roll ChromeOS Silvermont AFDO profile from
- 83-4103.97-1592216557-benchmark-83.0.4103.117-r1 to
- 83-4103.112-1592819884-benchmark-83.0.4103.119-r1
-
-If this roll has caused a breakage, revert this CL and stop the roller
-using the controls here:
-https://autoroll.skia.org/r/cros-afdo-silvermont-chromium-stable
-Please CC c-compiler-chrome@google.com on the revert to ensure that a human
-is aware of the problem.
-
-To report a problem with the AutoRoller itself, please file a bug:
-https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug
-
-Documentation for the AutoRoller is here:
-https://skia.googlesource.com/buildbot/+doc/master/autoroll/README.md
-
-Tbr: c-compiler-chrome@google.com
-Change-Id: I7a2c091c96266df5398b4d526568e579b42ba772
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2266014
-Reviewed-by: Chrome Release Autoroll <chromium-release-autoroll@skia-public.iam.gserviceaccount.com>
-Commit-Queue: Chrome Release Autoroll <chromium-release-autoroll@skia-public.iam.gserviceaccount.com>
-Cr-Commit-Position: refs/branch-heads/4103@{#726}
-Cr-Branched-From: 8ad47e8d21f6866e4a37f47d83a860d41debf514-refs/heads/master@{#756066}
----
- chromeos/profiles/silvermont.afdo.newest.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/chromeos/profiles/silvermont.afdo.newest.txt b/chromeos/profiles/silvermont.afdo.newest.txt
-index 68786600a49..df48e35c2e9 100644
---- a/chromeos/profiles/silvermont.afdo.newest.txt
-+++ b/chromeos/profiles/silvermont.afdo.newest.txt
-@@ -1 +1 @@
--chromeos-chrome-amd64-silvermont-83-4103.97-1592216557-benchmark-83.0.4103.117-r1-redacted.afdo.xz
-+chromeos-chrome-amd64-silvermont-83-4103.112-1592819884-benchmark-83.0.4103.119-r1-redacted.afdo.xz
--- 
-2.28.0
-
diff --git a/srcpkgs/electron9/files/patches/chromium-upstream-0004-Roll-ChromeOS-Broadwell-AFDO-profile-from-83-4103.97.patch b/srcpkgs/electron9/files/patches/chromium-upstream-0004-Roll-ChromeOS-Broadwell-AFDO-profile-from-83-4103.97.patch
deleted file mode 100644
index 573f2e7058ed..000000000000
--- a/srcpkgs/electron9/files/patches/chromium-upstream-0004-Roll-ChromeOS-Broadwell-AFDO-profile-from-83-4103.97.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From c90071e2caaf28da14536e4b3f6c74cba71c924c Mon Sep 17 00:00:00 2001
-From: Chrome Release Autoroll
- <chromium-release-autoroll@skia-public.iam.gserviceaccount.com>
-Date: Thu, 25 Jun 2020 09:52:48 +0000
-Subject: [PATCH 04/12] Roll ChromeOS Broadwell AFDO profile from
- 83-4103.97-1592218687-benchmark-83.0.4103.117-r1 to
- 83-4103.97-1592819197-benchmark-83.0.4103.119-r1
-
-If this roll has caused a breakage, revert this CL and stop the roller
-using the controls here:
-https://autoroll.skia.org/r/cros-afdo-broadwell-chromium-stable
-Please CC c-compiler-chrome@google.com on the revert to ensure that a human
-is aware of the problem.
-
-To report a problem with the AutoRoller itself, please file a bug:
-https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug
-
-Documentation for the AutoRoller is here:
-https://skia.googlesource.com/buildbot/+doc/master/autoroll/README.md
-
-Tbr: c-compiler-chrome@google.com
-Change-Id: I3de1bd68eda26a92502c2e38044b2bd4dd855d71
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2266019
-Reviewed-by: Chrome Release Autoroll <chromium-release-autoroll@skia-public.iam.gserviceaccount.com>
-Commit-Queue: Chrome Release Autoroll <chromium-release-autoroll@skia-public.iam.gserviceaccount.com>
-Cr-Commit-Position: refs/branch-heads/4103@{#727}
-Cr-Branched-From: 8ad47e8d21f6866e4a37f47d83a860d41debf514-refs/heads/master@{#756066}
----
- chromeos/profiles/broadwell.afdo.newest.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/chromeos/profiles/broadwell.afdo.newest.txt b/chromeos/profiles/broadwell.afdo.newest.txt
-index 7ca64107ca9..953aba58a64 100644
---- a/chromeos/profiles/broadwell.afdo.newest.txt
-+++ b/chromeos/profiles/broadwell.afdo.newest.txt
-@@ -1 +1 @@
--chromeos-chrome-amd64-broadwell-83-4103.97-1592218687-benchmark-83.0.4103.117-r1-redacted.afdo.xz
-+chromeos-chrome-amd64-broadwell-83-4103.97-1592819197-benchmark-83.0.4103.119-r1-redacted.afdo.xz
--- 
-2.28.0
-
diff --git a/srcpkgs/electron9/files/patches/chromium-upstream-0005-Incrementing-VERSION-to-83.0.4103.120.patch b/srcpkgs/electron9/files/patches/chromium-upstream-0005-Incrementing-VERSION-to-83.0.4103.120.patch
deleted file mode 100644
index eae45d103294..000000000000
--- a/srcpkgs/electron9/files/patches/chromium-upstream-0005-Incrementing-VERSION-to-83.0.4103.120.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From dd68d8efe2c4a5c3f04317d71e359b2d579fcf59 Mon Sep 17 00:00:00 2001
-From: chrome-release-bot <chrome-release-bot@chromium.org>
-Date: Fri, 26 Jun 2020 15:05:21 +0000
-Subject: [PATCH 05/12] Incrementing VERSION to 83.0.4103.120
-
-TBR=benmason@chromium.org
-
-Change-Id: I2de6fbef6b1d5ba6d9bbd5296e9706d7ca3194e2
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2269505
-Reviewed-by: Chrome Release Bot (LUCI) <chrome-official-brancher@chops-service-accounts.iam.gserviceaccount.com>
-Cr-Commit-Position: refs/branch-heads/4103@{#728}
-Cr-Branched-From: 8ad47e8d21f6866e4a37f47d83a860d41debf514-refs/heads/master@{#756066}
----
- chrome/VERSION | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/chrome/VERSION b/chrome/VERSION
-index 7c0499cafac..f7310a92cf3 100644
---- a/chrome/VERSION
-+++ b/chrome/VERSION
-@@ -1,4 +1,4 @@
- MAJOR=83
- MINOR=0
- BUILD=4103
--PATCH=119
-+PATCH=120
--- 
-2.28.0
-
diff --git a/srcpkgs/electron9/files/patches/chromium-upstream-0006-Move-GCPW-bookkeeping-out-of-forked-process.patch b/srcpkgs/electron9/files/patches/chromium-upstream-0006-Move-GCPW-bookkeeping-out-of-forked-process.patch
deleted file mode 100644
index 0a5e002765de..000000000000
--- a/srcpkgs/electron9/files/patches/chromium-upstream-0006-Move-GCPW-bookkeeping-out-of-forked-process.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-From 8b78203d8d1991e4ed8b50b5d44e1c8e76c60001 Mon Sep 17 00:00:00 2001
-From: Yusuf Sengul <yusufsn@google.com>
-Date: Fri, 26 Jun 2020 19:54:38 +0000
-Subject: [PATCH 06/12] Move GCPW bookkeeping out of forked process
-
-(cherry picked from commit f2e3565562e38e760220a4c6d2ea895477081095)
-
-Bug: 1097407
-Change-Id: I80b0fa57cc19196b06b3cbec5afc7c4488ff7325
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2255113
-Commit-Queue: Yusuf Sengul <yusufsn@google.com>
-Reviewed-by: Rakesh Soma <rakeshsoma@google.com>
-Cr-Original-Commit-Position: refs/heads/master@{#781721}
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2268117
-Cr-Commit-Position: refs/branch-heads/4103@{#729}
-Cr-Branched-From: 8ad47e8d21f6866e4a37f47d83a860d41debf514-refs/heads/master@{#756066}
----
- .../gaiacp/gaia_credential_base.cc            | 67 ++++++++++---------
- .../gaiacp/gaia_credential_base.h             |  5 +-
- 2 files changed, 37 insertions(+), 35 deletions(-)
-
-diff --git a/chrome/credential_provider/gaiacp/gaia_credential_base.cc b/chrome/credential_provider/gaiacp/gaia_credential_base.cc
-index 6704a9db9c8..30e8011b73d 100644
---- a/chrome/credential_provider/gaiacp/gaia_credential_base.cc
-+++ b/chrome/credential_provider/gaiacp/gaia_credential_base.cc
-@@ -1986,7 +1986,7 @@ unsigned __stdcall CGaiaCredentialBase::WaitForLoginUI(void* param) {
- }
- 
- // static
--HRESULT CGaiaCredentialBase::SaveAccountInfo(const base::Value& properties) {
-+HRESULT CGaiaCredentialBase::PerformActions(const base::Value& properties) {
-   LOGFN(VERBOSE);
- 
-   base::string16 sid = GetDictString(properties, kKeySID);
-@@ -2009,35 +2009,9 @@ HRESULT CGaiaCredentialBase::SaveAccountInfo(const base::Value& properties) {
- 
-   base::string16 domain = GetDictString(properties, kKeyDomain);
- 
--  // TODO(crbug.com/976744): Use the down scoped kKeyMdmAccessToken instead
--  // of login scoped token.
--  std::string access_token = GetDictStringUTF8(properties, kKeyAccessToken);
--  if (!access_token.empty()) {
--    // Update the password recovery information if possible.
--    HRESULT hr = PasswordRecoveryManager::Get()->StoreWindowsPasswordIfNeeded(
--        sid, access_token, password);
--    if (FAILED(hr) && hr != E_NOTIMPL)
--      LOGFN(ERROR) << "StoreWindowsPasswordIfNeeded hr=" << putHR(hr);
--
--    // Upload device details to gem database.
--    hr = GemDeviceDetailsManager::Get()->UploadDeviceDetails(access_token, sid,
--                                                             username, domain);
--    if (FAILED(hr) && hr != E_NOTIMPL)
--      LOGFN(ERROR) << "UploadDeviceDetails hr=" << putHR(hr);
--
--    SetUserProperty(sid, kRegDeviceDetailsUploadStatus, SUCCEEDED(hr) ? 1 : 0);
--
--    // Below setter is only used for unit testing.
--    GemDeviceDetailsManager::Get()->SetUploadStatusForTesting(hr);
--  } else {
--    LOGFN(ERROR) << "Access token is empty. Cannot save Windows password.";
--  }
--
-   // Load the user's profile so that their registry hive is available.
-   auto profile = ScopedUserProfile::Create(sid, domain, username, password);
- 
--  SecurelyClearString(password);
--
-   if (!profile) {
-     LOGFN(ERROR) << "Could not load user profile";
-     return E_UNEXPECTED;
-@@ -2047,6 +2021,32 @@ HRESULT CGaiaCredentialBase::SaveAccountInfo(const base::Value& properties) {
-   if (FAILED(hr))
-     LOGFN(ERROR) << "profile.SaveAccountInfo failed (cont) hr=" << putHR(hr);
- 
-+  // TODO(crbug.com/976744): Use the down scoped kKeyMdmAccessToken instead
-+  // of login scoped token.
-+  std::string access_token = GetDictStringUTF8(properties, kKeyAccessToken);
-+  if (access_token.empty()) {
-+    LOGFN(ERROR) << "Access token is empty.";
-+    return E_FAIL;
-+  }
-+
-+  // Update the password recovery information if possible.
-+  hr = PasswordRecoveryManager::Get()->StoreWindowsPasswordIfNeeded(
-+    sid, access_token, password);
-+  SecurelyClearString(password);
-+  if (FAILED(hr) && hr != E_NOTIMPL)
-+    LOGFN(ERROR) << "StoreWindowsPasswordIfNeeded hr=" << putHR(hr);
-+
-+  // Upload device details to gem database.
-+  hr = GemDeviceDetailsManager::Get()->UploadDeviceDetails(access_token, sid,
-+                                                           username, domain);
-+  if (FAILED(hr) && hr != E_NOTIMPL)
-+    LOGFN(ERROR) << "UploadDeviceDetails hr=" << putHR(hr);
-+
-+  SetUserProperty(sid, kRegDeviceDetailsUploadStatus, SUCCEEDED(hr) ? 1 : 0);
-+
-+  // Below setter is only used for unit testing.
-+  GemDeviceDetailsManager::Get()->SetUploadStatusForTesting(hr);
-+
-   return hr;
- }
- 
-@@ -2058,9 +2058,9 @@ HRESULT CGaiaCredentialBase::PerformPostSigninActions(
-   HRESULT hr = S_OK;
- 
-   if (com_initialized) {
--    hr = credential_provider::CGaiaCredentialBase::SaveAccountInfo(properties);
-+    hr = credential_provider::CGaiaCredentialBase::PerformActions(properties);
-     if (FAILED(hr))
--      LOGFN(ERROR) << "SaveAccountInfo hr=" << putHR(hr);
-+      LOGFN(ERROR) << "PerformActions hr=" << putHR(hr);
- 
-     // Try to enroll the machine to MDM here. MDM requires a user to be signed
-     // on to an interactive session to succeed and when we call this function
-@@ -2089,10 +2089,11 @@ HRESULT CGaiaCredentialBase::PerformPostSigninActions(
- 
- // Registers OS user - gaia user association in HKEY_LOCAL_MACHINE registry
- // hive.
--HRESULT RegisterAssociation(const base::string16& sid,
--                            const base::string16& id,
--                            const base::string16& email,
--                            const base::string16& token_handle) {
-+HRESULT
-+RegisterAssociation(const base::string16& sid,
-+                    const base::string16& id,
-+                    const base::string16& email,
-+                    const base::string16& token_handle) {
-   // Save token handle.  This handle will be used later to determine if the
-   // the user has changed their password since the account was created.
-   HRESULT hr = SetUserProperty(sid, kUserTokenHandle, token_handle);
-diff --git a/chrome/credential_provider/gaiacp/gaia_credential_base.h b/chrome/credential_provider/gaiacp/gaia_credential_base.h
-index 6aaaf44244b..6bf33ff4d3b 100644
---- a/chrome/credential_provider/gaiacp/gaia_credential_base.h
-+++ b/chrome/credential_provider/gaiacp/gaia_credential_base.h
-@@ -97,8 +97,9 @@ class ATL_NO_VTABLE CGaiaCredentialBase
-     return authentication_results_;
-   }
- 
--  // Saves gaia information in the OS account that was just created.
--  static HRESULT SaveAccountInfo(const base::Value& properties);
-+  // Saves account association and user profile information. Makes various HTTP
-+  // calls regarding device provisioning and password management.
-+  static HRESULT PerformActions(const base::Value& properties);
- 
-   // Returns true if the current credentials stored in |username_| and
-   // |password_| are valid and should succeed a local Windows logon. This
--- 
-2.28.0
-
diff --git a/srcpkgs/electron9/files/patches/chromium-upstream-0007-Support-GCPW-login-to-permitted-accounts.patch b/srcpkgs/electron9/files/patches/chromium-upstream-0007-Support-GCPW-login-to-permitted-accounts.patch
deleted file mode 100644
index ffcc4d1fc95c..000000000000
--- a/srcpkgs/electron9/files/patches/chromium-upstream-0007-Support-GCPW-login-to-permitted-accounts.patch
+++ /dev/null
@@ -1,197 +0,0 @@
-From d1383216cbceb10aaa80f357689e85354af6af3c Mon Sep 17 00:00:00 2001
-From: Yusuf Sengul <yusufsn@google.com>
-Date: Fri, 26 Jun 2020 20:38:33 +0000
-Subject: [PATCH 07/12] Support GCPW login to permitted accounts
-
-(cherry picked from commit f414152fa9a664ca5e99d4c0d0a2e261f9846eae)
-
-Bug: 1097386
-Change-Id: I2a9e634868fcda6c8acc46e482c2f6dc14bdc064
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2255028
-Commit-Queue: Rakesh Soma <rakeshsoma@google.com>
-Reviewed-by: Rakesh Soma <rakeshsoma@google.com>
-Cr-Original-Commit-Position: refs/heads/master@{#781997}
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2268083
-Commit-Queue: Yusuf Sengul <yusufsn@google.com>
-Cr-Commit-Position: refs/branch-heads/4103@{#730}
-Cr-Branched-From: 8ad47e8d21f6866e4a37f47d83a860d41debf514-refs/heads/master@{#756066}
----
- .../gaiacp/gaia_credential_base.cc            | 30 ++++--
- .../gaiacp/gaia_credential_base_unittests.cc  | 92 +++++++++++++++++++
- 2 files changed, 116 insertions(+), 6 deletions(-)
-
-diff --git a/chrome/credential_provider/gaiacp/gaia_credential_base.cc b/chrome/credential_provider/gaiacp/gaia_credential_base.cc
-index 30e8011b73d..cc573863991 100644
---- a/chrome/credential_provider/gaiacp/gaia_credential_base.cc
-+++ b/chrome/credential_provider/gaiacp/gaia_credential_base.cc
-@@ -70,6 +70,8 @@ namespace {
- 
- constexpr wchar_t kEmailDomainsKey[] = L"ed";  // deprecated.
- constexpr wchar_t kEmailDomainsKeyNew[] = L"domains_allowed_to_login";
-+constexpr wchar_t kPermittedAccounts[] = L"permitted_accounts";
-+constexpr wchar_t kPermittedAccountsSeparator[] = L",";
- constexpr char kGetAccessTokenBodyWithScopeFormat[] =
-     "client_id=%s&"
-     "client_secret=%s&"
-@@ -95,6 +97,16 @@ constexpr UINT kPasswordErrors[] = {IDS_PASSWORD_COMPLEXITY_ERROR_BASE,
-                                     IDS_USER_NOT_FOUND_PASSWORD_ERROR_BASE,
-                                     IDS_AD_PASSWORD_CHANGE_DENIED_BASE};
- 
-+std::vector<base::string16> GetPermittedAccounts() {
-+  base::string16 permitted_accounts_reg =
-+      GetGlobalFlagOrDefault(kPermittedAccounts, L"");
-+
-+  return base::SplitString(base::ToLowerASCII(permitted_accounts_reg),
-+                           kPermittedAccountsSeparator,
-+                           base::WhitespaceHandling::TRIM_WHITESPACE,
-+                           base::SplitResult::SPLIT_WANT_NONEMPTY);
-+}
-+
- base::string16 GetEmailDomains(
-     const base::string16 restricted_domains_reg_key) {
-   return GetGlobalFlagOrDefault(restricted_domains_reg_key, L"");
-@@ -118,12 +130,9 @@ base::string16 GetEmailDomainsPrintableString() {
-                         base::ASCIIToUTF16(kEmailDomainsSeparator),
-                         base::WhitespaceHandling::TRIM_WHITESPACE,
-                         base::SplitResult::SPLIT_WANT_NONEMPTY);
--  base::string16 email_domains_str;
--  for (size_t i = 0; i < domains.size(); ++i) {
--    email_domains_str += domains[i];
--    if (i < domains.size() - 1)
--      email_domains_str += L", ";
--  }
-+  base::string16 email_domains_str =
-+      base::JoinString(domains, base::string16(L", "));
-+
-   return email_domains_str;
- }
- 
-@@ -2403,6 +2412,15 @@ HRESULT CGaiaCredentialBase::OnUserAuthenticated(BSTR authentication_info,
-       return hr;
-     }
- 
-+    base::string16 email = GetDictString(*properties, kKeyEmail);
-+    std::vector<base::string16> permitted_accounts = GetPermittedAccounts();
-+    if (!permitted_accounts.empty() &&
-+        std::find(permitted_accounts.begin(), permitted_accounts.end(),
-+                  email) == permitted_accounts.end()) {
-+      *status_text = AllocErrorString(IDS_EMAIL_MISMATCH_BASE);
-+      return E_FAIL;
-+    }
-+
-     // The value in |dict| is now known to contain everything that is needed
-     // from the GLS. Try to validate the user that wants to sign in and then
-     // add additional information into |dict| as needed.
-diff --git a/chrome/credential_provider/gaiacp/gaia_credential_base_unittests.cc b/chrome/credential_provider/gaiacp/gaia_credential_base_unittests.cc
-index 3cc48fa5b26..319f239e4cd 100644
---- a/chrome/credential_provider/gaiacp/gaia_credential_base_unittests.cc
-+++ b/chrome/credential_provider/gaiacp/gaia_credential_base_unittests.cc
-@@ -6,6 +6,8 @@
- 
- #include <sddl.h>  // For ConvertSidToStringSid()
- #include <wrl/client.h>
-+#include <algorithm>
-+#include <vector>
- 
- #include "base/files/scoped_temp_dir.h"
- #include "base/strings/string_number_conversions.h"
-@@ -738,6 +740,96 @@ INSTANTIATE_TEST_SUITE_P(
-                        ::testing::Values(L"acme.com,acme2.com,acme3.com",
-                                          L"")));
- 
-+class GcpGaiaCredentialBasePermittedAccountTest
-+    : public GcpGaiaCredentialBaseTest,
-+      public ::testing::WithParamInterface<
-+          std::tuple<const wchar_t*, const wchar_t*>> {
-+ public:
-+  // Get a pretty-printed string of the list of email domains that we can
-+  // display to the end-user.
-+  base::string16 GetEmailDomainsPrintableString() {
-+    base::string16 email_domains_reg_old = GetGlobalFlagOrDefault(L"ed", L"");
-+    base::string16 email_domains_reg_new =
-+        GetGlobalFlagOrDefault(L"domains_allowed_to_login", L"");
-+
-+    base::string16 email_domains_reg = email_domains_reg_old.empty()
-+                                           ? email_domains_reg_new
-+                                           : email_domains_reg_old;
-+    if (email_domains_reg.empty())
-+      return email_domains_reg;
-+
-+    std::vector<base::string16> domains =
-+        base::SplitString(base::ToLowerASCII(email_domains_reg),
-+                          base::ASCIIToUTF16(kEmailDomainsSeparator),
-+                          base::WhitespaceHandling::TRIM_WHITESPACE,
-+                          base::SplitResult::SPLIT_WANT_NONEMPTY);
-+    base::string16 email_domains_str;
-+    for (size_t i = 0; i < domains.size(); ++i) {
-+      email_domains_str += domains[i];
-+      if (i < domains.size() - 1)
-+        email_domains_str += L", ";
-+    }
-+    return email_domains_str;
-+  }
-+};
-+
-+TEST_P(GcpGaiaCredentialBasePermittedAccountTest, PermittedAccounts) {
-+  const base::string16 permitted_acounts = std::get<0>(GetParam());
-+  const base::string16 restricted_domains = std::get<1>(GetParam());
-+
-+  ASSERT_EQ(S_OK,
-+            SetGlobalFlagForTesting(L"permitted_accounts", permitted_acounts));
-+  ASSERT_EQ(S_OK, SetGlobalFlagForTesting(L"domains_allowed_to_login",
-+                                          restricted_domains));
-+
-+  // Create provider and start logon.
-+  Microsoft::WRL::ComPtr<ICredentialProviderCredential> cred;
-+
-+  ASSERT_EQ(S_OK, InitializeProviderAndGetCredential(0, &cred));
-+  Microsoft::WRL::ComPtr<ITestCredential> test;
-+  ASSERT_EQ(S_OK, cred.As(&test));
-+
-+  base::string16 email = L"user@test.com";
-+  base::string16 email_domain = email.substr(email.find(L"@") + 1);
-+
-+  ASSERT_EQ(S_OK, test->SetGlsEmailAddress(base::UTF16ToUTF8(email)));
-+
-+  bool allowed_email = permitted_acounts.empty() ||
-+                       permitted_acounts.find(email) != base::string16::npos;
-+  bool found_domain =
-+      restricted_domains.find(email_domain) != base::string16::npos;
-+
-+  if (!found_domain)
-+    ASSERT_EQ(S_OK, test->SetDefaultExitCode(kUiecInvalidEmailDomain));
-+
-+  ASSERT_EQ(S_OK, StartLogonProcessAndWait());
-+
-+  if (allowed_email && found_domain) {
-+    ASSERT_EQ(S_OK, FinishLogonProcess(true, true, 0));
-+  } else {
-+    base::string16 expected_error_msg;
-+    if (!found_domain) {
-+      expected_error_msg = base::ReplaceStringPlaceholders(
-+          GetStringResource(IDS_INVALID_EMAIL_DOMAIN_BASE),
-+          {GetEmailDomainsPrintableString()}, nullptr);
-+    } else {
-+      expected_error_msg = GetStringResource(IDS_EMAIL_MISMATCH_BASE);
-+    }
-+    // Logon process should fail with the specified error message.
-+    ASSERT_EQ(S_OK, FinishLogonProcess(false, false, expected_error_msg));
-+  }
-+}
-+
-+INSTANTIATE_TEST_SUITE_P(
-+    All,
-+    GcpGaiaCredentialBasePermittedAccountTest,
-+    ::testing::Combine(
-+        ::testing::Values(L"",
-+                          L"user@test.com",
-+                          L"other@test.com",
-+                          L"other@test.com,user@test.com"),
-+        ::testing::Values(L"test.com", L"best.com", L"test.com,best.com")));
-+
- TEST_F(GcpGaiaCredentialBaseTest, StripEmailTLD) {
-   USES_CONVERSION;
-   // Create provider and start logon.
--- 
-2.28.0
-
diff --git a/srcpkgs/electron9/files/patches/chromium-upstream-0008-Handle-lsa_account_rights-size-properly.patch b/srcpkgs/electron9/files/patches/chromium-upstream-0008-Handle-lsa_account_rights-size-properly.patch
deleted file mode 100644
index 5fd13d7ddf4f..000000000000
--- a/srcpkgs/electron9/files/patches/chromium-upstream-0008-Handle-lsa_account_rights-size-properly.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From bff845848fa339fc9bae70eef8943c4956b9a6db Mon Sep 17 00:00:00 2001
-From: Rakesh Soma <rakeshsoma@google.com>
-Date: Fri, 26 Jun 2020 23:55:46 +0000
-Subject: [PATCH 08/12] Handle lsa_account_rights size properly.
-
-Bug: 1099890
-Change-Id: Ib27d52be51b0067ef76c212aaa5e067ec20af6de
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2269882
-Commit-Queue: Rakesh Soma <rakeshsoma@google.com>
-Commit-Queue: Yusuf Sengul <yusufsn@google.com>
-Reviewed-by: Yusuf Sengul <yusufsn@google.com>
-Cr-Commit-Position: refs/heads/master@{#783200}
-(cherry picked from commit 0070fe8bfa5126cebc78e1c22081f83b7f9c421c)
-
-NOTRY=true
-
-Change-Id: Ib27d52be51b0067ef76c212aaa5e067ec20af6de
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2270630
-Commit-Queue: Rakesh Soma <rakeshsoma@google.com>
-Reviewed-by: Rakesh Soma <rakeshsoma@google.com>
-Reviewed-by: Yusuf Sengul <yusufsn@google.com>
-Cr-Commit-Position: refs/branch-heads/4103@{#731}
-Cr-Branched-From: 8ad47e8d21f6866e4a37f47d83a860d41debf514-refs/heads/master@{#756066}
----
- chrome/credential_provider/gaiacp/scoped_lsa_policy.cc | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/chrome/credential_provider/gaiacp/scoped_lsa_policy.cc b/chrome/credential_provider/gaiacp/scoped_lsa_policy.cc
-index 425f305716d..5c05d08e81f 100644
---- a/chrome/credential_provider/gaiacp/scoped_lsa_policy.cc
-+++ b/chrome/credential_provider/gaiacp/scoped_lsa_policy.cc
-@@ -133,7 +133,8 @@ HRESULT ScopedLsaPolicy::AddAccountRights(
-     InitLsaString(right.c_str(), &lsa_right);
-     lsa_rights.push_back(lsa_right);
-   }
--  NTSTATUS sts = ::LsaAddAccountRights(handle_, sid, lsa_rights.data(), 1);
-+  NTSTATUS sts =
-+      ::LsaAddAccountRights(handle_, sid, lsa_rights.data(), lsa_rights.size());
-   if (sts != STATUS_SUCCESS) {
-     HRESULT hr = HRESULT_FROM_NT(sts);
-     LOGFN(ERROR) << "LsaAddAccountRights sts=" << putHR(sts)
-@@ -152,8 +153,8 @@ HRESULT ScopedLsaPolicy::RemoveAccountRights(
-     InitLsaString(right.c_str(), &lsa_right);
-     lsa_rights.push_back(lsa_right);
-   }
--  NTSTATUS sts =
--      ::LsaRemoveAccountRights(handle_, sid, FALSE, lsa_rights.data(), 1);
-+  NTSTATUS sts = ::LsaRemoveAccountRights(handle_, sid, FALSE,
-+                                          lsa_rights.data(), lsa_rights.size());
-   if (sts != STATUS_SUCCESS) {
-     HRESULT hr = HRESULT_FROM_NT(sts);
-     LOGFN(ERROR) << "LsaRemoveAccountRights sts=" << putHR(sts)
--- 
-2.28.0
-
diff --git a/srcpkgs/electron9/files/patches/chromium-upstream-0009-Incrementing-VERSION-to-83.0.4103.121.patch b/srcpkgs/electron9/files/patches/chromium-upstream-0009-Incrementing-VERSION-to-83.0.4103.121.patch
deleted file mode 100644
index 548229253440..000000000000
--- a/srcpkgs/electron9/files/patches/chromium-upstream-0009-Incrementing-VERSION-to-83.0.4103.121.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 9068067e3fc13cc7c89c04ec05271d27cb303810 Mon Sep 17 00:00:00 2001
-From: chrome-release-bot <chrome-release-bot@chromium.org>
-Date: Sat, 27 Jun 2020 00:22:04 +0000
-Subject: [PATCH 09/12] Incrementing VERSION to 83.0.4103.121
-
-TBR=kariah@chromium.org
-
-Change-Id: Ia91d140a59328480f389c94ab85715308bfee2ea
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2271260
-Reviewed-by: Chrome Release Bot (LUCI) <chrome-official-brancher@chops-service-accounts.iam.gserviceaccount.com>
-Cr-Commit-Position: refs/branch-heads/4103@{#732}
-Cr-Branched-From: 8ad47e8d21f6866e4a37f47d83a860d41debf514-refs/heads/master@{#756066}
----
- chrome/VERSION | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/chrome/VERSION b/chrome/VERSION
-index f7310a92cf3..ff22ff08a83 100644
---- a/chrome/VERSION
-+++ b/chrome/VERSION
-@@ -1,4 +1,4 @@
- MAJOR=83
- MINOR=0
- BUILD=4103
--PATCH=120
-+PATCH=121
--- 
-2.28.0
-
diff --git a/srcpkgs/electron9/files/patches/chromium-upstream-0010-Disable-flaky-DiceManageAccountBrowserTest.ClearMana.patch b/srcpkgs/electron9/files/patches/chromium-upstream-0010-Disable-flaky-DiceManageAccountBrowserTest.ClearMana.patch
deleted file mode 100644
index b7c3dc5d9127..000000000000
--- a/srcpkgs/electron9/files/patches/chromium-upstream-0010-Disable-flaky-DiceManageAccountBrowserTest.ClearMana.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 4f3d2dee87d40491ef4a2664e21168462f3bb681 Mon Sep 17 00:00:00 2001
-From: Alexander Hendrich <hendrich@chromium.org>
-Date: Sat, 27 Jun 2020 01:33:00 +0000
-Subject: [PATCH 10/12] Disable flaky
- DiceManageAccountBrowserTest.ClearManagedProfileOnStartup [M83 merge]
-
-TBR=msarda@chromium.org,hendrich@chromium.org
-
-(cherry picked from commit 9eeb72ff8110366b2501321d4b7f6e3e470796e6)
-
-Bug: 1075896
-Change-Id: I6c5e9c60fffae5bb9fcbb7b29fb3ed1d6f71fbfd
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2170026
-Reviewed-by: Alexander Hendrich <hendrich@chromium.org>
-Commit-Queue: Alexander Hendrich <hendrich@chromium.org>
-Cr-Original-Commit-Position: refs/heads/master@{#763258}
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2268386
-Reviewed-by: Carlos Knippschild <carlosk@chromium.org>
-Commit-Queue: Carlos Knippschild <carlosk@chromium.org>
-Cr-Commit-Position: refs/branch-heads/4103@{#733}
-Cr-Branched-From: 8ad47e8d21f6866e4a37f47d83a860d41debf514-refs/heads/master@{#756066}
----
- chrome/browser/signin/dice_browsertest.cc | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/chrome/browser/signin/dice_browsertest.cc b/chrome/browser/signin/dice_browsertest.cc
-index e0733ccb9eb..b362f578882 100644
---- a/chrome/browser/signin/dice_browsertest.cc
-+++ b/chrome/browser/signin/dice_browsertest.cc
-@@ -1015,8 +1015,9 @@ IN_PROC_BROWSER_TEST_F(DiceManageAccountBrowserTest,
-       prefs::kSigninAllowedOnNextStartup, false);
- }
- 
-+// TODO(https://crbug.com/1075896) disabling test due to flakiness
- IN_PROC_BROWSER_TEST_F(DiceManageAccountBrowserTest,
--                       ClearManagedProfileOnStartup) {
-+                       DISABLED_ClearManagedProfileOnStartup) {
-   // Initial profile should have been deleted as sign-in and sign out were no
-   // longer allowed.
-   PrefService* local_state = g_browser_process->local_state();
--- 
-2.28.0
-
diff --git a/srcpkgs/electron9/files/patches/chromium-upstream-0011-Incrementing-VERSION-to-83.0.4103.122.patch b/srcpkgs/electron9/files/patches/chromium-upstream-0011-Incrementing-VERSION-to-83.0.4103.122.patch
deleted file mode 100644
index a32b39087552..000000000000
--- a/srcpkgs/electron9/files/patches/chromium-upstream-0011-Incrementing-VERSION-to-83.0.4103.122.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 5277168d1691ce40fc04fb4adefd89d8eb39c81e Mon Sep 17 00:00:00 2001
-From: chrome-release-bot <chrome-release-bot@chromium.org>
-Date: Sat, 27 Jun 2020 18:07:45 +0000
-Subject: [PATCH 11/12] Incrementing VERSION to 83.0.4103.122
-
-TBR=lakpamarthy@chromium.org
-
-Change-Id: I5b90c234baff6204fb1684a4d99878771a112e38
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2271618
-Reviewed-by: Chrome Release Bot (LUCI) <chrome-official-brancher@chops-service-accounts.iam.gserviceaccount.com>
-Cr-Commit-Position: refs/branch-heads/4103@{#734}
-Cr-Branched-From: 8ad47e8d21f6866e4a37f47d83a860d41debf514-refs/heads/master@{#756066}
----
- chrome/VERSION | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/chrome/VERSION b/chrome/VERSION
-index ff22ff08a83..ea9ff344413 100644
---- a/chrome/VERSION
-+++ b/chrome/VERSION
-@@ -1,4 +1,4 @@
- MAJOR=83
- MINOR=0
- BUILD=4103
--PATCH=121
-+PATCH=122
--- 
-2.28.0
-
diff --git a/srcpkgs/electron9/files/patches/chromium-v8-remove-soon-to-be-removed-getAllFieldPositions.patch b/srcpkgs/electron9/files/patches/chromium-v8-remove-soon-to-be-removed-getAllFieldPositions.patch
deleted file mode 100644
index d251ceb6ac83..000000000000
--- a/srcpkgs/electron9/files/patches/chromium-v8-remove-soon-to-be-removed-getAllFieldPositions.patch
+++ /dev/null
@@ -1,172 +0,0 @@
-From 3f8dc4b2e5baf77b463334c769af85b79d8c1463 Mon Sep 17 00:00:00 2001
-From: Frank Tang <ftang@chromium.org>
-Date: Fri, 3 Apr 2020 23:13:54 -0700
-Subject: [PATCH] [intl] Remove soon-to-be removed getAllFieldPositions
-
-Needed to land ICU67.1 soon.
-
-Bug: v8:10393
-Change-Id: I3c7737ca600d6ccfdc46ffaddfb318ce60bc7618
-Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2136489
-Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
-Commit-Queue: Frank Tang <ftang@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#67027}
----
- src/objects/js-number-format.cc | 77 +++++++++++++++++----------------
- 1 file changed, 39 insertions(+), 38 deletions(-)
-
-diff --git a/v8/src/objects/js-number-format.cc b/v8/src/objects/js-number-format.cc
-index ad831c5c36..bcd44031d5 100644
---- a/v8/src/objects/js-number-format.cc
-+++ b/v8/src/objects/js-number-format.cc
-@@ -1241,44 +1241,33 @@ MaybeHandle<JSNumberFormat> JSNumberFormat::New(Isolate* isolate,
- }
- 
- namespace {
--Maybe<icu::UnicodeString> IcuFormatNumber(
-+Maybe<bool> IcuFormatNumber(
-     Isolate* isolate,
-     const icu::number::LocalizedNumberFormatter& number_format,
--    Handle<Object> numeric_obj, icu::FieldPositionIterator* fp_iter) {
-+    Handle<Object> numeric_obj, icu::number::FormattedNumber* formatted) {
-   // If it is BigInt, handle it differently.
-   UErrorCode status = U_ZERO_ERROR;
--  icu::number::FormattedNumber formatted;
-   if (numeric_obj->IsBigInt()) {
-     Handle<BigInt> big_int = Handle<BigInt>::cast(numeric_obj);
-     Handle<String> big_int_string;
-     ASSIGN_RETURN_ON_EXCEPTION_VALUE(isolate, big_int_string,
-                                      BigInt::ToString(isolate, big_int),
--                                     Nothing<icu::UnicodeString>());
--    formatted = number_format.formatDecimal(
-+                                     Nothing<bool>());
-+    *formatted = number_format.formatDecimal(
-         {big_int_string->ToCString().get(), big_int_string->length()}, status);
-   } else {
-     double number = numeric_obj->IsNaN()
-                         ? std::numeric_limits<double>::quiet_NaN()
-                         : numeric_obj->Number();
--    formatted = number_format.formatDouble(number, status);
-+    *formatted = number_format.formatDouble(number, status);
-   }
-   if (U_FAILURE(status)) {
-     // This happen because of icu data trimming trim out "unit".
-     // See https://bugs.chromium.org/p/v8/issues/detail?id=8641
--    THROW_NEW_ERROR_RETURN_VALUE(isolate,
--                                 NewTypeError(MessageTemplate::kIcuError),
--                                 Nothing<icu::UnicodeString>());
--  }
--  if (fp_iter) {
--    formatted.getAllFieldPositions(*fp_iter, status);
--  }
--  icu::UnicodeString result = formatted.toString(status);
--  if (U_FAILURE(status)) {
--    THROW_NEW_ERROR_RETURN_VALUE(isolate,
--                                 NewTypeError(MessageTemplate::kIcuError),
--                                 Nothing<icu::UnicodeString>());
-+    THROW_NEW_ERROR_RETURN_VALUE(
-+        isolate, NewTypeError(MessageTemplate::kIcuError), Nothing<bool>());
-   }
--  return Just(result);
-+  return Just(true);
- }
- 
- }  // namespace
-@@ -1289,10 +1278,16 @@ MaybeHandle<String> JSNumberFormat::FormatNumeric(
-     Handle<Object> numeric_obj) {
-   DCHECK(numeric_obj->IsNumeric());
- 
--  Maybe<icu::UnicodeString> maybe_format =
--      IcuFormatNumber(isolate, number_format, numeric_obj, nullptr);
-+  icu::number::FormattedNumber formatted;
-+  Maybe<bool> maybe_format =
-+      IcuFormatNumber(isolate, number_format, numeric_obj, &formatted);
-   MAYBE_RETURN(maybe_format, Handle<String>());
--  return Intl::ToString(isolate, maybe_format.FromJust());
-+  UErrorCode status = U_ZERO_ERROR;
-+  icu::UnicodeString result = formatted.toString(status);
-+  if (U_FAILURE(status)) {
-+    THROW_NEW_ERROR(isolate, NewTypeError(MessageTemplate::kIcuError), String);
-+  }
-+  return Intl::ToString(isolate, result);
- }
- 
- namespace {
-@@ -1405,12 +1400,18 @@ std::vector<NumberFormatSpan> FlattenRegionsToParts(
- }
- 
- namespace {
--Maybe<int> ConstructParts(Isolate* isolate, const icu::UnicodeString& formatted,
--                          icu::FieldPositionIterator* fp_iter,
-+Maybe<int> ConstructParts(Isolate* isolate,
-+                          icu::number::FormattedNumber* formatted,
-                           Handle<JSArray> result, int start_index,
-                           Handle<Object> numeric_obj, bool style_is_unit) {
-+  UErrorCode status = U_ZERO_ERROR;
-+  icu::UnicodeString formatted_text = formatted->toString(status);
-+  if (U_FAILURE(status)) {
-+    THROW_NEW_ERROR_RETURN_VALUE(
-+        isolate, NewTypeError(MessageTemplate::kIcuError), Nothing<int>());
-+  }
-   DCHECK(numeric_obj->IsNumeric());
--  int32_t length = formatted.length();
-+  int32_t length = formatted_text.length();
-   int index = start_index;
-   if (length == 0) return Just(index);
- 
-@@ -1419,13 +1420,14 @@ Maybe<int> ConstructParts(Isolate* isolate, const icu::UnicodeString& formatted,
-   // other region covers some part of the formatted string. It's possible
-   // there's another field with exactly the same begin and end as this backdrop,
-   // in which case the backdrop's field_id of -1 will give it lower priority.
--  regions.push_back(NumberFormatSpan(-1, 0, formatted.length()));
-+  regions.push_back(NumberFormatSpan(-1, 0, formatted_text.length()));
- 
-   {
--    icu::FieldPosition fp;
--    while (fp_iter->next(fp)) {
--      regions.push_back(NumberFormatSpan(fp.getField(), fp.getBeginIndex(),
--                                         fp.getEndIndex()));
-+    icu::ConstrainedFieldPosition cfp;
-+    cfp.constrainCategory(UFIELD_CATEGORY_NUMBER);
-+    while (formatted->nextPosition(cfp, status)) {
-+      regions.push_back(
-+          NumberFormatSpan(cfp.getField(), cfp.getStart(), cfp.getLimit()));
-     }
-   }
- 
-@@ -1447,7 +1449,7 @@ Maybe<int> ConstructParts(Isolate* isolate, const icu::UnicodeString& formatted,
-     Handle<String> substring;
-     ASSIGN_RETURN_ON_EXCEPTION_VALUE(
-         isolate, substring,
--        Intl::ToString(isolate, formatted, part.begin_pos, part.end_pos),
-+        Intl::ToString(isolate, formatted_text, part.begin_pos, part.end_pos),
-         Nothing<int>());
-     Intl::AddElement(isolate, result, index, field_type_string, substring);
-     ++index;
-@@ -1467,20 +1469,19 @@ MaybeHandle<JSArray> JSNumberFormat::FormatToParts(
-       number_format->icu_number_formatter().raw();
-   CHECK_NOT_NULL(fmt);
- 
--  icu::FieldPositionIterator fp_iter;
--  Maybe<icu::UnicodeString> maybe_format =
--      IcuFormatNumber(isolate, *fmt, numeric_obj, &fp_iter);
-+  icu::number::FormattedNumber formatted;
-+  Maybe<bool> maybe_format =
-+      IcuFormatNumber(isolate, *fmt, numeric_obj, &formatted);
-   MAYBE_RETURN(maybe_format, Handle<JSArray>());
--
-   UErrorCode status = U_ZERO_ERROR;
-+
-   bool style_is_unit =
-       Style::UNIT == StyleFromSkeleton(fmt->toSkeleton(status));
-   CHECK(U_SUCCESS(status));
- 
-   Handle<JSArray> result = factory->NewJSArray(0);
--  Maybe<int> maybe_format_to_parts =
--      ConstructParts(isolate, maybe_format.FromJust(), &fp_iter, result, 0,
--                     numeric_obj, style_is_unit);
-+  Maybe<int> maybe_format_to_parts = ConstructParts(
-+      isolate, &formatted, result, 0, numeric_obj, style_is_unit);
-   MAYBE_RETURN(maybe_format_to_parts, Handle<JSArray>());
- 
-   return result;
diff --git a/srcpkgs/electron9/files/patches/chromium-xxx-ppc64le.patch b/srcpkgs/electron9/files/patches/chromium-xxx-ppc64le.patch
deleted file mode 100644
index 674cedac216a..000000000000
--- a/srcpkgs/electron9/files/patches/chromium-xxx-ppc64le.patch
+++ /dev/null
@@ -1,3737 +0,0 @@
-From e39b85b047c69bab8249346125a84bde98b31294 Mon Sep 17 00:00:00 2001
-From: Daniel Kolesa <daniel@octaforge.org>
-Date: Sun, 13 Sep 2020 00:08:43 +0200
-Subject: [PATCH] ppc64le support
-
----
- build/download_nacl_toolchains.py             |   4 +
- chrome/installer/linux/BUILD.gn               |   3 -
- sandbox/features.gni                          |   3 +-
- sandbox/linux/BUILD.gn                        |   2 +
- sandbox/linux/bpf_dsl/linux_syscall_ranges.h  |   7 +
- sandbox/linux/bpf_dsl/seccomp_macros.h        |  48 ++++
- .../seccomp-bpf-helpers/baseline_policy.cc    |  10 +-
- .../baseline_policy_unittest.cc               |   2 +
- .../syscall_parameters_restrictions.cc        |  36 ++-
- .../syscall_parameters_restrictions.h         |   2 +-
- .../linux/seccomp-bpf-helpers/syscall_sets.cc | 139 +++++++-----
- .../linux/seccomp-bpf-helpers/syscall_sets.h  |  10 +-
- sandbox/linux/seccomp-bpf/syscall.cc          |  62 ++++-
- sandbox/linux/seccomp-bpf/trap.cc             |  14 ++
- sandbox/linux/services/credentials.cc         |   2 +-
- sandbox/linux/services/syscall_wrappers.cc    |   2 +-
- .../linux/syscall_broker/broker_process.cc    |   2 +-
- sandbox/linux/system_headers/linux_seccomp.h  |   9 +
- sandbox/linux/system_headers/linux_signal.h   |   2 +-
- sandbox/linux/system_headers/linux_syscalls.h |   4 +
- sandbox/linux/system_headers/linux_ucontext.h |   2 +
- .../system_headers/ppc64_linux_syscalls.h     |  12 +
- .../system_headers/ppc64_linux_ucontext.h     |  12 +
- .../linux/bpf_renderer_policy_linux.cc        |   5 +
- .../angle/src/compiler/translator/InfoSink.h  |  11 +-
- third_party/angle/src/libANGLE/Constants.h    |   1 +
- third_party/boringssl/BUILD.gn                |   7 +
- .../dump_writer_common/raw_context_cpu.h      |   2 +
- .../linux/dump_writer_common/thread_info.cc   |  56 ++++-
- .../linux/dump_writer_common/thread_info.h    |   9 +
- .../dump_writer_common/ucontext_reader.cc     |  42 ++++
- .../dump_writer_common/ucontext_reader.h      |   3 +
- .../client/linux/handler/exception_handler.cc |  22 +-
- .../client/linux/handler/exception_handler.h  |   6 +-
- .../handler/exception_handler_unittest.cc     |   8 +-
- .../microdump_writer/microdump_writer.cc      |  14 +-
- .../microdump_writer_unittest.cc              |  15 +-
- .../minidump_writer/linux_core_dumper.cc      |   8 +-
- .../linux/minidump_writer/linux_dumper.cc     |   4 +-
- .../linux/minidump_writer/linux_dumper.h      |   3 +-
- .../linux_dumper_unittest_helper.cc           |   2 +
- .../minidump_writer/linux_ptrace_dumper.cc    |  19 +-
- .../linux_ptrace_dumper_unittest.cc           |   5 +
- .../linux/minidump_writer/minidump_writer.cc  |  18 +-
- .../linux/minidump_writer/minidump_writer.h   |   2 +
- .../minidump_writer_unittest.cc               |   3 +
- .../src/common/linux/memory_mapped_file.cc    |   3 +-
- .../linux/memory_mapped_file_unittest.cc      |   7 +-
- .../src/processor/exploitability_linux.cc     |   2 +
- .../src/processor/exploitability_unittest.cc  |  15 +-
- .../tools/linux/md2core/minidump-2-core.cc    |  45 ++++
- third_party/crashpad/crashpad/CONTRIBUTORS    |   1 +
- .../crashpad/crashpad/compat/linux/sys/user.h |   1 +
- .../crashpad/minidump/minidump_context.h      |  64 ++++++
- .../minidump/minidump_context_writer.cc       |  50 +++++
- .../minidump/minidump_context_writer.h        |  39 ++++
- .../minidump/minidump_context_writer_test.cc  |  15 ++
- .../minidump/minidump_misc_info_writer.cc     |   2 +
- .../crashpad/snapshot/capture_memory.cc       |   5 +
- .../crashpad/snapshot/cpu_architecture.h      |   5 +-
- .../crashpad/crashpad/snapshot/cpu_context.cc |   5 +
- .../crashpad/crashpad/snapshot/cpu_context.h  |  19 ++
- .../snapshot/linux/cpu_context_linux.h        |  73 ++++++
- .../snapshot/linux/debug_rendezvous_test.cc   |   4 +-
- .../linux/exception_snapshot_linux.cc         |  63 ++++++
- .../snapshot/linux/exception_snapshot_linux.h |   2 +
- .../linux/exception_snapshot_linux_test.cc    |  21 ++
- .../snapshot/linux/process_reader_linux.cc    |   2 +
- .../linux/process_reader_linux_test.cc        |   2 +
- .../crashpad/snapshot/linux/signal_context.h  |  83 +++++++
- .../snapshot/linux/system_snapshot_linux.cc   |  11 +
- .../snapshot/linux/thread_snapshot_linux.cc   |   8 +
- .../snapshot/linux/thread_snapshot_linux.h    |   2 +
- .../crashpad/util/linux/auxiliary_vector.cc   |   5 +
- .../crashpad/util/linux/ptrace_broker.cc      |   4 +-
- .../crashpad/crashpad/util/linux/ptracer.cc   |  61 +++++
- .../crashpad/util/linux/thread_info.h         |  55 +++++
- .../crashpad/util/misc/capture_context.h      |   1 +
- .../util/misc/capture_context_linux.S         | 212 +++++++++++++++++-
- .../util/misc/capture_context_test.cc         |   2 +-
- .../misc/capture_context_test_util_linux.cc   |   6 +
- .../crashpad/util/posix/signals_test.cc       |  12 +-
- third_party/dav1d/BUILD.gn                    |  21 ++
- third_party/dav1d/config/linux/ppc64/config.h |  35 +++
- third_party/dav1d/dav1d_generated.gni         |   5 +
- third_party/dav1d/generate_source.py          |   3 +-
- third_party/dav1d/libdav1d/src/ppc/types.h    |  15 ++
- third_party/libvpx/BUILD.gn                   |   4 +
- third_party/lss/linux_syscall_support.h       |   4 +-
- third_party/pffft/src/pffft.c                 |   1 +
- third_party/skia/src/sksl/SkSLString.cpp      |   7 +-
- third_party/sqlite/src/amalgamation/sqlite3.c |   3 +-
- .../sqlite/src/amalgamation_dev/sqlite3.c     |   3 +-
- third_party/sqlite/src/ext/rtree/rtree.c      |   2 +-
- third_party/sqlite/src/src/sqliteInt.h        |   3 +-
- .../modules/desktop_capture/differ_block.cc   |  10 +-
- third_party/webrtc/rtc_base/system/arch.h     |  12 +
- ui/gl/BUILD.gn                                |   3 +-
- v8/BUILD.gn                                   |   6 +
- v8/test/BUILD.gn                              |   6 +-
- 100 files changed, 1566 insertions(+), 138 deletions(-)
- create mode 100644 sandbox/linux/system_headers/ppc64_linux_syscalls.h
- create mode 100644 sandbox/linux/system_headers/ppc64_linux_ucontext.h
- create mode 100644 third_party/dav1d/config/linux/ppc64/config.h
-
-diff --git a/build/download_nacl_toolchains.py b/build/download_nacl_toolchains.py
-index 286a92a27e..ec36a85d31 100755
---- a/build/download_nacl_toolchains.py
-+++ b/build/download_nacl_toolchains.py
-@@ -13,6 +13,10 @@ import sys
- 
- 
- def Main(args):
-+  # If `disable_nacl=1` is in GYP_DEFINES, exit
-+  if 'disable_nacl=1' in os.environ.get('GYP_DEFINES', ''):
-+    return 0
-+
-   script_dir = os.path.dirname(os.path.abspath(__file__))
-   src_dir = os.path.dirname(script_dir)
-   nacl_dir = os.path.join(src_dir, 'native_client')
-diff --git a/chrome/installer/linux/BUILD.gn b/chrome/installer/linux/BUILD.gn
-index 9c92012ce3..a4a5cd86d6 100644
---- a/chrome/installer/linux/BUILD.gn
-+++ b/chrome/installer/linux/BUILD.gn
-@@ -65,8 +65,6 @@ packaging_files = packaging_files_binaries + [
-                     "$root_out_dir/xdg-mime",
-                     "$root_out_dir/xdg-settings",
-                     "$root_out_dir/locales/en-US.pak",
--                    "$root_out_dir/MEIPreload/manifest.json",
--                    "$root_out_dir/MEIPreload/preloaded_data.pb",
-                   ]
- 
- action_foreach("calculate_deb_dependencies") {
-@@ -331,7 +329,6 @@ group("installer_deps") {
-     ":theme_files",
-     "//chrome",
-     "//chrome:packed_resources",
--    "//chrome/browser/resources/media/mei_preload:component",
-     "//sandbox/linux:chrome_sandbox",
-     "//third_party/crashpad/crashpad/handler:crashpad_handler",
-   ]
-diff --git a/sandbox/features.gni b/sandbox/features.gni
-index 09280d35f6..42514157fc 100644
---- a/sandbox/features.gni
-+++ b/sandbox/features.gni
-@@ -11,6 +11,7 @@ import("//build/config/nacl/config.gni")
- use_seccomp_bpf = (is_linux || is_android) &&
-                   (current_cpu == "x86" || current_cpu == "x64" ||
-                    current_cpu == "arm" || current_cpu == "arm64" ||
--                   current_cpu == "mipsel" || current_cpu == "mips64el")
-+                   current_cpu == "mipsel" || current_cpu == "mips64el" ||
-+                   current_cpu == "ppc64")
- 
- use_seccomp_bpf = use_seccomp_bpf || is_nacl_nonsfi
-diff --git a/sandbox/linux/BUILD.gn b/sandbox/linux/BUILD.gn
-index c27351f9a6..9141e12394 100644
---- a/sandbox/linux/BUILD.gn
-+++ b/sandbox/linux/BUILD.gn
-@@ -407,6 +407,8 @@ component("sandbox_services") {
- 
- source_set("sandbox_services_headers") {
-   sources = [
-+    "system_headers/ppc64_linux_syscalls.h",
-+    "system_headers/ppc64_linux_ucontext.h",
-     "system_headers/arm64_linux_syscalls.h",
-     "system_headers/arm_linux_syscalls.h",
-     "system_headers/arm_linux_ucontext.h",
-diff --git a/sandbox/linux/bpf_dsl/linux_syscall_ranges.h b/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
-index 313511f22e..0ca3a326f7 100644
---- a/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
-+++ b/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
-@@ -56,6 +56,13 @@
- #define MAX_PUBLIC_SYSCALL __NR_syscalls
- #define MAX_SYSCALL MAX_PUBLIC_SYSCALL
- 
-+#elif defined(__powerpc64__)
-+
-+#include <asm/unistd.h>
-+#define MIN_SYSCALL 0u
-+#define MAX_PUBLIC_SYSCALL 386u
-+#define MAX_SYSCALL MAX_PUBLIC_SYSCALL
-+
- #else
- #error "Unsupported architecture"
- #endif
-diff --git a/sandbox/linux/bpf_dsl/seccomp_macros.h b/sandbox/linux/bpf_dsl/seccomp_macros.h
-index 1a407b9523..a6aec544e0 100644
---- a/sandbox/linux/bpf_dsl/seccomp_macros.h
-+++ b/sandbox/linux/bpf_dsl/seccomp_macros.h
-@@ -16,6 +16,9 @@
- #if defined(__mips__)
- // sys/user.h in eglibc misses size_t definition
- #include <stddef.h>
-+#elif defined(__powerpc64__)
-+// Manually define greg_t on ppc64
-+typedef unsigned long long greg_t;
- #endif
- #endif
- 
-@@ -346,6 +349,51 @@ struct regs_struct {
- #define SECCOMP_PT_PARM4(_regs) (_regs).regs[3]
- #define SECCOMP_PT_PARM5(_regs) (_regs).regs[4]
- #define SECCOMP_PT_PARM6(_regs) (_regs).regs[5]
-+
-+#elif defined(__powerpc64__)
-+#include <asm/ptrace.h>
-+
-+typedef struct pt_regs regs_struct;
-+
-+#ifdef ARCH_CPU_LITTLE_ENDIAN
-+#define SECCOMP_ARCH AUDIT_ARCH_PPC64LE
-+#else
-+#define SECCOMP_ARCH AUDIT_ARCH_PPC64
-+#endif
-+
-+#define SECCOMP_REG(_ctx, _reg) ((_ctx)->uc_mcontext.regs->gpr[_reg])
-+
-+#define SECCOMP_RESULT(_ctx) SECCOMP_REG(_ctx, 3)
-+#define SECCOMP_SYSCALL(_ctx) SECCOMP_REG(_ctx, 0)
-+#define SECCOMP_IP(_ctx) (_ctx)->uc_mcontext.regs->nip
-+#define SECCOMP_PARM1(_ctx) SECCOMP_REG(_ctx, 3)
-+#define SECCOMP_PARM2(_ctx) SECCOMP_REG(_ctx, 4)
-+#define SECCOMP_PARM3(_ctx) SECCOMP_REG(_ctx, 5)
-+#define SECCOMP_PARM4(_ctx) SECCOMP_REG(_ctx, 6)
-+#define SECCOMP_PARM5(_ctx) SECCOMP_REG(_ctx, 7)
-+#define SECCOMP_PARM6(_ctx) SECCOMP_REG(_ctx, 8)
-+
-+#define SECCOMP_NR_IDX (offsetof(struct arch_seccomp_data, nr))
-+#define SECCOMP_ARCH_IDX (offsetof(struct arch_seccomp_data, arch))
-+#define SECCOMP_IP_MSB_IDX \
-+  (offsetof(struct arch_seccomp_data, instruction_pointer) + 4)
-+#define SECCOMP_IP_LSB_IDX \
-+  (offsetof(struct arch_seccomp_data, instruction_pointer) + 0)
-+#define SECCOMP_ARG_MSB_IDX(nr) \
-+  (offsetof(struct arch_seccomp_data, args) + 8 * (nr) + 4)
-+#define SECCOMP_ARG_LSB_IDX(nr) \
-+  (offsetof(struct arch_seccomp_data, args) + 8 * (nr) + 0)
-+
-+#define SECCOMP_PT_RESULT(_regs) (_regs).gpr[3]
-+#define SECCOMP_PT_SYSCALL(_regs) (_regs).gpr[0]
-+#define SECCOMP_PT_IP(_regs) (_regs).nip
-+#define SECCOMP_PT_PARM1(_regs) (_regs).gpr[3]
-+#define SECCOMP_PT_PARM2(_regs) (_regs).gpr[4]
-+#define SECCOMP_PT_PARM3(_regs) (_regs).gpr[5]
-+#define SECCOMP_PT_PARM4(_regs) (_regs).gpr[6]
-+#define SECCOMP_PT_PARM5(_regs) (_regs).gpr[7]
-+#define SECCOMP_PT_PARM6(_regs) (_regs).gpr[8]
-+
- #else
- #error Unsupported target platform
- 
-diff --git a/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc b/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
-index 712f9699a9..55f062817e 100644
---- a/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
-+++ b/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
-@@ -88,7 +88,8 @@ bool IsBaselinePolicyWatched(int sysno) {
-          SyscallSets::IsPrctl(sysno) ||
-          SyscallSets::IsProcessGroupOrSession(sysno) ||
- #if defined(__i386__) || \
--    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+    defined(__powerpc64__)
-          SyscallSets::IsSocketCall(sysno) ||
- #endif
- #if defined(__arm__)
-@@ -210,7 +211,7 @@ ResultExpr EvaluateSyscallImpl(int fs_denied_errno,
-   }
- 
- #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
--    defined(__aarch64__)
-+    defined(__aarch64__) || defined(__powerpc64__)
-   if (sysno == __NR_mmap)
-     return RestrictMmapFlags();
- #endif
-@@ -228,7 +229,7 @@ ResultExpr EvaluateSyscallImpl(int fs_denied_errno,
-     return RestrictPrctl();
- 
- #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
--    defined(__aarch64__)
-+    defined(__aarch64__) || defined(__powerpc64__)
-   if (sysno == __NR_socketpair) {
-     // Only allow AF_UNIX, PF_UNIX. Crash if anything else is seen.
-     static_assert(AF_UNIX == PF_UNIX,
-@@ -268,7 +269,8 @@ ResultExpr EvaluateSyscallImpl(int fs_denied_errno,
-   }
- 
- #if defined(__i386__) || \
--    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+    defined(__powerpc64__)
-   if (SyscallSets::IsSocketCall(sysno))
-     return RestrictSocketcallCommand();
- #endif
-diff --git a/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc b/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
-index fc36187c94..1affc91897 100644
---- a/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
-+++ b/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
-@@ -291,8 +291,10 @@ TEST_BASELINE_SIGSYS(__NR_timer_create)
- #if !defined(__aarch64__)
- TEST_BASELINE_SIGSYS(__NR_eventfd)
- TEST_BASELINE_SIGSYS(__NR_inotify_init)
-+#if !defined(__powerpc64__)
- TEST_BASELINE_SIGSYS(__NR_vserver)
- #endif
-+#endif
- 
- #if defined(LIBC_GLIBC) && !defined(OS_CHROMEOS)
- BPF_TEST_C(BaselinePolicy, FutexEINVAL, BaselinePolicy) {
-diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
-index ff5a1c093c..7faa07c9a7 100644
---- a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
-+++ b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
-@@ -36,7 +36,8 @@
- #include <sys/ioctl.h>
- #include <sys/ptrace.h>
- #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(__arm__) && \
--    !defined(__aarch64__) && !defined(PTRACE_GET_THREAD_AREA)
-+    !defined(__aarch64__) && !defined(PTRACE_GET_THREAD_AREA) && \
-+    !defined(__powerpc64__)
- // Also include asm/ptrace-abi.h since ptrace.h in older libc (for instance
- // the one in Ubuntu 16.04 LTS) is missing PTRACE_GET_THREAD_AREA.
- // asm/ptrace-abi.h doesn't exist on arm32 and PTRACE_GET_THREAD_AREA isn't
-@@ -45,6 +46,11 @@
- #endif
- #endif  // !OS_NACL_NONSFI
- 
-+// On PPC64, TCGETS is defined in terms of struct termios, so we must include termios.h
-+#ifdef __powerpc64__
-+#include <termios.h>
-+#endif
-+
- #if defined(OS_ANDROID)
- 
- #if !defined(F_DUPFD_CLOEXEC)
-@@ -107,6 +113,15 @@ inline bool IsArchitectureMips() {
- #endif
- }
- 
-+inline bool IsArchitecturePPC64() {
-+#if defined(__powerpc64__)
-+  return true;
-+#else
-+  return false;
-+#endif
-+}
-+
-+
- // Ubuntu's version of glibc has a race condition in sem_post that can cause
- // it to call futex(2) with bogus op arguments. To workaround this, we need
- // to allow those futex(2) calls to fail with EINVAL, instead of crashing the
-@@ -248,6 +263,8 @@ ResultExpr RestrictFcntlCommands() {
-   uint64_t kOLargeFileFlag = O_LARGEFILE;
-   if (IsArchitectureX86_64() || IsArchitectureI386() || IsArchitectureMips())
-     kOLargeFileFlag = 0100000;
-+  else if (IsArchitecturePPC64())
-+    kOLargeFileFlag = 0200000;
- 
-   const Arg<int> cmd(1);
-   const Arg<long> long_arg(2);
-@@ -262,14 +279,23 @@ ResultExpr RestrictFcntlCommands() {
-               F_SETLKW,
-               F_GETLK,
-               F_DUPFD,
--              F_DUPFD_CLOEXEC),
--             Allow())
-+              F_DUPFD_CLOEXEC
-+#if defined(__powerpc64__)
-+// On PPC64, F_SETLK, F_GETLK, F_SETLKW are defined as the 64-bit variants
-+// but glibc will sometimes still use the 32-bit versions. Allow both.
-+              ,
-+              5, /* F_GETLK (32) */
-+              6, /* F_SETLK (32) */
-+              7  /* F_SETLKW (32) */
-+#endif
-+              ),
-+            Allow())
-       .Case(F_SETFL,
-             If((long_arg & ~kAllowedMask) == 0, Allow()).Else(CrashSIGSYS()))
-       .Default(CrashSIGSYS());
- }
- 
--#if defined(__i386__) || defined(__mips__)
-+#if defined(__i386__) || defined(__mips__) || defined(__powerpc64__)
- ResultExpr RestrictSocketcallCommand() {
-   // Unfortunately, we are unable to restrict the first parameter to
-   // socketpair(2). Whilst initially sounding bad, it's noteworthy that very
-@@ -418,7 +444,7 @@ ResultExpr RestrictPrlimitToGetrlimit(pid_t target_pid) {
- ResultExpr RestrictPtrace() {
-   const Arg<int> request(0);
-   return Switch(request).CASES((
--#if !defined(__aarch64__)
-+#if !defined(__aarch64__) && !defined(__powerpc64__)
-         PTRACE_GETREGS,
-         PTRACE_GETFPREGS,
-         PTRACE_GET_THREAD_AREA,
-diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
-index ba4289f05b..9a4d5ab2db 100644
---- a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
-+++ b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
-@@ -48,7 +48,7 @@ SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictMprotectFlags();
- // O_NONBLOCK | O_SYNC | O_LARGEFILE | O_CLOEXEC | O_NOATIME.
- SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictFcntlCommands();
- 
--#if defined(__i386__) || defined(__mips__)
-+#if defined(__i386__) || defined(__mips__) || defined(__powerpc64__)
- // Restrict socketcall(2) to only allow socketpair(2), send(2), recv(2),
- // sendto(2), recvfrom(2), shutdown(2), sendmsg(2) and recvmsg(2).
- SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictSocketcallCommand();
-diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-index d9d18822f6..1acd39d30e 100644
---- a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-+++ b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-@@ -29,7 +29,8 @@ bool SyscallSets::IsAllowedGettime(int sysno) {
-   switch (sysno) {
-     case __NR_gettimeofday:
- #if defined(__i386__) || defined(__x86_64__) || \
--    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+    defined(__powerpc64__)
-     case __NR_time:
- #endif
-       return true;
-@@ -41,12 +42,14 @@ bool SyscallSets::IsAllowedGettime(int sysno) {
-     case __NR_clock_nanosleep:  // Parameters filtered by RestrictClockID().
-     case __NR_clock_settime:    // Privileged.
- #if defined(__i386__) || \
--    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+    defined(__powerpc64__)
-     case __NR_ftime:  // Obsolete.
- #endif
-     case __NR_settimeofday:  // Privileged.
- #if defined(__i386__) || \
--    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+    defined(__powerpc64__)
-     case __NR_stime:
- #endif
-     default:
-@@ -112,7 +115,7 @@ bool SyscallSets::IsFileSystem(int sysno) {
-     case __NR_faccessat:  // EPERM not a valid errno.
-     case __NR_fchmodat:
-     case __NR_fchownat:  // Should be called chownat ?
--#if defined(__x86_64__) || defined(__aarch64__)
-+#if defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__)
-     case __NR_newfstatat:  // fstatat(). EPERM not a valid errno.
- #elif defined(__i386__) || defined(__arm__) || \
-     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-@@ -131,7 +134,7 @@ bool SyscallSets::IsFileSystem(int sysno) {
-     case __NR_memfd_create:
-     case __NR_mkdirat:
-     case __NR_mknodat:
--#if defined(__i386__)
-+#if defined(__i386__) || defined(__powerpc64__)
-     case __NR_oldlstat:
-     case __NR_oldstat:
- #endif
-@@ -145,7 +148,8 @@ bool SyscallSets::IsFileSystem(int sysno) {
- #endif
-     case __NR_statfs:  // EPERM not a valid errno.
- #if defined(__i386__) || defined(__arm__) || \
--    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+    defined(__powerpc64__)
-     case __NR_statfs64:
- #endif
-     case __NR_symlinkat:
-@@ -155,7 +159,8 @@ bool SyscallSets::IsFileSystem(int sysno) {
-     case __NR_truncate64:
- #endif
-     case __NR_unlinkat:
--#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
-+#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
-+    defined(__powerpc64__)
-     case __NR_utime:
- #endif
-     case __NR_utimensat:  // New.
-@@ -174,7 +179,8 @@ bool SyscallSets::IsAllowedFileSystemAccessViaFd(int sysno) {
- #endif
-       return true;
- // TODO(jln): these should be denied gracefully as well (moved below).
--#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
-+#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
-+    defined(__powerpc64__)
-     case __NR_fadvise64:  // EPERM not a valid errno.
- #endif
- #if defined(__i386__)
-@@ -187,11 +193,12 @@ bool SyscallSets::IsAllowedFileSystemAccessViaFd(int sysno) {
-     case __NR_flock:      // EPERM not a valid errno.
-     case __NR_fstatfs:    // Give information about the whole filesystem.
- #if defined(__i386__) || defined(__arm__) || \
--    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+    defined(__powerpc64__)
-     case __NR_fstatfs64:
- #endif
-     case __NR_fsync:  // EPERM not a valid errno.
--#if defined(__i386__)
-+#if defined(__i386__) || defined(__powerpc64__)
-     case __NR_oldfstat:
- #endif
- #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
-@@ -199,6 +206,8 @@ bool SyscallSets::IsAllowedFileSystemAccessViaFd(int sysno) {
-     case __NR_sync_file_range:  // EPERM not a valid errno.
- #elif defined(__arm__)
-     case __NR_arm_sync_file_range:  // EPERM not a valid errno.
-+#elif defined(__powerpc64__)
-+    case __NR_sync_file_range2: // EPERM not a valid errno.
- #endif
-     default:
-       return false;
-@@ -224,7 +233,8 @@ bool SyscallSets::IsDeniedFileSystemAccessViaFd(int sysno) {
- #endif
-     case __NR_getdents64:  // EPERM not a valid errno.
- #if defined(__i386__) || \
--    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+    defined(__powerpc64__)
-     case __NR_readdir:
- #endif
-       return true;
-@@ -265,7 +275,7 @@ bool SyscallSets::IsGetSimpleId(int sysno) {
- bool SyscallSets::IsProcessPrivilegeChange(int sysno) {
-   switch (sysno) {
-     case __NR_capset:
--#if defined(__i386__) || defined(__x86_64__)
-+#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__)
-     case __NR_ioperm:  // Intel privilege.
-     case __NR_iopl:    // Intel privilege.
- #endif
-@@ -316,7 +326,8 @@ bool SyscallSets::IsAllowedSignalHandling(int sysno) {
-     case __NR_rt_sigreturn:
-     case __NR_rt_sigtimedwait:
- #if defined(__i386__) || defined(__arm__) || \
--    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+    defined(__powerpc64__)
-     case __NR_sigaction:
-     case __NR_sigprocmask:
-     case __NR_sigreturn:
-@@ -332,7 +343,8 @@ bool SyscallSets::IsAllowedSignalHandling(int sysno) {
- #endif
-     case __NR_signalfd4:
- #if defined(__i386__) || defined(__arm__) || \
--    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+    defined(__powerpc64__)
-     case __NR_sigpending:
-     case __NR_sigsuspend:
- #endif
-@@ -356,7 +368,7 @@ bool SyscallSets::IsAllowedOperationOnFd(int sysno) {
- #endif
-     case __NR_dup3:
- #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
--    defined(__aarch64__)
-+    defined(__aarch64__) || defined(__powerpc64__)
-     case __NR_shutdown:
- #endif
-       return true;
-@@ -389,7 +401,7 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) {
-     case __NR_exit_group:
-     case __NR_wait4:
-     case __NR_waitid:
--#if defined(__i386__)
-+#if defined(__i386__) || defined(__powerpc64__)
-     case __NR_waitpid:
- #endif
-       return true;
-@@ -406,7 +418,7 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) {
- #endif
-     case __NR_set_tid_address:
-     case __NR_unshare:
--#if !defined(__mips__) && !defined(__aarch64__)
-+#if !defined(__mips__) && !defined(__aarch64__) || defined(__powerpc64__)
-     case __NR_vfork:
- #endif
-     default:
-@@ -455,7 +467,7 @@ bool SyscallSets::IsAllowedGetOrModifySocket(int sysno) {
-       return true;
-     default:
- #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
--    defined(__aarch64__)
-+    defined(__aarch64__) || defined(__powerpc64__)
-     case __NR_socketpair:  // We will want to inspect its argument.
- #endif
-       return false;
-@@ -465,7 +477,7 @@ bool SyscallSets::IsAllowedGetOrModifySocket(int sysno) {
- bool SyscallSets::IsDeniedGetOrModifySocket(int sysno) {
-   switch (sysno) {
- #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
--    defined(__aarch64__)
-+    defined(__aarch64__) || defined(__powerpc64__)
-     case __NR_accept:
-     case __NR_accept4:
-     case __NR_bind:
-@@ -480,7 +492,8 @@ bool SyscallSets::IsDeniedGetOrModifySocket(int sysno) {
- }
- 
- #if defined(__i386__) || \
--    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+    defined(__powerpc64__)
- // Big multiplexing system call for sockets.
- bool SyscallSets::IsSocketCall(int sysno) {
-   switch (sysno) {
-@@ -494,7 +507,8 @@ bool SyscallSets::IsSocketCall(int sysno) {
- }
- #endif
- 
--#if defined(__x86_64__) || defined(__arm__) || defined(__mips__)
-+#if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
-+    defined(__powerpc64__)
- bool SyscallSets::IsNetworkSocketInformation(int sysno) {
-   switch (sysno) {
-     case __NR_getpeername:
-@@ -519,7 +533,7 @@ bool SyscallSets::IsAllowedAddressSpaceAccess(int sysno) {
-     case __NR_mincore:
-     case __NR_mlockall:
- #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
--    defined(__aarch64__)
-+    defined(__aarch64__) || defined(__powerpc64__)
-     case __NR_mmap:
- #endif
- #if defined(__i386__) || defined(__arm__) || \
-@@ -549,7 +563,8 @@ bool SyscallSets::IsAllowedGeneralIo(int sysno) {
-   switch (sysno) {
-     case __NR_lseek:
- #if defined(__i386__) || defined(__arm__) || \
--    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+    defined(__powerpc64__)
-     case __NR__llseek:
- #endif
- #if !defined(__aarch64__)
-@@ -561,26 +576,28 @@ bool SyscallSets::IsAllowedGeneralIo(int sysno) {
-     case __NR_readv:
-     case __NR_pread64:
- #if defined(__arm__) || \
--    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+    defined(__powerpc64__)
-     case __NR_recv:
- #endif
- #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
--    defined(__aarch64__)
-+    defined(__aarch64__) || defined(__powerpc64__)
-     case __NR_recvfrom:  // Could specify source.
-     case __NR_recvmsg:   // Could specify source.
- #endif
--#if defined(__i386__) || defined(__x86_64__)
-+#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__)
-     case __NR_select:
- #endif
--#if defined(__i386__) || defined(__arm__) || defined(__mips__)
-+#if defined(__i386__) || defined(__arm__) || defined(__mips__) || defined(__powerpc64__)
-     case __NR__newselect:
- #endif
- #if defined(__arm__) || \
--    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+    defined(__powerpc64__)
-     case __NR_send:
- #endif
- #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
--    defined(__aarch64__)
-+    defined(__aarch64__) || defined(__powerpc64__)
-     case __NR_sendmsg:  // Could specify destination.
-     case __NR_sendto:   // Could specify destination.
- #endif
-@@ -637,7 +654,8 @@ bool SyscallSets::IsAllowedBasicScheduler(int sysno) {
-       return true;
-     case __NR_getpriority:
- #if defined(__i386__) || defined(__arm__) || \
--    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+    defined(__powerpc64__)
-     case __NR_nice:
- #endif
-     case __NR_setpriority:
-@@ -649,7 +667,8 @@ bool SyscallSets::IsAllowedBasicScheduler(int sysno) {
- bool SyscallSets::IsAdminOperation(int sysno) {
-   switch (sysno) {
- #if defined(__i386__) || defined(__arm__) || \
--    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+    defined(__powerpc64__)
-     case __NR_bdflush:
- #endif
-     case __NR_kexec_load:
-@@ -665,7 +684,8 @@ bool SyscallSets::IsAdminOperation(int sysno) {
- 
- bool SyscallSets::IsKernelModule(int sysno) {
-   switch (sysno) {
--#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
-+#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
-+    defined(__powerpc64__)
-     case __NR_create_module:
-     case __NR_get_kernel_syms:  // Should ENOSYS.
-     case __NR_query_module:
-@@ -698,7 +718,8 @@ bool SyscallSets::IsFsControl(int sysno) {
-     case __NR_swapoff:
-     case __NR_swapon:
- #if defined(__i386__) || \
--    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+    defined(__powerpc64__)
-     case __NR_umount:
- #endif
-     case __NR_umount2:
-@@ -714,7 +735,7 @@ bool SyscallSets::IsNuma(int sysno) {
-     case __NR_getcpu:
-     case __NR_mbind:
- #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
--    defined(__aarch64__)
-+    defined(__aarch64__) || defined(__powerpc64__)
-     case __NR_migrate_pages:
- #endif
-     case __NR_move_pages:
-@@ -743,14 +764,15 @@ bool SyscallSets::IsGlobalProcessEnvironment(int sysno) {
-   switch (sysno) {
-     case __NR_acct:  // Privileged.
- #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
--    defined(__aarch64__)
-+    defined(__aarch64__) || defined(__powerpc64__)
-     case __NR_getrlimit:
- #endif
--#if defined(__i386__) || defined(__arm__)
-+#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__)
-     case __NR_ugetrlimit:
- #endif
- #if defined(__i386__) || \
--    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+    defined(__powerpc64__)
-     case __NR_ulimit:
- #endif
-     case __NR_getrusage:
-@@ -784,7 +806,7 @@ bool SyscallSets::IsGlobalSystemStatus(int sysno) {
- #endif
-     case __NR_sysinfo:
-     case __NR_uname:
--#if defined(__i386__)
-+#if defined(__i386__) || defined(__powerpc64__)
-     case __NR_olduname:
-     case __NR_oldolduname:
- #endif
-@@ -846,8 +868,16 @@ bool SyscallSets::IsSystemVSemaphores(int sysno) {
- }
- #endif
- 
-+/* shitty hack around Void's 4.19 kernel headers missing those numbers */
-+#if defined(__powerpc64__) && !defined(__NR_shmget)
-+#define __NR_shmget 395
-+#define __NR_shmctl 396
-+#define __NR_shmat 397
-+#define __NR_shmdt 398
-+#endif
-+
- #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
--    defined(__aarch64__) ||                                         \
-+    defined(__aarch64__) || defined(__powerpc64__) || \
-     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
- // These give a lot of ambient authority and bypass the setuid sandbox.
- bool SyscallSets::IsSystemVSharedMemory(int sysno) {
-@@ -879,7 +909,8 @@ bool SyscallSets::IsSystemVMessageQueue(int sysno) {
- #endif
- 
- #if defined(__i386__) || \
--    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+    defined(__powerpc64__)
- // Big system V multiplexing system call.
- bool SyscallSets::IsSystemVIpc(int sysno) {
-   switch (sysno) {
-@@ -899,7 +930,8 @@ bool SyscallSets::IsAnySystemV(int sysno) {
-   return IsSystemVMessageQueue(sysno) || IsSystemVSemaphores(sysno) ||
-          IsSystemVSharedMemory(sysno);
- #elif defined(__i386__) || \
--    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+    defined(__powerpc64__)
-   return IsSystemVIpc(sysno);
- #endif
- }
-@@ -952,7 +984,8 @@ bool SyscallSets::IsFaNotify(int sysno) {
- bool SyscallSets::IsTimer(int sysno) {
-   switch (sysno) {
-     case __NR_getitimer:
--#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
-+#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
-+    defined(__powerpc64__)
-     case __NR_alarm:
- #endif
-     case __NR_setitimer:
-@@ -1011,18 +1044,22 @@ bool SyscallSets::IsMisc(int sysno) {
-     case __NR_syncfs:
-     case __NR_vhangup:
- // The system calls below are not implemented.
--#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
-+#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
-+    defined(__powerpc64__)
-     case __NR_afs_syscall:
- #endif
- #if defined(__i386__) || \
--    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+    defined(__powerpc64__)
-     case __NR_break:
- #endif
--#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
-+#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
-+    defined(__powerpc64__)
-     case __NR_getpmsg:
- #endif
- #if defined(__i386__) || \
--    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+    defined(__powerpc64__)
-     case __NR_gtty:
-     case __NR_idle:
-     case __NR_lock:
-@@ -1030,20 +1067,22 @@ bool SyscallSets::IsMisc(int sysno) {
-     case __NR_prof:
-     case __NR_profil:
- #endif
--#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
-+#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
-+    defined(__powerpc64__)
-     case __NR_putpmsg:
- #endif
- #if defined(__x86_64__)
-     case __NR_security:
- #endif
- #if defined(__i386__) || \
--    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+    defined(__powerpc64__)
-     case __NR_stty:
- #endif
--#if defined(__x86_64__)
-+#if defined(__x86_64__) || defined(__powerpc64__)
-     case __NR_tuxcall:
- #endif
--#if !defined(__aarch64__)
-+#if !defined(__aarch64__) && !defined(__powerpc64__)
-     case __NR_vserver:
- #endif
-       return true;
-diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
-index 923533ec9f..411f72acdb 100644
---- a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
-+++ b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
-@@ -43,13 +43,14 @@ class SANDBOX_EXPORT SyscallSets {
-   static bool IsDeniedGetOrModifySocket(int sysno);
- 
- #if defined(__i386__) || \
--    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+    defined(__powerpc64__)
-   // Big multiplexing system call for sockets.
-   static bool IsSocketCall(int sysno);
- #endif
- 
- #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
--    defined(__aarch64__)
-+    defined(__aarch64__) || defined(__powerpc64__)
-   static bool IsNetworkSocketInformation(int sysno);
- #endif
- 
-@@ -76,7 +77,7 @@ class SANDBOX_EXPORT SyscallSets {
-   static bool IsSystemVSemaphores(int sysno);
- #endif
- #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
--    defined(__aarch64__) ||                                         \
-+    defined(__aarch64__) || defined(__powerpc64__) || \
-     (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
-   // These give a lot of ambient authority and bypass the setuid sandbox.
-   static bool IsSystemVSharedMemory(int sysno);
-@@ -88,7 +89,8 @@ class SANDBOX_EXPORT SyscallSets {
- #endif
- 
- #if defined(__i386__) || \
--    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-+    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
-+    defined(__powerpc64__)
-   // Big system V multiplexing system call.
-   static bool IsSystemVIpc(int sysno);
- #endif
-diff --git a/sandbox/linux/seccomp-bpf/syscall.cc b/sandbox/linux/seccomp-bpf/syscall.cc
-index 34edabd2b8..10fa5fd070 100644
---- a/sandbox/linux/seccomp-bpf/syscall.cc
-+++ b/sandbox/linux/seccomp-bpf/syscall.cc
-@@ -16,7 +16,7 @@ namespace sandbox {
- namespace {
- 
- #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \
--    defined(ARCH_CPU_MIPS_FAMILY)
-+    defined(ARCH_CPU_MIPS_FAMILY) || defined (ARCH_CPU_PPC64_FAMILY)
- // Number that's not currently used by any Linux kernel ABIs.
- const int kInvalidSyscallNumber = 0x351d3;
- #else
-@@ -308,12 +308,56 @@ asm(// We need to be able to tell the kernel exactly where we made a
-     // Enter the kernel
-     "svc 0\n"
-     "2:ret\n"
-+    ".cfi_endproc\n"
-+    ".size SyscallAsm, .-SyscallAsm\n"
-+#elif defined(__powerpc64__)
-+    ".text\n"
-+    ".align 4\n"
-+    ".type SyscallAsm @function\n"
-+    "SyscallAsm:\n"
-+    ".cfi_startproc\n"
-+
-+    // Check if r3 is negative
-+    "cmpdi 3, 0\n"
-+    "bgt 2f\n"
-+
-+    // Load address of 3f into r3 and return
-+    "mflr 10\n"
-+    "bl 1f\n"
-+    "1: mflr 3\n"
-+    "mtlr 10\n"
-+    "addi 3, 3, 4*13\n"
-+    "blr\n"
-+
-+    // Load arguments from array into r3-8
-+    // save param 3 in r10
-+    "2:\n"
-+    "mr 0, 3\n"
-+    "ld 3, 0(4)\n"
-+    "ld 5, 16(4)\n"
-+    "ld 6, 24(4)\n"
-+    "ld 7, 32(4)\n"
-+    "ld 8, 40(4)\n"
-+    "ld 4, 8(4)\n"
-+    "li 9, 0\n"
-+
-+    // Enter kernel
-+    "sc\n"
-+
-+    // Magic return address
-+    "3:\n"
-+    // Like MIPS, ppc64 return values are always positive.
-+    // Check for error in cr0.SO and negate upon error
-+    "bc 4, 3, 4f\n"
-+    "neg 3, 3\n"
-+    "4: blr\n"
-+
-     ".cfi_endproc\n"
-     ".size SyscallAsm, .-SyscallAsm\n"
- #endif
-     );  // asm
- 
--#if defined(__x86_64__)
-+#if defined(__x86_64__) || defined(__powerpc64__)
- extern "C" {
- intptr_t SyscallAsm(intptr_t nr, const intptr_t args[6]);
- }
-@@ -427,6 +471,8 @@ intptr_t Syscall::Call(int nr,
-     ret = inout;
-   }
- 
-+#elif defined(__powerpc64__)
-+  intptr_t ret = SyscallAsm(nr, args);
- #else
- #error "Unimplemented architecture"
- #endif
-@@ -443,8 +489,18 @@ void Syscall::PutValueInUcontext(intptr_t ret_val, ucontext_t* ctx) {
-     // needs to be changed back.
-     ret_val = -ret_val;
-     SECCOMP_PARM4(ctx) = 1;
--  } else
-+  } else {
-     SECCOMP_PARM4(ctx) = 0;
-+  }
-+#endif
-+#if defined(__powerpc64__)
-+  // Same as MIPS, need to invert ret and set error register (cr0.SO)
-+  if (ret_val <= -1 && ret_val >= -4095) {
-+    ret_val = -ret_val;
-+    ctx->uc_mcontext.regs->ccr |= (1 << 28);
-+  } else {
-+    ctx->uc_mcontext.regs->ccr &= ~(1 << 28);
-+  }
- #endif
-   SECCOMP_RESULT(ctx) = static_cast<greg_t>(ret_val);
- }
-diff --git a/sandbox/linux/seccomp-bpf/trap.cc b/sandbox/linux/seccomp-bpf/trap.cc
-index 9884be8bb2..98e4371aac 100644
---- a/sandbox/linux/seccomp-bpf/trap.cc
-+++ b/sandbox/linux/seccomp-bpf/trap.cc
-@@ -232,6 +232,20 @@ void Trap::SigSys(int nr, LinuxSigInfo* info, ucontext_t* ctx) {
-       SetIsInSigHandler();
-     }
- 
-+#if defined(__powerpc64__)
-+    // On ppc64+glibc, some syscalls seem to accidentally negate the first
-+    // parameter which causes checks against it to fail. For now, manually
-+    // negate them back.
-+    // TODO(shawn@anastas.io): investigate this issue further
-+    auto nr = SECCOMP_SYSCALL(ctx);
-+    if (nr == __NR_openat || nr == __NR_mkdirat || nr == __NR_faccessat || nr == __NR_readlinkat ||
-+        nr == __NR_renameat || nr == __NR_renameat2 || nr == __NR_newfstatat || nr == __NR_unlinkat) {
-+        if (static_cast<int>(SECCOMP_PARM1(ctx)) > 0) {
-+            SECCOMP_PARM1(ctx) = -SECCOMP_PARM1(ctx);
-+        }
-+    }
-+#endif
-+
-     // Copy the seccomp-specific data into a arch_seccomp_data structure. This
-     // is what we are showing to TrapFnc callbacks that the system call
-     // evaluator registered with the sandbox.
-diff --git a/sandbox/linux/services/credentials.cc b/sandbox/linux/services/credentials.cc
-index d7b5d8c441..4adc6d0d43 100644
---- a/sandbox/linux/services/credentials.cc
-+++ b/sandbox/linux/services/credentials.cc
-@@ -81,7 +81,7 @@ bool ChrootToSafeEmptyDir() {
-   pid_t pid = -1;
-   alignas(16) char stack_buf[PTHREAD_STACK_MIN];
- #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \
--    defined(ARCH_CPU_MIPS_FAMILY)
-+    defined(ARCH_CPU_MIPS_FAMILY) || defined(ARCH_CPU_PPC64_FAMILY)
-   // The stack grows downward.
-   void* stack = stack_buf + sizeof(stack_buf);
- #else
-diff --git a/sandbox/linux/services/syscall_wrappers.cc b/sandbox/linux/services/syscall_wrappers.cc
-index fcfd2aa129..f6eb32fb76 100644
---- a/sandbox/linux/services/syscall_wrappers.cc
-+++ b/sandbox/linux/services/syscall_wrappers.cc
-@@ -58,7 +58,7 @@ long sys_clone(unsigned long flags,
- #if defined(ARCH_CPU_X86_64)
-   return syscall(__NR_clone, flags, child_stack, ptid, ctid, tls);
- #elif defined(ARCH_CPU_X86) || defined(ARCH_CPU_ARM_FAMILY) || \
--    defined(ARCH_CPU_MIPS_FAMILY)
-+    defined(ARCH_CPU_MIPS_FAMILY) || defined(ARCH_CPU_PPC64_FAMILY)
-   // CONFIG_CLONE_BACKWARDS defined.
-   return syscall(__NR_clone, flags, child_stack, ptid, tls, ctid);
- #endif
-diff --git a/sandbox/linux/syscall_broker/broker_process.cc b/sandbox/linux/syscall_broker/broker_process.cc
-index 8321d23798..7e5ad1de37 100644
---- a/sandbox/linux/syscall_broker/broker_process.cc
-+++ b/sandbox/linux/syscall_broker/broker_process.cc
-@@ -157,7 +157,7 @@ bool BrokerProcess::IsSyscallAllowed(int sysno) const {
- #if defined(__NR_fstatat)
-     case __NR_fstatat:
- #endif
--#if defined(__x86_64__) || defined(__aarch64__)
-+#if defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__)
-     case __NR_newfstatat:
- #endif
-       return !fast_check_in_client_ || allowed_command_set_.test(COMMAND_STAT);
-diff --git a/sandbox/linux/system_headers/linux_seccomp.h b/sandbox/linux/system_headers/linux_seccomp.h
-index a60fe2ad3d..9dccdb51d0 100644
---- a/sandbox/linux/system_headers/linux_seccomp.h
-+++ b/sandbox/linux/system_headers/linux_seccomp.h
-@@ -29,6 +29,9 @@
- #ifndef EM_AARCH64
- #define EM_AARCH64 183
- #endif
-+#ifndef EM_PPC64
-+#define EM_PPC64 21
-+#endif
- 
- #ifndef __AUDIT_ARCH_64BIT
- #define __AUDIT_ARCH_64BIT 0x80000000
-@@ -54,6 +57,12 @@
- #ifndef AUDIT_ARCH_AARCH64
- #define AUDIT_ARCH_AARCH64 (EM_AARCH64 | __AUDIT_ARCH_64BIT | __AUDIT_ARCH_LE)
- #endif
-+#ifndef AUDIT_ARCH_PPC64
-+#define AUDIT_ARCH_PPC64 (EM_PPC64 | __AUDIT_ARCH_64BIT)
-+#endif
-+#ifndef AUDIT_ARCH_PPC64LE
-+#define AUDIT_ARCH_PPC64LE (EM_PPC64 | __AUDIT_ARCH_64BIT | __AUDIT_ARCH_LE)
-+#endif
- 
- // For prctl.h
- #ifndef PR_SET_SECCOMP
-diff --git a/sandbox/linux/system_headers/linux_signal.h b/sandbox/linux/system_headers/linux_signal.h
-index f5a7367617..515b21a5fd 100644
---- a/sandbox/linux/system_headers/linux_signal.h
-+++ b/sandbox/linux/system_headers/linux_signal.h
-@@ -13,7 +13,7 @@
- // (not undefined, but defined different values and in different memory
- // layouts). So, fill the gap here.
- #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
--    defined(__aarch64__)
-+    defined(__aarch64__) || defined(__powerpc64__)
- 
- #define LINUX_SIGHUP 1
- #define LINUX_SIGINT 2
-diff --git a/sandbox/linux/system_headers/linux_syscalls.h b/sandbox/linux/system_headers/linux_syscalls.h
-index 2b78a0cc3b..0a70f5ea58 100644
---- a/sandbox/linux/system_headers/linux_syscalls.h
-+++ b/sandbox/linux/system_headers/linux_syscalls.h
-@@ -35,5 +35,9 @@
- #include "sandbox/linux/system_headers/arm64_linux_syscalls.h"
- #endif
- 
-+#if defined(__powerpc64__)
-+#include "sandbox/linux/system_headers/ppc64_linux_syscalls.h"
-+#endif
-+
- #endif  // SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_SYSCALLS_H_
- 
-diff --git a/sandbox/linux/system_headers/linux_ucontext.h b/sandbox/linux/system_headers/linux_ucontext.h
-index 22ce780274..a69b024c2f 100644
---- a/sandbox/linux/system_headers/linux_ucontext.h
-+++ b/sandbox/linux/system_headers/linux_ucontext.h
-@@ -11,6 +11,8 @@
- #include "sandbox/linux/system_headers/arm_linux_ucontext.h"
- #elif defined(__i386__)
- #include "sandbox/linux/system_headers/i386_linux_ucontext.h"
-+#elif defined(__powerpc64__)
-+#include "sandbox/linux/system_headers/ppc64_linux_ucontext.h"
- #else
- #error "No support for your architecture in PNaCl header"
- #endif
-diff --git a/sandbox/linux/system_headers/ppc64_linux_syscalls.h b/sandbox/linux/system_headers/ppc64_linux_syscalls.h
-new file mode 100644
-index 0000000000..ccacffe22e
---- /dev/null
-+++ b/sandbox/linux/system_headers/ppc64_linux_syscalls.h
-@@ -0,0 +1,12 @@
-+// Copyright 2014 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
-+#define SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
-+
-+#include <asm/unistd.h>
-+
-+//TODO: is it necessary to redefine syscall numbers for PPC64?
-+
-+#endif  // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
-diff --git a/sandbox/linux/system_headers/ppc64_linux_ucontext.h b/sandbox/linux/system_headers/ppc64_linux_ucontext.h
-new file mode 100644
-index 0000000000..07728e0879
---- /dev/null
-+++ b/sandbox/linux/system_headers/ppc64_linux_ucontext.h
-@@ -0,0 +1,12 @@
-+// Copyright 2014 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
-+#define SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
-+
-+#include <sys/ucontext.h>
-+
-+//TODO: is it necessary to redefine ucontext on PPC64?
-+
-+#endif  // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
-diff --git a/services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc b/services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc
-index a85c0ea867..00bcd12698 100644
---- a/services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc
-+++ b/services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc
-@@ -15,6 +15,11 @@
- #include "sandbox/linux/system_headers/linux_syscalls.h"
- #include "services/service_manager/sandbox/linux/sandbox_linux.h"
- 
-+// On PPC64, TCGETS is defined in terms of struct termios, so we must include termios.h
-+#ifdef __powerpc64__
-+#include <termios.h>
-+#endif
-+
- // TODO(vignatti): replace the local definitions below with #include
- // <linux/dma-buf.h> once kernel version 4.6 becomes widely used.
- #include <linux/types.h>
-diff --git a/third_party/angle/src/compiler/translator/InfoSink.h b/third_party/angle/src/compiler/translator/InfoSink.h
-index 3a807e1e3d..5258617a7e 100644
---- a/third_party/angle/src/compiler/translator/InfoSink.h
-+++ b/third_party/angle/src/compiler/translator/InfoSink.h
-@@ -92,7 +92,16 @@ class TInfoSinkBase
-             stream.precision(8);
-             stream << f;
-         }
--        sink.append(stream.str());
-+
-+        // Hack to work around a bug where negative floating point values
-+        // are rendered like '.0.5' instead of '-0.5'
-+        std::string res(stream.str());
-+
-+        if (signbit(f)) { // test if f is negative
-+            res[0] = '-';
-+        }
-+
-+        sink.append(res);
-         return *this;
-     }
-     // Write boolean values as their names instead of integral value.
-diff --git a/third_party/angle/src/libANGLE/Constants.h b/third_party/angle/src/libANGLE/Constants.h
-index 7467899135..9132b3fc0f 100644
---- a/third_party/angle/src/libANGLE/Constants.h
-+++ b/third_party/angle/src/libANGLE/Constants.h
-@@ -9,6 +9,7 @@
- #ifndef LIBANGLE_CONSTANTS_H_
- #define LIBANGLE_CONSTANTS_H_
- 
-+#include <cstddef>
- #include "common/platform.h"
- 
- #include <stdint.h>
-diff --git a/third_party/boringssl/BUILD.gn b/third_party/boringssl/BUILD.gn
-index b435499f45..ac8a84b6db 100644
---- a/third_party/boringssl/BUILD.gn
-+++ b/third_party/boringssl/BUILD.gn
-@@ -101,6 +101,13 @@ if (is_win && !is_msan && current_cpu != "arm64") {
-       } else {
-         public_configs = [ ":no_asm_config" ]
-       }
-+    } else if (current_cpu == "ppc64") {
-+      if (is_linux) {
-+        # TODO: ppc64 (be) check
-+        sources += crypto_sources_linux_ppc64le
-+      } else {
-+        public_configs = [ ":no_asm_config" ]
-+      }
-     } else {
-       public_configs = [ ":no_asm_config" ]
-     }
-diff --git a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
-index 07d9171a0a..9aed4cb369 100644
---- a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
-+++ b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
-@@ -44,6 +44,8 @@ typedef MDRawContextARM RawContextCPU;
- typedef MDRawContextARM64_Old RawContextCPU;
- #elif defined(__mips__)
- typedef MDRawContextMIPS RawContextCPU;
-+#elif defined(__powerpc64__)
-+typedef MDRawContextPPC64 RawContextCPU;
- #else
- #error "This code has not been ported to your platform yet."
- #endif
-diff --git a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
-index aae1dc13b2..03afec7a58 100644
---- a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
-@@ -270,7 +270,42 @@ void ThreadInfo::FillCPUContext(RawContextCPU* out) const {
-   out->float_save.fir = mcontext.fpc_eir;
- #endif
- }
--#endif  // __mips__
-+
-+#elif defined(__powerpc64__)
-+
-+uintptr_t ThreadInfo::GetInstructionPointer() const {
-+    return mcontext.gp_regs[PT_NIP];
-+}
-+
-+void ThreadInfo::FillCPUContext(RawContextCPU* out) const {
-+    out->context_flags = MD_CONTEXT_PPC64_FULL;
-+    for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
-+        out->gpr[i] = mcontext.gp_regs[i];
-+
-+    out->lr = mcontext.gp_regs[PT_LNK];
-+    out->srr0 = mcontext.gp_regs[PT_NIP];
-+    out->srr1 = mcontext.gp_regs[PT_MSR];
-+    out->cr = mcontext.gp_regs[PT_CCR];
-+    out->xer = mcontext.gp_regs[PT_XER];
-+    out->ctr = mcontext.gp_regs[PT_CTR];
-+    
-+    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
-+        out->float_save.fpregs[i] = mcontext.fp_regs[i];
-+
-+    out->float_save.fpscr = mcontext.fp_regs[NFPREG-1];
-+
-+    for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++)
-+        out->vector_save.save_vr[i] = \
-+            {(((uint64_t)vregs.vrregs[i][0]) << 32) 
-+                          | vregs.vrregs[i][1], 
-+            (((uint64_t)vregs.vrregs[i][2]) << 32)
-+                         | vregs.vrregs[i][3]};
-+
-+    out->vrsave = vregs.vrsave;
-+    out->vector_save.save_vscr = {0, vregs.vscr.vscr_word};
-+    out->vector_save.save_vrvalid = 0xFFFFFFFF; 
-+}
-+#endif  // __powerpc64__
- 
- void ThreadInfo::GetGeneralPurposeRegisters(void** gp_regs, size_t* size) {
-   assert(gp_regs || size);
-@@ -279,6 +314,11 @@ void ThreadInfo::GetGeneralPurposeRegisters(void** gp_regs, size_t* size) {
-     *gp_regs = mcontext.gregs;
-   if (size)
-     *size = sizeof(mcontext.gregs);
-+#elif defined(__powerpc64__)
-+  if (gp_regs)
-+    *gp_regs = mcontext.gp_regs;
-+  if (size)
-+    *size = sizeof(mcontext.gp_regs);
- #else
-   if (gp_regs)
-     *gp_regs = &regs;
-@@ -294,6 +334,11 @@ void ThreadInfo::GetFloatingPointRegisters(void** fp_regs, size_t* size) {
-     *fp_regs = &mcontext.fpregs;
-   if (size)
-     *size = sizeof(mcontext.fpregs);
-+#elif defined(__powerpc64__)
-+  if (fp_regs)
-+    *fp_regs = &mcontext.fp_regs;
-+  if (size)
-+    *size = sizeof(mcontext.fp_regs);
- #else
-   if (fp_regs)
-     *fp_regs = &fpregs;
-@@ -302,4 +347,13 @@ void ThreadInfo::GetFloatingPointRegisters(void** fp_regs, size_t* size) {
- #endif
- }
- 
-+#if defined(__powerpc64__)
-+void ThreadInfo::GetVectorRegisters(void** v_regs, size_t* size) {
-+    if (v_regs)
-+        *v_regs = &vregs;
-+    if (size)
-+        *size = sizeof(vregs);
-+}
-+#endif
-+
- }  // namespace google_breakpad
-diff --git a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
-index fb216fa6d7..593aac8225 100644
---- a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
-+++ b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
-@@ -68,6 +68,10 @@ struct ThreadInfo {
-   // Use the structures defined in <sys/user.h>
-   struct user_regs_struct regs;
-   struct user_fpsimd_struct fpregs;
-+#elif defined(__powerpc64__)
-+  // Use the structures defined in <sys/ucontext.h>.
-+  mcontext_t mcontext;
-+  vrregset_t vregs;
- #elif defined(__mips__)
-   // Use the structure defined in <sys/ucontext.h>.
-   mcontext_t mcontext;
-@@ -84,6 +88,11 @@ struct ThreadInfo {
- 
-   // Returns the pointer and size of float point register area.
-   void GetFloatingPointRegisters(void** fp_regs, size_t* size);
-+
-+#if defined(__powerpc64__)
-+  // Returns the pointer and size of the vector register area. (PPC64 only)
-+  void GetVectorRegisters(void** v_regs, size_t* size);
-+#endif
- };
- 
- }  // namespace google_breakpad
-diff --git a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
-index 6ee6cc1e4c..44fee5ba06 100644
---- a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
-@@ -254,6 +254,48 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) {
-   out->float_save.fir = uc->uc_mcontext.fpc_eir;  // Unused.
- #endif
- }
-+
-+#elif defined(__powerpc64__)
-+
-+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
-+    return uc->uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP];
-+}
-+
-+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
-+    return uc->uc_mcontext.gp_regs[PT_NIP];
-+}
-+
-+void UContextReader::FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
-+                                    const vrregset_t* vregs) {
-+    out->context_flags = MD_CONTEXT_PPC64_FULL;
-+
-+    for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
-+        out->gpr[i] = uc->uc_mcontext.gp_regs[i];
-+
-+    out->lr = uc->uc_mcontext.gp_regs[PT_LNK];    
-+    out->srr0 = uc->uc_mcontext.gp_regs[PT_NIP];
-+    out->srr1 = uc->uc_mcontext.gp_regs[PT_MSR];
-+    out->cr = uc->uc_mcontext.gp_regs[PT_CCR];
-+    out->xer = uc->uc_mcontext.gp_regs[PT_XER];
-+    out->ctr = uc->uc_mcontext.gp_regs[PT_CTR];
-+    
-+    for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
-+        out->float_save.fpregs[i] = uc->uc_mcontext.fp_regs[i];
-+
-+    out->float_save.fpscr = uc->uc_mcontext.fp_regs[NFPREG-1];
-+
-+    for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++)
-+        out->vector_save.save_vr[i] =
-+            {(((uint64_t)vregs->vrregs[i][0]) << 32) 
-+                         | vregs->vrregs[i][1], 
-+             (((uint64_t)vregs->vrregs[i][2]) << 32)
-+                         | vregs->vrregs[i][3]};
-+
-+    out->vrsave = vregs->vrsave;
-+    out->vector_save.save_vscr = {0, vregs->vscr.vscr_word};
-+    out->vector_save.save_vrvalid = 0xFFFFFFFF; 
-+}
-+
- #endif
- 
- }  // namespace google_breakpad
-diff --git a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
-index f830618f24..24d996380f 100644
---- a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
-+++ b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
-@@ -54,6 +54,9 @@ struct UContextReader {
- #elif defined(__aarch64__)
-   static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
-                              const struct fpsimd_context* fpregs);
-+#elif defined(__powerpc64__)
-+  static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
-+                             const vrregset_t* vregs);
- #else
-   static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc);
- #endif
-diff --git a/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc b/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
-index b895f6d7ad..901cd68fbd 100644
---- a/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
-@@ -461,9 +461,16 @@ bool ExceptionHandler::HandleSignal(int /*sig*/, siginfo_t* info, void* uc) {
-     memcpy(&g_crash_context_.float_state, fp_ptr,
-            sizeof(g_crash_context_.float_state));
-   }
-+#elif defined(__powerpc64__)
-+  // On PPC64, we must copy VR state
-+  ucontext_t* uc_ptr = (ucontext_t*)uc;
-+  if (uc_ptr->uc_mcontext.v_regs) {
-+    memcpy(&g_crash_context_.vector_state, uc_ptr->uc_mcontext.v_regs,
-+           sizeof(g_crash_context_.vector_state));
-+  }
- #elif !defined(__ARM_EABI__) && !defined(__mips__)
-   // FP state is not part of user ABI on ARM Linux.
--  // In case of MIPS Linux FP state is already part of ucontext_t
-+  // In case of MIPS, Linux FP state is already part of ucontext_t
-   // and 'float_state' is not a member of CrashContext.
-   ucontext_t* uc_ptr = (ucontext_t*)uc;
-   if (uc_ptr->uc_mcontext.fpregs) {
-@@ -701,11 +708,19 @@ bool ExceptionHandler::WriteMinidump() {
-   }
- #endif
- 
--#if !defined(__ARM_EABI__) && !defined(__aarch64__) && !defined(__mips__)
-+#if !defined(__ARM_EABI__) && !defined(__aarch64__) && !defined(__mips__) \
-+    && !defined(__powerpc64__)
-   // FPU state is not part of ARM EABI ucontext_t.
-   memcpy(&context.float_state, context.context.uc_mcontext.fpregs,
-          sizeof(context.float_state));
- #endif
-+
-+#if defined(__powerpc64__)
-+  // Vector registers must be copied on PPC64
-+  memcpy(&context.vector_state, context.context.uc_mcontext.v_regs,
-+         sizeof(context.vector_state));
-+#endif
-+
-   context.tid = sys_gettid();
- 
-   // Add an exception stream to the minidump for better reporting.
-@@ -726,6 +741,9 @@ bool ExceptionHandler::WriteMinidump() {
- #elif defined(__mips__)
-   context.siginfo.si_addr =
-       reinterpret_cast<void*>(context.context.uc_mcontext.pc);
-+#elif defined(__powerpc64__)
-+  context.siginfo.si_addr =
-+      reinterpret_cast<void*>(context.context.uc_mcontext.gp_regs[PT_NIP]);
- #else
- #error "This code has not been ported to your platform yet."
- #endif
-diff --git a/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h b/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
-index f44483ff0f..36ce6d6ce4 100644
---- a/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
-+++ b/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
-@@ -192,7 +192,11 @@ class ExceptionHandler {
-     siginfo_t siginfo;
-     pid_t tid;  // the crashing thread.
-     ucontext_t context;
--#if !defined(__ARM_EABI__) && !defined(__mips__)
-+#if defined(__powerpc64__)
-+    // PPC64's FP state is a part of ucontext_t like MIPS but the vector
-+    // state is not, so a struct is needed.
-+    vstate_t vector_state;
-+#elif !defined(__ARM_EABI__) && !defined(__mips__)
-     // #ifdef this out because FP state is not part of user ABI for Linux ARM.
-     // In case of MIPS Linux FP state is already part of ucontext_t so
-     // 'float_state' is not required.
-diff --git a/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc b/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
-index bcbf9c26f1..2c36ed41f2 100644
---- a/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
-@@ -307,7 +307,7 @@ TEST(ExceptionHandlerTest, ParallelChildCrashesDontHang) {
-   }
- 
-   // Wait a while until the child should have crashed.
--  usleep(1000000);
-+  usleep(2000000);
-   // Kill the child if it is still running.
-   kill(child, SIGKILL);
- 
-@@ -559,6 +559,8 @@ const unsigned char kIllegalInstruction[] = {
- #if defined(__mips__)
-   // mfc2 zero,Impl - usually illegal in userspace.
-   0x48, 0x00, 0x00, 0x48
-+#elif defined(__powerpc64__)
-+  0x01, 0x01, 0x01, 0x01 // Crashes on a tested POWER9 cpu
- #else
-   // This crashes with SIGILL on x86/x86-64/arm.
-   0xff, 0xff, 0xff, 0xff
-@@ -754,10 +756,10 @@ TEST(ExceptionHandlerTest, InstructionPointerMemoryMaxBound) {
- 
-   // These are defined here so the parent can use them to check the
-   // data from the minidump afterwards.
--  // Use 4k here because the OS will hand out a single page even
-+  // Use the page size here because the OS will hand out a single page even
-   // if a smaller size is requested, and this test wants to
-   // test the upper bound of the memory range.
--  const uint32_t kMemorySize = 4096;  // bytes
-+  const uint32_t kMemorySize = getpagesize();  // bytes
-   const int kOffset = kMemorySize - sizeof(kIllegalInstruction);
- 
-   const pid_t child = fork();
-diff --git a/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc b/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
-index fa3c1713a5..6ce709e2f0 100644
---- a/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
-@@ -138,7 +138,9 @@ class MicrodumpWriter {
-                   const MicrodumpExtraInfo& microdump_extra_info,
-                   LinuxDumper* dumper)
-       : ucontext_(context ? &context->context : NULL),
--#if !defined(__ARM_EABI__) && !defined(__mips__)
-+#if defined(__powerpc64__)
-+        vector_state_(context ? &context->vector_state : NULL),
-+#elif !defined(__ARM_EABI__) && !defined(__mips__)
-         float_state_(context ? &context->float_state : NULL),
- #endif
-         dumper_(dumper),
-@@ -337,6 +339,8 @@ class MicrodumpWriter {
- # else
- #  error "This mips ABI is currently not supported (n32)"
- #endif
-+#elif defined(__powerpc64__)
-+    const char kArch[] = "ppc64";
- #else
- #error "This code has not been ported to your platform yet"
- #endif
-@@ -409,7 +413,9 @@ class MicrodumpWriter {
-   void DumpCPUState() {
-     RawContextCPU cpu;
-     my_memset(&cpu, 0, sizeof(RawContextCPU));
--#if !defined(__ARM_EABI__) && !defined(__mips__)
-+#if defined(__powerpc64__)
-+    UContextReader::FillCPUContext(&cpu, ucontext_, vector_state_);
-+#elif !defined(__ARM_EABI__) && !defined(__mips__)
-     UContextReader::FillCPUContext(&cpu, ucontext_, float_state_);
- #else
-     UContextReader::FillCPUContext(&cpu, ucontext_);
-@@ -605,7 +611,9 @@ class MicrodumpWriter {
-   void* Alloc(unsigned bytes) { return dumper_->allocator()->Alloc(bytes); }
- 
-   const ucontext_t* const ucontext_;
--#if !defined(__ARM_EABI__) && !defined(__mips__)
-+#if defined(__powerpc64__)
-+  const google_breakpad::vstate_t* const vector_state_;
-+#elif !defined(__ARM_EABI__) && !defined(__mips__)
-   const google_breakpad::fpstate_t* const float_state_;
- #endif
-   LinuxDumper* dumper_;
-diff --git a/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc b/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
-index c2fea0225e..8c62c524a2 100644
---- a/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
-@@ -278,10 +278,19 @@ TEST(MicrodumpWriterTest, BasicWithMappings) {
-   CrashAndGetMicrodump(mappings, MicrodumpExtraInfo(), &buf);
-   ASSERT_TRUE(ContainsMicrodump(buf));
- 
-+  int page_size = getpagesize();
- #ifdef __LP64__
--  ASSERT_NE(std::string::npos,
--            buf.find("M 0000000000001000 000000000000002A 0000000000001000 "
--                     "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
-+  // This test is only available for the following page sizes
-+  ASSERT_TRUE((page_size == 4096) || (page_size == 65536));
-+  if (page_size == 4096) { 
-+    ASSERT_NE(std::string::npos,
-+              buf.find("M 0000000000001000 000000000000002A 0000000000001000 "
-+                       "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
-+  } else {
-+    ASSERT_NE(std::string::npos,
-+              buf.find("M 0000000000010000 000000000000002A 0000000000010000 "
-+                       "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
-+  }
- #else
-   ASSERT_NE(std::string::npos,
-             buf.find("M 00001000 0000002A 00001000 "
-diff --git a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
-index 4150689839..b93e4afcff 100644
---- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
-@@ -112,6 +112,9 @@ bool LinuxCoreDumper::GetThreadInfoByIndex(size_t index, ThreadInfo* info) {
- #elif defined(__mips__)
-   stack_pointer =
-       reinterpret_cast<uint8_t*>(info->mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]);
-+#elif defined(__powerpc64__)
-+  stack_pointer =
-+      reinterpret_cast<uint8_t*>(info->mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP]);
- #else
- #error "This code hasn't been ported to your platform yet."
- #endif
-@@ -197,7 +200,10 @@ bool LinuxCoreDumper::EnumerateThreads() {
-         memset(&info, 0, sizeof(ThreadInfo));
-         info.tgid = status->pr_pgrp;
-         info.ppid = status->pr_ppid;
--#if defined(__mips__)
-+#if defined(__powerpc64__)
-+        for (int i = 0; i < 31; i++)
-+            info.mcontext.gp_regs[i] = status->pr_reg[i];
-+#elif defined(__mips__)
- #if defined(__ANDROID__)
-         for (int i = EF_R0; i <= EF_R31; i++)
-           info.mcontext.gregs[i - EF_R0] = status->pr_reg[i];
-diff --git a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
-index 1112035bc5..8523dad634 100644
---- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
-@@ -765,7 +765,9 @@ bool LinuxDumper::GetStackInfo(const void** stack, size_t* stack_len,
-       reinterpret_cast<uint8_t*>(int_stack_pointer & ~(page_size - 1));
- 
-   // The number of bytes of stack which we try to capture.
--  static const ptrdiff_t kStackToCapture = 32 * 1024;
-+  // This now depends on page_size to avoid missing data
-+  // on systems with larger page sizes.
-+  static const ptrdiff_t kStackToCapture = 8 * page_size;
- 
-   const MappingInfo* mapping = FindMapping(stack_pointer);
-   if (!mapping)
-diff --git a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
-index f4a75d9060..020981f57e 100644
---- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
-+++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
-@@ -63,7 +63,8 @@ namespace google_breakpad {
-  (defined(__mips__) && _MIPS_SIM == _ABIO32)
- typedef Elf32_auxv_t elf_aux_entry;
- #elif defined(__x86_64) || defined(__aarch64__) || \
--     (defined(__mips__) && _MIPS_SIM != _ABIO32)
-+     (defined(__mips__) && _MIPS_SIM != _ABIO32) || \
-+     defined(__powerpc64__)
- typedef Elf64_auxv_t elf_aux_entry;
- #endif
- 
-diff --git a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
-index 3ad48e5015..1688c365ef 100644
---- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
-@@ -51,6 +51,8 @@
- #define TID_PTR_REGISTER "rcx"
- #elif defined(__mips__)
- #define TID_PTR_REGISTER "$1"
-+#elif defined(__powerpc64__)
-+#define TID_PTR_REGISTER "r8"
- #else
- #error This test has not been ported to this platform.
- #endif
-diff --git a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
-index e3ddb81a65..fa28575ef5 100644
---- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
-@@ -149,19 +149,27 @@ bool LinuxPtraceDumper::CopyFromProcess(void* dest, pid_t child,
-   return true;
- }
- 
--bool LinuxPtraceDumper::ReadRegisterSet(ThreadInfo* info, pid_t tid)
--{
-+bool LinuxPtraceDumper::ReadRegisterSet(ThreadInfo* info, pid_t tid) {
- #ifdef PTRACE_GETREGSET
-   struct iovec io;
-   info->GetGeneralPurposeRegisters(&io.iov_base, &io.iov_len);
--  if (sys_ptrace(PTRACE_GETREGSET, tid, (void*)NT_PRSTATUS, (void*)&io) == -1) {
-+  if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_PRSTATUS, (void*)&io) == -1) {
-     return false;
-   }
- 
-   info->GetFloatingPointRegisters(&io.iov_base, &io.iov_len);
--  if (sys_ptrace(PTRACE_GETREGSET, tid, (void*)NT_FPREGSET, (void*)&io) == -1) {
-+  if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_FPREGSET, (void*)&io) == -1) {
-     return false;
-   }
-+
-+#if defined(__powerpc64__)
-+  // Grab the vector registers on PPC64 too
-+  info->GetVectorRegisters(&io.iov_base, &io.iov_len);
-+  if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_PPC_VMX, (void*)&io) == -1) {
-+    return false;
-+  }
-+#endif // defined(__powerpc64__)
-+
-   return true;
- #else
-   return false;
-@@ -298,6 +306,9 @@ bool LinuxPtraceDumper::GetThreadInfoByIndex(size_t index, ThreadInfo* info) {
- #elif defined(__mips__)
-   stack_pointer =
-       reinterpret_cast<uint8_t*>(info->mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]);
-+#elif defined(__powerpc64__)
-+  stack_pointer =
-+      reinterpret_cast<uint8_t*>(info->mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP]);
- #else
- #error "This code hasn't been ported to your platform yet."
- #endif
-diff --git a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
-index a41dafce04..31743940de 100644
---- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
-@@ -462,6 +462,9 @@ TEST(LinuxPtraceDumperTest, VerifyStackReadWithMultipleThreads) {
- #elif defined(__mips__)
-     pid_t* process_tid_location =
-         reinterpret_cast<pid_t*>(one_thread.mcontext.gregs[1]);
-+#elif defined(__powerpc64__)
-+    pid_t* process_tid_location =
-+        reinterpret_cast<pid_t*>(one_thread.mcontext.gp_regs[8]);
- #else
- #error This test has not been ported to this platform.
- #endif
-@@ -559,6 +562,8 @@ TEST_F(LinuxPtraceDumperTest, SanitizeStackCopy) {
-   uintptr_t heap_addr = thread_info.regs.rcx;
- #elif defined(__mips__)
-   uintptr_t heap_addr = thread_info.mcontext.gregs[1];
-+#elif defined(__powerpc64__)
-+  uintptr_t heap_addr = thread_info.mcontext.gp_regs[8];
- #else
- #error This test has not been ported to this platform.
- #endif
-diff --git a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
-index f8cdf2a1c6..cb808c151f 100644
---- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
-@@ -136,7 +136,9 @@ class MinidumpWriter {
-       : fd_(minidump_fd),
-         path_(minidump_path),
-         ucontext_(context ? &context->context : NULL),
--#if !defined(__ARM_EABI__) && !defined(__mips__)
-+#if defined(__powerpc64__)
-+        vector_state_(context ? &context->vector_state : NULL),
-+#elif !defined(__ARM_EABI__) && !defined(__mips__)
-         float_state_(context ? &context->float_state : NULL),
- #endif
-         dumper_(dumper),
-@@ -468,7 +470,9 @@ class MinidumpWriter {
-         if (!cpu.Allocate())
-           return false;
-         my_memset(cpu.get(), 0, sizeof(RawContextCPU));
--#if !defined(__ARM_EABI__) && !defined(__mips__)
-+#if defined(__powerpc64__)
-+        UContextReader::FillCPUContext(cpu.get(), ucontext_, vector_state_);
-+#elif !defined(__ARM_EABI__) && !defined(__mips__)
-         UContextReader::FillCPUContext(cpu.get(), ucontext_, float_state_);
- #else
-         UContextReader::FillCPUContext(cpu.get(), ucontext_);
-@@ -897,7 +901,7 @@ class MinidumpWriter {
-     dirent->location.rva = 0;
-   }
- 
--#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
-+#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || defined(__powerpc64__)
-   bool WriteCPUInformation(MDRawSystemInfo* sys_info) {
-     char vendor_id[sizeof(sys_info->cpu.x86_cpu_info.vendor_id) + 1] = {0};
-     static const char vendor_id_name[] = "vendor_id";
-@@ -917,7 +921,9 @@ class MinidumpWriter {
- 
-     // processor_architecture should always be set, do this first
-     sys_info->processor_architecture =
--#if defined(__mips__)
-+#if defined(__powerpc64__)
-+        MD_CPU_ARCHITECTURE_PPC64;
-+#elif defined(__mips__)
- # if _MIPS_SIM == _ABIO32
-         MD_CPU_ARCHITECTURE_MIPS;
- # elif _MIPS_SIM == _ABI64
-@@ -1333,7 +1339,9 @@ class MinidumpWriter {
-   const char* path_;  // Path to the file where the minidum should be written.
- 
-   const ucontext_t* const ucontext_;  // also from the signal handler
--#if !defined(__ARM_EABI__) && !defined(__mips__)
-+#if defined(__powerpc64__)
-+  const google_breakpad::vstate_t* const vector_state_;
-+#elif !defined(__ARM_EABI__) && !defined(__mips__)
-   const google_breakpad::fpstate_t* const float_state_;  // ditto
- #endif
-   LinuxDumper* dumper_;
-diff --git a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
-index d1dc331215..c344621df1 100644
---- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
-+++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
-@@ -47,6 +47,8 @@ class ExceptionHandler;
- 
- #if defined(__aarch64__)
- typedef struct fpsimd_context fpstate_t;
-+#elif defined(__powerpc64__)
-+typedef vrregset_t vstate_t;
- #elif !defined(__ARM_EABI__) && !defined(__mips__)
- typedef struct _libc_fpstate fpstate_t;
- #endif
-diff --git a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
-index c951e69d8f..e1d6e40d67 100644
---- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
-+++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
-@@ -714,6 +714,9 @@ TEST(MinidumpWriterTest, InvalidStackPointer) {
- #elif defined(__mips__)
-   context.context.uc_mcontext.gregs[MD_CONTEXT_MIPS_REG_SP] =
-       invalid_stack_pointer;
-+#elif defined(__powerpc64__)
-+  context.context.uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP] =
-+      invalid_stack_pointer;
- #else
- # error "This code has not been ported to your platform yet."
- #endif
-diff --git a/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc b/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
-index 4e938269f2..f0ff15d967 100644
---- a/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
-+++ b/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
-@@ -65,8 +65,7 @@ bool MemoryMappedFile::Map(const char* path, size_t offset) {
-   }
- 
- #if defined(__x86_64__) || defined(__aarch64__) || \
--   (defined(__mips__) && _MIPS_SIM == _ABI64)
--
-+   (defined(__mips__) && _MIPS_SIM == _ABI64) || defined(__powerpc64__)
-   struct kernel_stat st;
-   if (sys_fstat(fd, &st) == -1 || st.st_size < 0) {
- #else
-diff --git a/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc b/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
-index fad59f40cd..616496d672 100644
---- a/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
-+++ b/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
-@@ -176,9 +176,10 @@ TEST_F(MemoryMappedFileTest, RemapAfterMap) {
- TEST_F(MemoryMappedFileTest, MapWithOffset) {
-   // Put more data in the test file this time. Offsets can only be
-   // done on page boundaries, so we need a two page file to test this.
--  const int page_size = 4096;
--  char data1[2 * page_size];
--  size_t data1_size = sizeof(data1);
-+  const int page_size = getpagesize();
-+  char *data1 = static_cast<char*>(malloc(2 * page_size));
-+  EXPECT_TRUE(data1 != NULL);
-+  size_t data1_size = (2 * page_size);
-   for (size_t i = 0; i < data1_size; ++i) {
-     data1[i] = i & 0x7f;
-   }
-diff --git a/third_party/breakpad/breakpad/src/processor/exploitability_linux.cc b/third_party/breakpad/breakpad/src/processor/exploitability_linux.cc
-index ccc9f1459c..debaed4d6e 100644
---- a/third_party/breakpad/breakpad/src/processor/exploitability_linux.cc
-+++ b/third_party/breakpad/breakpad/src/processor/exploitability_linux.cc
-@@ -202,12 +202,14 @@ bool ExploitabilityLinux::EndedOnIllegalWrite(uint64_t instruction_ptr) {
-   // Check architecture and set architecture variable to corresponding flag
-   // in objdump.
-   switch (context->GetContextCPU()) {
-+#if defined(__i386) || defined(__x86_64)
-     case MD_CONTEXT_X86:
-       architecture = "i386";
-       break;
-     case MD_CONTEXT_AMD64:
-       architecture = "i386:x86-64";
-       break;
-+#endif
-     default:
-       // Unsupported architecture. Note that ARM architectures are not
-       // supported because objdump does not support ARM.
-diff --git a/third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc b/third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc
-index 528ee5f213..72764d6c1e 100644
---- a/third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc
-+++ b/third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc
-@@ -104,6 +104,8 @@ ExploitabilityFor(const string& filename) {
- }
- 
- TEST(ExploitabilityTest, TestWindowsEngine) {
-+// The following tests are only executable on an x86-class linux machine.
-+#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
-   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
-             ExploitabilityFor("ascii_read_av.dmp"));
-   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
-@@ -136,9 +138,12 @@ TEST(ExploitabilityTest, TestWindowsEngine) {
-             ExploitabilityFor("read_av_clobber_write.dmp"));
-   ASSERT_EQ(google_breakpad::EXPLOITABILITY_LOW,
-             ExploitabilityFor("read_av_conditional.dmp"));
-+#endif
- }
- 
- TEST(ExploitabilityTest, TestLinuxEngine) {
-+// The following tests are only executable on an x86-class linux machine.
-+#if defined(__i386) || defined(__x86_64)
-   ASSERT_EQ(google_breakpad::EXPLOITABILITY_INTERESTING,
-             ExploitabilityFor("linux_null_read_av.dmp"));
-   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
-@@ -171,7 +176,8 @@ TEST(ExploitabilityTest, TestLinuxEngine) {
-             ExploitabilityFor("linux_executable_heap.dmp"));
-   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
-             ExploitabilityFor("linux_jmp_to_module_not_exe_region.dmp"));
--#ifndef _WIN32
-+#endif
-+#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
-   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
-             ExploitabilityFor("linux_write_to_nonwritable_module.dmp"));
-   ASSERT_EQ(google_breakpad::EXPLOITABILITY_HIGH,
-@@ -182,10 +188,10 @@ TEST(ExploitabilityTest, TestLinuxEngine) {
-             ExploitabilityFor("linux_write_to_outside_module_via_math.dmp"));
-   ASSERT_EQ(google_breakpad::EXPLOITABILITY_INTERESTING,
-             ExploitabilityFor("linux_write_to_under_4k.dmp"));
--#endif  // _WIN32
-+#endif  // !defined(_WIN32) && (!defined(__i386) && !defined(__x86_64))
- }
- 
--#ifndef _WIN32
-+#if !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
- TEST(ExploitabilityLinuxUtilsTest, DisassembleBytesTest) {
-   ASSERT_FALSE(ExploitabilityLinuxTest::DisassembleBytes("", NULL, 5, NULL));
-   uint8_t bytes[6] = {0xc7, 0x0, 0x5, 0x0, 0x0, 0x0};
-@@ -301,6 +307,7 @@ TEST(ExploitabilityLinuxUtilsTest, CalculateAddressTest) {
-                                                          context,
-                                                          &write_address));
- }
--#endif  // _WIN32
-+#endif  // !defined(_WIN32) && (defined(__i386) || defined(__x86_64))
-+
- 
- }  // namespace
-diff --git a/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc b/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
-index 941586e9f6..49cdc3fc28 100644
---- a/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
-+++ b/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
-@@ -76,6 +76,8 @@
-   #define ELF_ARCH  EM_MIPS
- #elif defined(__aarch64__)
-   #define ELF_ARCH  EM_AARCH64
-+#elif defined(__powerpc64__)
-+  #define ELF_ARCH  EM_PPC64
- #endif
- 
- #if defined(__arm__)
-@@ -86,6 +88,8 @@ typedef user_regs user_regs_struct;
- #elif defined (__mips__)
- // This file-local typedef simplifies the source code.
- typedef gregset_t user_regs_struct;
-+#elif defined(__powerpc64__)
-+typedef struct pt_regs user_regs_struct;
- #endif
- 
- using google_breakpad::MDTypeHelper;
-@@ -320,6 +324,9 @@ struct CrashedProcess {
- #endif
- #if defined(__aarch64__)
-     user_fpsimd_struct fpregs;
-+#endif
-+#if defined(__powerpc64__)
-+    mcontext_t mcontext;
- #endif
-     uintptr_t stack_addr;
-     const uint8_t* stack;
-@@ -534,6 +541,38 @@ ParseThreadRegisters(CrashedProcess::Thread* thread,
-   thread->mcontext.fpc_eir = rawregs->float_save.fir;
- #endif
- }
-+#elif defined(__powerpc64__)
-+static void
-+ParseThreadRegisters(CrashedProcess::Thread* thread,
-+                     const MinidumpMemoryRange& range) {
-+  const MDRawContextPPC64* rawregs = range.GetData<MDRawContextPPC64>(0);
-+
-+  for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
-+    thread->mcontext.gp_regs[i] = rawregs->gpr[i];
-+
-+  thread->mcontext.gp_regs[PT_LNK] = rawregs->lr;
-+  thread->mcontext.gp_regs[PT_NIP] = rawregs->srr0;
-+  thread->mcontext.gp_regs[PT_MSR] = rawregs->srr1;
-+  thread->mcontext.gp_regs[PT_CCR] = rawregs->cr;
-+  thread->mcontext.gp_regs[PT_XER] = rawregs->xer;
-+  thread->mcontext.gp_regs[PT_CTR] = rawregs->ctr;
-+  thread->mcontext.v_regs->vrsave = rawregs->vrsave;
-+
-+  for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
-+      thread->mcontext.fp_regs[i] = rawregs->float_save.fpregs[i];
-+
-+  thread->mcontext.fp_regs[NFPREG-1] = rawregs->float_save.fpscr;
-+
-+  for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++) {
-+      thread->mcontext.v_regs->vrregs[i][0] = rawregs->vector_save.save_vr[i].high >> 32;
-+      thread->mcontext.v_regs->vrregs[i][1] = rawregs->vector_save.save_vr[i].high;
-+      thread->mcontext.v_regs->vrregs[i][2] = rawregs->vector_save.save_vr[i].low >> 32;
-+      thread->mcontext.v_regs->vrregs[i][3] = rawregs->vector_save.save_vr[i].low;
-+  }
-+
-+  thread->mcontext.v_regs->vscr.vscr_word = rawregs->vector_save.save_vscr.low & 0xFFFFFFFF;
-+}
-+
- #else
- #error "This code has not been ported to your platform yet"
- #endif
-@@ -622,6 +661,12 @@ ParseSystemInfo(const Options& options, CrashedProcess* crashinfo,
- # else
- #  error "This mips ABI is currently not supported (n32)"
- # endif
-+#elif defined(__powerpc64__)
-+  if (sysinfo->processor_architecture != MD_CPU_ARCHITECTURE_PPC64) {
-+    fprintf(stderr,
-+            "This version of minidump-2-core only supports PPC64.\n");
-+    exit(1);
-+  }
- #else
- #error "This code has not been ported to your platform yet"
- #endif
-diff --git a/third_party/crashpad/crashpad/CONTRIBUTORS b/third_party/crashpad/crashpad/CONTRIBUTORS
-index 8724b7f32f..8e29424ef6 100644
---- a/third_party/crashpad/crashpad/CONTRIBUTORS
-+++ b/third_party/crashpad/crashpad/CONTRIBUTORS
-@@ -13,3 +13,4 @@ Mark Mentovai <mark@chromium.org>
- Robert Sesek <rsesek@chromium.org>
- Scott Graham <scottmg@chromium.org>
- Joshua Peraza <jperaza@chromium.org>
-+Shawn Anastasio <shawn@anastas.io>
-diff --git a/third_party/crashpad/crashpad/compat/linux/sys/user.h b/third_party/crashpad/crashpad/compat/linux/sys/user.h
-index 6ed77a98e1..1fd83469a0 100644
---- a/third_party/crashpad/crashpad/compat/linux/sys/user.h
-+++ b/third_party/crashpad/crashpad/compat/linux/sys/user.h
-@@ -15,6 +15,7 @@
- #ifndef CRASHPAD_COMPAT_LINUX_SYS_USER_H_
- #define CRASHPAD_COMPAT_LINUX_SYS_USER_H_
- 
-+#include <cstddef>
- #include_next <sys/user.h>
- 
- #include <features.h>
-diff --git a/third_party/crashpad/crashpad/minidump/minidump_context.h b/third_party/crashpad/crashpad/minidump/minidump_context.h
-index 3a3e603cb0..3118d9e9f9 100644
---- a/third_party/crashpad/crashpad/minidump/minidump_context.h
-+++ b/third_party/crashpad/crashpad/minidump/minidump_context.h
-@@ -592,6 +592,70 @@ struct MinidumpContextMIPS64 {
-   uint64_t fir;
- };
- 
-+//! \brief ppc64-specific flags for MinidumpPPC64::context_flags
-+//! Based on minidump_cpu_ppc64.h from breakpad
-+enum MinidumpContextPPC64Flags : uint32_t {
-+  //! \brief Identifies the context as PPC64.
-+  kMinidumpContextPPC64 = 0x01000000,
-+
-+  //! \brief Indicates the validity of general purpose registers.
-+  //!
-+  //! Registers `r0`-`r31`, `nip`, `msr`, `lr`, etc. are valid.
-+  kMinidumpContextPPC64Base = kMinidumpContextPPC64 | 0x00000001,
-+
-+  //! \brief Indicates the validity of floating point registers.
-+  //!
-+  //! Registers `fp0`-`fp31`, `fpscr` are valid.
-+  kMinidumpContextPPC64Floating = kMinidumpContextPPC64 | 0x00000008,
-+
-+  //! \brief Indicates the validity of Altivec/VMX registers.
-+  //!
-+  //! Registers `v0`-`v31`, `vscr`, `vrsave`.
-+  kMinidumpContextPPC64Vector = kMinidumpContextPPC64 | 0x00000020,
-+
-+  //! \brief Indicates the validity of all registers
-+  kMinidumpContextPPC64All = kMinidumpContextPPC64Base     |
-+                             kMinidumpContextPPC64Floating |
-+                             kMinidumpContextPPC64Vector
-+};
-+
-+//! \brief A PPC64 CPU context carried in a minidump file.
-+//! Based on minidump_cpu_ppc64.h from breakpad.
-+struct MinidumpContextPPC64 {
-+  uint64_t context_flags;
-+
-+  //! \brief General purpose registers.
-+  uint64_t nip;
-+  uint64_t msr;
-+  uint64_t regs[32];
-+  uint64_t ccr;
-+  uint64_t xer;
-+  uint64_t lnk;
-+  uint64_t ctr;
-+
-+  //! \brief Floating point registers.
-+  double fpregs[32];
-+
-+  //! \brief FPU status register.
-+  double fpscr;
-+
-+  //! \brief Altivec/VMX vector registers.
-+  struct {
-+      //! \brief Vector registers are 128bits.
-+      uint128_struct save_vr[32];
-+      uint128_struct save_vscr;
-+
-+      //! \brief Padding included for breakpad compatibiltiy.
-+      uint32_t save_pad5[4];
-+
-+      //! \brief VRSAVE register.
-+      uint32_t save_vrsave;
-+
-+      //! \brief Padding included for breakpad compatibiltiy.
-+      uint32_t save_pad6[7];
-+  } vregs;
-+};
-+
- }  // namespace crashpad
- 
- #endif  // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_H_
-diff --git a/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc b/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
-index d7e53a4932..d89eb9e013 100644
---- a/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
-+++ b/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
-@@ -101,6 +101,13 @@ MinidumpContextWriter::CreateFromSnapshot(const CPUContext* context_snapshot) {
-       break;
-     }
- 
-+    case kCPUArchitecturePPC64: {
-+      context = std::make_unique<MinidumpContextPPC64Writer>();
-+      reinterpret_cast<MinidumpContextPPC64Writer*>(context.get())
-+          ->InitalizeFromSnapshot(context_snapshot->ppc64);
-+      break;
-+    }
-+
-     default: {
-       LOG(ERROR) << "unknown context architecture "
-                  << context_snapshot->architecture;
-@@ -453,4 +460,47 @@ size_t MinidumpContextMIPS64Writer::ContextSize() const {
-   return sizeof(context_);
- }
- 
-+MinidumpContextPPC64Writer::MinidumpContextPPC64Writer()
-+  : MinidumpContextWriter(), context_() {
-+    context_.context_flags = kMinidumpContextPPC64;
-+}
-+
-+MinidumpContextPPC64Writer::~MinidumpContextPPC64Writer() = default;
-+
-+void MinidumpContextPPC64Writer::InitalizeFromSnapshot(
-+    const CPUContextPPC64* context_snapshot) {
-+  DCHECK_EQ(state(), kStateMutable);
-+  DCHECK_EQ(context_.context_flags, kMinidumpContextPPC64);
-+
-+  context_.context_flags = kMinidumpContextPPC64All;
-+
-+  memcpy(context_.regs, context_snapshot->regs, sizeof(context_.regs));
-+  context_.nip = context_snapshot->nip;
-+  context_.msr = context_snapshot->msr;
-+  context_.ccr = context_snapshot->ccr;
-+  context_.xer = context_snapshot->xer;
-+  context_.lnk = context_snapshot->lnk;
-+  context_.ctr = context_snapshot->ctr;
-+
-+  memcpy(context_.fpregs, context_snapshot->fpregs, sizeof(context_.fpregs));
-+  context_.fpscr = context_snapshot->fpscr;
-+
-+  memcpy(context_.vregs.save_vr, context_snapshot->vregs.save_vr,
-+         sizeof(context_.vregs.save_vr));
-+  memcpy(&context_.vregs.save_vscr, &context_snapshot->vregs.save_vscr,
-+         sizeof(context_.vregs.save_vscr));
-+  context_.vregs.save_vrsave = context_snapshot->vregs.save_vrsave;
-+}
-+
-+bool MinidumpContextPPC64Writer::WriteObject(
-+    FileWriterInterface* file_writer) {
-+  DCHECK_EQ(state(), kStateWritable);
-+  return file_writer->Write(&context_, sizeof(context_));
-+}
-+
-+size_t MinidumpContextPPC64Writer::ContextSize() const {
-+  DCHECK_GE(state(), kStateFrozen);
-+  return sizeof(context_);
-+}
-+
- }  // namespace crashpad
-diff --git a/third_party/crashpad/crashpad/minidump/minidump_context_writer.h b/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
-index d4ab936ee7..1d22fc59c9 100644
---- a/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
-+++ b/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
-@@ -315,6 +315,45 @@ class MinidumpContextMIPS64Writer final : public MinidumpContextWriter {
-   DISALLOW_COPY_AND_ASSIGN(MinidumpContextMIPS64Writer);
- };
- 
-+class MinidumpContextPPC64Writer final : public MinidumpContextWriter {
-+ public:
-+  MinidumpContextPPC64Writer();
-+  ~MinidumpContextPPC64Writer() override;
-+
-+  //! \brief Initalizes the MinidumpContextPPC64 based on \a context_snapshot.
-+  //!
-+  //! \param[in] context_snapshot The context snapshot to use as source data.
-+  //!
-+  //! \note Valid in #kStateMutable. No mutation of context() may be done before
-+  //!     calling this method, and it is not normally necessary to alter
-+  //!     context() after calling this method.
-+  void InitalizeFromSnapshot(const CPUContextPPC64* context_snapshot);
-+
-+  //! \brief Returns a pointer to the context structure that this object will
-+  //!     write.
-+  //!
-+  //! \attention This returns a non-`const` pointer to this object’s private
-+  //!     data so that a caller can populate the context structure directly.
-+  //!     This is done because providing setter interfaces to each field in the
-+  //!     context structure would be unwieldy and cumbersome. Care must be taken
-+  //!     to populate the context structure correctly. The context structure
-+  //!     must only be modified while this object is in the #kStateMutable
-+  //!     state.
-+  MinidumpContextPPC64* context() { return &context_; }
-+
-+ protected:
-+  // MinidumpWritable:
-+  bool WriteObject(FileWriterInterface* file_writer) override;
-+
-+  // MinidumpContextWriter:
-+  size_t ContextSize() const override;
-+
-+ private:
-+  MinidumpContextPPC64 context_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(MinidumpContextPPC64Writer);
-+};
-+
- }  // namespace crashpad
- 
- #endif  // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_WRITER_H_
-diff --git a/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc b/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
-index 3216a906ba..a9fcbe9d8e 100644
---- a/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
-+++ b/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc
-@@ -213,6 +213,21 @@ TEST(MinidumpContextWriter, MIPS64_FromSnapshot) {
-       context, ExpectMinidumpContextMIPS64, kSeed);
- }
- 
-+TEST(MinidumpContextWriter, PPC64_Zeros) {
-+  EmptyContextTest<MinidumpContextPPC64Writer, MinidumpContextPPC64>(
-+    ExpectMinidumpContextPPC64);
-+}
-+
-+TEST(MinidumpContextWriter, PPC64_FromSnapshot) {
-+  constexpr uint32_t kSeed = 64;
-+  CPUContextPPC64 context_ppc64;
-+  CPUContext context;
-+  context.ppc64 = &context_ppc64;
-+  InitializeCPUContextPPC64(&context, kSeed);
-+  FromSnapshotTest<MinidumpContextPPC64Writer, MinidumpContextPPC64>(
-+      context, ExpectMinidumpContextPPC64, kSeed);
-+}
-+
- }  // namespace
- }  // namespace test
- }  // namespace crashpad
-diff --git a/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc b/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
-index a13407605f..95dc925240 100644
---- a/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
-+++ b/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
-@@ -126,6 +126,8 @@ std::string MinidumpMiscInfoDebugBuildString() {
-   static constexpr char kCPU[] = "mips";
- #elif defined(ARCH_CPU_MIPS64EL)
-   static constexpr char kCPU[] = "mips64";
-+#elif defined(ARCH_CPU_PPC64)
-+  static constexpr char kCPU[] = "ppc64";
- #else
- #error define kCPU for this CPU
- #endif
-diff --git a/third_party/crashpad/crashpad/snapshot/capture_memory.cc b/third_party/crashpad/crashpad/snapshot/capture_memory.cc
-index a51626ccdc..61e0b20a17 100644
---- a/third_party/crashpad/crashpad/snapshot/capture_memory.cc
-+++ b/third_party/crashpad/crashpad/snapshot/capture_memory.cc
-@@ -111,6 +111,11 @@ void CaptureMemory::PointedToByContext(const CPUContext& context,
-   for (size_t i = 0; i < base::size(context.mipsel->regs); ++i) {
-     MaybeCaptureMemoryAround(delegate, context.mipsel->regs[i]);
-   }
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+  MaybeCaptureMemoryAround(delegate, context.ppc64->nip);
-+  for (size_t i = 0; i < base::size(context.ppc64->regs); ++i) {
-+    MaybeCaptureMemoryAround(delegate, context.ppc64->regs[i]);
-+  }
- #else
- #error Port.
- #endif
-diff --git a/third_party/crashpad/crashpad/snapshot/cpu_architecture.h b/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
-index 811a720958..f4f83981df 100644
---- a/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
-+++ b/third_party/crashpad/crashpad/snapshot/cpu_architecture.h
-@@ -43,7 +43,10 @@ enum CPUArchitecture {
-   kCPUArchitectureMIPSEL,
- 
-   //! \brief 64-bit MIPSEL.
--  kCPUArchitectureMIPS64EL
-+  kCPUArchitectureMIPS64EL,
-+
-+  //! \brief 64-bit PPC64.
-+  kCPUArchitecturePPC64
- };
- 
- }  // namespace crashpad
-diff --git a/third_party/crashpad/crashpad/snapshot/cpu_context.cc b/third_party/crashpad/crashpad/snapshot/cpu_context.cc
-index 6fb8d7e719..b01f7cad11 100644
---- a/third_party/crashpad/crashpad/snapshot/cpu_context.cc
-+++ b/third_party/crashpad/crashpad/snapshot/cpu_context.cc
-@@ -169,6 +169,8 @@ uint64_t CPUContext::InstructionPointer() const {
-       return arm->pc;
-     case kCPUArchitectureARM64:
-       return arm64->pc;
-+    case kCPUArchitecturePPC64:
-+      return ppc64->nip;
-     default:
-       NOTREACHED();
-       return ~0ull;
-@@ -185,6 +187,8 @@ uint64_t CPUContext::StackPointer() const {
-       return arm->sp;
-     case kCPUArchitectureARM64:
-       return arm64->sp;
-+    case kCPUArchitecturePPC64:
-+      return ppc64->regs[1];
-     default:
-       NOTREACHED();
-       return ~0ull;
-@@ -196,6 +200,7 @@ bool CPUContext::Is64Bit() const {
-     case kCPUArchitectureX86_64:
-     case kCPUArchitectureARM64:
-     case kCPUArchitectureMIPS64EL:
-+    case kCPUArchitecturePPC64:
-       return true;
-     case kCPUArchitectureX86:
-     case kCPUArchitectureARM:
-diff --git a/third_party/crashpad/crashpad/snapshot/cpu_context.h b/third_party/crashpad/crashpad/snapshot/cpu_context.h
-index fb23c4679f..eebede63c6 100644
---- a/third_party/crashpad/crashpad/snapshot/cpu_context.h
-+++ b/third_party/crashpad/crashpad/snapshot/cpu_context.h
-@@ -352,6 +352,24 @@ struct CPUContextMIPS64 {
-   uint64_t fir;
- };
- 
-+//! \brief A context structure carrying PPC64 CPU state.
-+struct CPUContextPPC64 {
-+  uint64_t nip;
-+  uint64_t msr;
-+  uint64_t regs[32];
-+  uint64_t ccr;
-+  uint64_t xer;
-+  uint64_t lnk;
-+  uint64_t ctr;
-+  double fpregs[32];
-+  double fpscr;
-+  struct {
-+    uint128_struct save_vr[32];
-+    uint128_struct save_vscr;
-+    uint32_t save_vrsave;
-+  } vregs;
-+};
-+
- //! \brief A context structure capable of carrying the context of any supported
- //!     CPU architecture.
- struct CPUContext {
-@@ -382,6 +400,7 @@ struct CPUContext {
-     CPUContextARM64* arm64;
-     CPUContextMIPS* mipsel;
-     CPUContextMIPS64* mips64;
-+    CPUContextPPC64* ppc64;
-   };
- };
- 
-diff --git a/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h b/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
-index 9f46a48977..aa677c4eb9 100644
---- a/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
-+++ b/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h
-@@ -15,6 +15,7 @@
- #ifndef CRASHPAD_SNAPSHOT_LINUX_CPU_CONTEXT_LINUX_H_
- #define CRASHPAD_SNAPSHOT_LINUX_CPU_CONTEXT_LINUX_H_
- 
-+#include <cstring>
- #include "build/build_config.h"
- #include "snapshot/cpu_context.h"
- #include "snapshot/linux/signal_context.h"
-@@ -174,6 +175,78 @@ void InitializeCPUContextMIPS(
- 
- #endif  // ARCH_CPU_MIPS_FAMILY || DOXYGEN
- 
-+#if defined(ARCH_CPU_PPC64_FAMILY) || DOXYGEN
-+
-+//! \brief Initalizes a CPUContextPPC64 structure from native context
-+//!     structures on Linux.
-+//!
-+//! \param[in] thread_context The native thread context.
-+//! \param[in] float_context The native float context.
-+//! \param[in] vector_context The native vector context.
-+//! \param[out] context The CPUContextPPC64 structure to initalize.
-+template <typename Traits>
-+void InitializeCPUContextPPC64(
-+    const ThreadContext::t64_t& thread_context,
-+    const FloatContext::f64_t& float_context,
-+    const VectorContext::v64_t& vector_context,
-+    typename Traits::CPUContext* context) {
-+
-+  memcpy(context->regs, thread_context.gpr, sizeof(context->regs));
-+  context->nip = thread_context.nip;
-+  context->msr = thread_context.msr;
-+  context->ccr = thread_context.ccr;
-+  context->xer = thread_context.xer;
-+  context->lnk = thread_context.lnk;
-+  context->ctr = thread_context.ctr;
-+
-+  memcpy(context->fpregs, float_context.fpregs, sizeof(context->fpregs));
-+  context->fpscr = float_context.fpscr;
-+
-+  for (uint8_t i = 0; i < 32; i++) {
-+    context->vregs.save_vr[i] = {
-+      (((uint64_t)vector_context.vrregs[i][0]) << 32) |
-+        vector_context.vrregs[i][1],
-+      (((uint64_t)vector_context.vrregs[i][2]) << 32) |
-+        vector_context.vrregs[i][3]
-+    };
-+  }
-+  context->vregs.save_vrsave = vector_context.vrsave;
-+  context->vregs.save_vscr = {0, (uint64_t)vector_context.vscr.vscr_word};
-+}
-+
-+template <typename Traits>
-+void InitializeCPUContextPPC64(
-+    const SignalThreadContext64 &thread_context,
-+    const SignalFloatContext64 &float_context,
-+    const SignalVectorContext64 &vector_context,
-+    typename Traits::CPUContext* context) {
-+
-+  memcpy(context->regs, thread_context.regs, sizeof(context->regs));
-+  context->nip = thread_context.nip;
-+  context->msr = thread_context.msr;
-+  context->ccr = thread_context.ccr;
-+  context->xer = thread_context.xer;
-+  context->lnk = thread_context.lnk;
-+  context->ctr = thread_context.ctr;
-+
-+  memcpy(context->fpregs, float_context.regs, sizeof(context->fpregs));
-+  context->fpscr = float_context.fpscr;
-+
-+  for (uint8_t i = 0; i < 32; i++) {
-+    context->vregs.save_vr[i] = {
-+      (((uint64_t)vector_context.vrregs[i][0]) << 32) |
-+        vector_context.vrregs[i][1],
-+      (((uint64_t)vector_context.vrregs[i][2]) << 32) |
-+        vector_context.vrregs[i][3]
-+    };
-+  }
-+  context->vregs.save_vrsave = vector_context.vrsave;
-+  context->vregs.save_vscr = {0, (uint64_t)vector_context.vscr.vscr_word};
-+}
-+
-+
-+#endif
-+
- }  // namespace internal
- }  // namespace crashpad
- 
-diff --git a/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc b/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
-index be22c90313..c5df23d1b4 100644
---- a/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
-+++ b/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc
-@@ -159,9 +159,11 @@ void TestAgainstTarget(PtraceConnection* connection) {
-           const bool is_vdso_mapping =
-               device == 0 && inode == 0 && mapping_name == "[vdso]";
-           static constexpr char kPrefix[] = "linux-vdso.so.";
-+          static constexpr char kPrefix64[] = "linux-vdso64.so.";
-           return is_vdso_mapping ==
-                  (module_name.empty() ||
--                  module_name.compare(0, strlen(kPrefix), kPrefix) == 0);
-+                  module_name.compare(0, strlen(kPrefix), kPrefix) == 0 ||
-+                  module_name.compare(0, strlen(kPrefix64), kPrefix64) == 0);
-         },
-         module_mapping->name,
-         module_mapping->device,
-diff --git a/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc b/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
-index cd40b3b12d..6bcf23b6ff 100644
---- a/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
-+++ b/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc
-@@ -323,6 +323,69 @@ bool ExceptionSnapshotLinux::ReadContext<ContextTraits64>(
-       reader, context_address, context_.mips64);
- }
- 
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+
-+template <typename Traits>
-+static bool ReadContext(ProcessReaderLinux* reader,
-+                        LinuxVMAddress context_address,
-+                        typename Traits::CPUContext* dest_context) {
-+  const ProcessMemory* memory = reader->Memory();
-+
-+  LinuxVMAddress gp_regs_address = context_address +
-+                                   offsetof(UContext, mcontext) +
-+                                   offsetof(typename Traits::MContext, gp_regs);
-+
-+  typename Traits::SignalThreadContext thread_context;
-+  if (!memory->Read(gp_regs_address, sizeof(thread_context), &thread_context)) {
-+    LOG(ERROR) << "Couldn't read gp_regs!";
-+    return false;
-+  }
-+
-+  LinuxVMAddress fp_regs_address = context_address +
-+                                   offsetof(UContext, mcontext) +
-+                                   offsetof(typename Traits::MContext, fp_regs);
-+
-+  typename Traits::SignalFloatContext fp_context;
-+  if (!memory->Read(fp_regs_address, sizeof(fp_context), &fp_context)) {
-+    LOG(ERROR) << "Couldn't read fp_regs!";
-+    return false;
-+  }
-+
-+  LinuxVMAddress v_regs_ptr_address = context_address +
-+                                  offsetof(UContext, mcontext) +
-+                                  offsetof(typename Traits::MContext, vmx_reserve) + 8;
-+
-+  typename Traits::SignalVectorContext v_context;
-+  if (!memory->Read(v_regs_ptr_address, sizeof(v_context), &v_context)) {
-+    LOG(ERROR) << "Couldn't read v_regs!";
-+    return false;
-+  }
-+
-+  InitializeCPUContextPPC64<ContextTraits64>(thread_context, fp_context,
-+                            v_context, dest_context);
-+
-+  return true;
-+}
-+
-+template<>
-+bool ExceptionSnapshotLinux::ReadContext<ContextTraits64>(
-+    ProcessReaderLinux* reader,
-+    LinuxVMAddress context_address) {
-+  context_.architecture = kCPUArchitecturePPC64;
-+  context_.ppc64 = &context_union_.ppc64;
-+
-+  return internal::ReadContext<ContextTraits64>(
-+      reader, context_address, context_.ppc64);
-+}
-+
-+template<>
-+bool ExceptionSnapshotLinux::ReadContext<ContextTraits32>(
-+    ProcessReaderLinux* reader,
-+    LinuxVMAddress context_address) {
-+  // PPC64 is 64-bit
-+  return false;
-+}
-+
- #endif  // ARCH_CPU_X86_FAMILY
- 
- bool ExceptionSnapshotLinux::Initialize(ProcessReaderLinux* process_reader,
-diff --git a/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h b/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
-index ea0cd21066..e42df520ff 100644
---- a/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
-+++ b/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h
-@@ -84,6 +84,8 @@ class ExceptionSnapshotLinux final : public ExceptionSnapshot {
- #elif defined(ARCH_CPU_MIPS_FAMILY)
-     CPUContextMIPS mipsel;
-     CPUContextMIPS64 mips64;
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+    CPUContextPPC64 ppc64;
- #endif
-   } context_union_;
-   CPUContext context_;
-diff --git a/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc b/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
-index e4ff1ab79f..25534dd087 100644
---- a/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
-+++ b/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc
-@@ -296,7 +296,28 @@ void ExpectContext(const CPUContext& actual, const NativeCPUContext& expected) {
-             0);
- #undef CPU_ARCH_NAME
- }
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+using NativeCPUContext = ucontext_t;
-+
-+void InitializeContext(NativeCPUContext* context) {
-+  for (size_t reg = 0; reg < 32; ++reg) {
-+    context->uc_mcontext.gp_regs[reg] = reg;
-+  }
-+
-+  memset(&context->uc_mcontext.fp_regs, 44,
-+      sizeof(context->uc_mcontext.fp_regs));
-+}
- 
-+void ExpectContext(const CPUContext& actual, const NativeCPUContext& expected) {
-+  EXPECT_EQ(actual.architecture, kCPUArchitecturePPC64);
-+
-+  for (size_t reg = 0; reg < 32; ++reg) {
-+    EXPECT_EQ(actual.ppc64->regs[reg], expected.uc_mcontext.gp_regs[reg]);
-+  }
-+
-+  EXPECT_EQ(memcmp(actual.ppc64->fpregs, expected.uc_mcontext.fp_regs,
-+            sizeof(actual.ppc64->fpregs)), 0);
-+}
- #else
- #error Port.
- #endif
-diff --git a/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc b/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
-index b96abfe74f..df12ca5669 100644
---- a/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
-+++ b/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc
-@@ -108,6 +108,8 @@ void ProcessReaderLinux::Thread::InitializeStack(ProcessReaderLinux* reader) {
- #elif defined(ARCH_CPU_MIPS_FAMILY)
-   stack_pointer = reader->Is64Bit() ? thread_info.thread_context.t64.regs[29]
-                                     : thread_info.thread_context.t32.regs[29];
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+  stack_pointer = thread_info.thread_context.t64.gpr[1];
- #else
- #error Port.
- #endif
-diff --git a/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux_test.cc b/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux_test.cc
-index 5b5723616f..049c32858c 100644
---- a/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux_test.cc
-+++ b/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux_test.cc
-@@ -612,6 +612,8 @@ bool WriteTestModule(const base::FilePath& module_path) {
-   module.ehdr.e_machine = EM_AARCH64;
- #elif defined(ARCH_CPU_MIPSEL) || defined(ARCH_CPU_MIPS64EL)
-   module.ehdr.e_machine = EM_MIPS;
-+#elif defined(ARCH_CPU_PPC64)
-+  module.ehdr.e_machine = EM_PPC64;
- #endif
- 
-   module.ehdr.e_version = EV_CURRENT;
-diff --git a/third_party/crashpad/crashpad/snapshot/linux/signal_context.h b/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
-index 110024680b..a1f2da2591 100644
---- a/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
-+++ b/third_party/crashpad/crashpad/snapshot/linux/signal_context.h
-@@ -422,6 +422,89 @@ static_assert(offsetof(UContext<ContextTraits64>, mcontext.fpregs) ==
-               "context offset mismatch");
- #endif
- 
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+
-+struct SignalThreadContext64 {
-+  uint64_t regs[32];
-+  uint64_t nip;
-+  uint64_t msr;
-+  uint64_t orig_r3;
-+  uint64_t ctr;
-+  uint64_t lnk;
-+  uint64_t xer;
-+  uint64_t ccr;
-+  uint64_t softe;
-+  uint64_t trap;
-+  uint64_t dar;
-+  uint64_t dsisr;
-+  uint64_t result;
-+  uint64_t dscr;
-+  uint64_t fpr0[3];
-+};
-+
-+struct SignalFloatContext64 {
-+  double regs[32];
-+  double fpscr;
-+};
-+
-+struct SignalVectorContext64 {
-+  int32_t vrregs[32][4];
-+  struct {
-+    int32_t __pad[3];
-+    int32_t vscr_word;
-+  } vscr;
-+  int32_t vrsave;
-+  int32_t __pad[3];
-+} __attribute__((__aligned__(16)));
-+
-+
-+#pragma pack(pop)
-+struct MContext64 {
-+  uint64_t reserved[4];
-+  int32_t signal;
-+  int32_t __pad0;
-+  uint64_t handler;
-+  uint64_t oldmask;
-+  uint64_t pt_regs_ptr;
-+  SignalThreadContext64 gp_regs;
-+  SignalFloatContext64  fp_regs;
-+  SignalVectorContext64 *v_regs;
-+  int64_t vmx_reserve[69];
-+};
-+
-+struct ContextTraits64 : public Traits64 {
-+  using MContext = MContext64;
-+  using SignalThreadContext = SignalThreadContext64;
-+  using SignalFloatContext = SignalFloatContext64;
-+  using SignalVectorContext = SignalVectorContext64;
-+  using CPUContext = CPUContextPPC64;
-+};
-+
-+struct ContextTraits32 : public Traits32 {};
-+
-+struct UContext {
-+  uint64_t flags;
-+  uint64_t link;
-+  SignalStack<ContextTraits64> stack;
-+  Sigset<ContextTraits64> sigmask;
-+  MContext64 mcontext;
-+};
-+#pragma pack(push, 1)
-+
-+static_assert(sizeof(UContext) == sizeof(ucontext_t),
-+              "ucontext_t size mismatch");
-+static_assert(sizeof(MContext64) == sizeof(mcontext_t),
-+              "mcontext_t size mismatch");
-+static_assert(sizeof(SignalThreadContext64) == sizeof(gregset_t),
-+              "gregset_t size mismatch");
-+static_assert(sizeof(SignalFloatContext64) == sizeof(fpregset_t),
-+              "fpregset_t size mismatch");
-+static_assert(sizeof(SignalVectorContext64) == sizeof(vrregset_t),
-+              "vrregset_t size mismatch");
-+static_assert(offsetof(UContext, mcontext) ==
-+              offsetof(ucontext_t, uc_mcontext), "mcontext offset mismatch");
-+static_assert(offsetof(MContext64, gp_regs) ==
-+              offsetof(mcontext_t, gp_regs), "gp_regs offset mismatch");
- #else
- #error Port.
- #endif  // ARCH_CPU_X86_FAMILY
-diff --git a/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc b/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
-index 8564d3d455..b690ecd48f 100644
---- a/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
-+++ b/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc
-@@ -203,6 +203,8 @@ CPUArchitecture SystemSnapshotLinux::GetCPUArchitecture() const {
- #elif defined(ARCH_CPU_MIPS_FAMILY)
-   return process_reader_->Is64Bit() ? kCPUArchitectureMIPS64EL
-                                     : kCPUArchitectureMIPSEL;
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+  return kCPUArchitecturePPC64;
- #else
- #error port to your architecture
- #endif
-@@ -218,6 +220,9 @@ uint32_t SystemSnapshotLinux::CPURevision() const {
- #elif defined(ARCH_CPU_MIPS_FAMILY)
-   // Not implementable on MIPS
-   return 0;
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+  // Not yet implemented on PPC64
-+  return 0;
- #else
- #error port to your architecture
- #endif
-@@ -238,6 +243,9 @@ std::string SystemSnapshotLinux::CPUVendor() const {
- #elif defined(ARCH_CPU_MIPS_FAMILY)
-   // Not implementable on MIPS
-   return std::string();
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+  // Not yet implemented on PPC64
-+  return std::string();
- #else
- #error port to your architecture
- #endif
-@@ -371,6 +379,9 @@ bool SystemSnapshotLinux::NXEnabled() const {
- #elif defined(ARCH_CPU_MIPS_FAMILY)
-   // Not implementable on MIPS
-   return false;
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+  // Not yet implemented on PPC64
-+  return false;
- #else
- #error Port.
- #endif  // ARCH_CPU_X86_FAMILY
-diff --git a/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc b/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
-index e3e2bebddb..8ef43752eb 100644
---- a/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
-+++ b/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc
-@@ -186,6 +186,14 @@ bool ThreadSnapshotLinux::Initialize(ProcessReaderLinux* process_reader,
-         thread.thread_info.float_context.f32,
-         context_.mipsel);
-   }
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+  context_.architecture = kCPUArchitecturePPC64;
-+  context_.ppc64 = &context_union_.ppc64;
-+  InitializeCPUContextPPC64<ContextTraits64>(
-+      thread.thread_info.thread_context.t64,
-+      thread.thread_info.float_context.f64,
-+      thread.thread_info.vector_context.v64,
-+      context_.ppc64);
- #else
- #error Port.
- #endif
-diff --git a/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h b/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
-index 44cc6f6d97..d4136461e2 100644
---- a/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
-+++ b/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h
-@@ -68,6 +68,8 @@ class ThreadSnapshotLinux final : public ThreadSnapshot {
- #elif defined(ARCH_CPU_MIPS_FAMILY)
-     CPUContextMIPS mipsel;
-     CPUContextMIPS64 mips64;
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+    CPUContextPPC64 ppc64;
- #else
- #error Port.
- #endif  // ARCH_CPU_X86_FAMILY
-diff --git a/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc b/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
-index d3d5ebdfb9..3fd730cb52 100644
---- a/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
-+++ b/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc
-@@ -56,6 +56,11 @@ bool AuxiliaryVector::Read(PtraceConnection* connection) {
-     if (type == AT_IGNORE) {
-       continue;
-     }
-+#if defined(ARCH_CPU_PPC64_FAMILY)
-+    if (type == AT_IGNOREPPC) {
-+      continue;
-+    }
-+#endif
-     if (!MapInsertOrReplace(&values_, type, value, nullptr)) {
-       LOG(ERROR) << "duplicate auxv entry";
-       return false;
-diff --git a/third_party/crashpad/crashpad/util/linux/ptrace_broker.cc b/third_party/crashpad/crashpad/util/linux/ptrace_broker.cc
-index 155a1e0c6f..5e50ceb5f8 100644
---- a/third_party/crashpad/crashpad/util/linux/ptrace_broker.cc
-+++ b/third_party/crashpad/crashpad/util/linux/ptrace_broker.cc
-@@ -94,8 +94,8 @@ int PtraceBroker::Run() {
- }
- 
- bool PtraceBroker::AllocateAttachments() {
--  constexpr size_t page_size = 4096;
--  constexpr size_t alloc_size =
-+  static size_t page_size = getpagesize();
-+  size_t alloc_size =
-       (sizeof(ScopedPtraceAttach) + page_size - 1) & ~(page_size - 1);
-   void* alloc = sbrk(alloc_size);
-   if (reinterpret_cast<intptr_t>(alloc) == -1) {
-diff --git a/third_party/crashpad/crashpad/util/linux/ptracer.cc b/third_party/crashpad/crashpad/util/linux/ptracer.cc
-index 557e0d3635..08ae434b80 100644
---- a/third_party/crashpad/crashpad/util/linux/ptracer.cc
-+++ b/third_party/crashpad/crashpad/util/linux/ptracer.cc
-@@ -398,6 +398,64 @@ bool GetThreadArea64(pid_t tid,
-   return true;
- }
- 
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+// PPC64 has had HAVE_ARCH_TRACEHOOK set since 2.6.27 (even before x86 had it).
-+// That means we can simply use PTRACE_GETREGESET.
-+
-+template <typename Destination>
-+bool GetRegisterSet(pid_t tid, int set, Destination* dest, bool can_log) {
-+  iovec iov;
-+  iov.iov_base = reinterpret_cast<void*>(dest);
-+  iov.iov_len = sizeof(*dest);
-+  if (ptrace(PTRACE_GETREGSET, tid, reinterpret_cast<void*>(set), &iov) != 0) {
-+    PLOG_IF(ERROR, can_log) << "ptrace";
-+    return false;
-+  }
-+  if (iov.iov_len != sizeof(*dest)) {
-+    LOG_IF(ERROR, can_log) << "Unexpected registers size";
-+    return false;
-+  }
-+  return true;
-+}
-+
-+bool GetVectorRegisters64(pid_t tid,
-+                          VectorContext* context,
-+                          bool can_log) {
-+  return GetRegisterSet(tid, NT_PPC_VMX, &context->v64, can_log);
-+}
-+
-+bool GetFloatingPointRegisters64(pid_t tid,
-+                                 FloatContext* context,
-+                                 bool can_log) {
-+  return GetRegisterSet(tid, NT_PRFPREG, &context->f64, can_log);
-+}
-+
-+bool GetThreadArea64(pid_t tid,
-+                     const ThreadContext& context,
-+                     LinuxVMAddress* address,
-+                     bool can_log) {
-+  // PPC64 doesn't have PTRACE_GET_THREAD_AREA since the thread pointer
-+  // is stored in GPR 13.
-+  ThreadContext::t64_t tc;
-+  if (!GetRegisterSet(tid, NT_PRSTATUS, &tc, can_log)) {
-+    LOG_IF(ERROR, can_log) << "Unable to get thread pointer!";
-+    return false;
-+  }
-+
-+  *address = tc.gpr[13];
-+
-+  return true;
-+}
-+
-+// Stubs for 32-bit functions not applicable on PPC64
-+bool GetFloatingPointRegisters32(pid_t tid,
-+                                 FloatContext* context,
-+                                 bool can_log) { return false; }
-+bool GetThreadArea32(pid_t tid,
-+                     const ThreadContext &context,
-+                     LinuxVMAddress *address,
-+                     bool can_log) { return false; }
-+
- #else
- #error Port.
- #endif  // ARCH_CPU_X86_FAMILY
-@@ -494,6 +552,9 @@ bool Ptracer::GetThreadInfo(pid_t tid, ThreadInfo* info) {
-   if (is_64_bit_) {
-     return GetGeneralPurposeRegisters64(tid, &info->thread_context, can_log_) &&
-            GetFloatingPointRegisters64(tid, &info->float_context, can_log_) &&
-+#if defined(ARCH_CPU_PPC64_FAMILY)
-+           GetVectorRegisters64(tid, &info->vector_context, can_log_) &&
-+#endif
-            GetThreadArea64(tid,
-                            info->thread_context,
-                            &info->thread_specific_data_address,
-diff --git a/third_party/crashpad/crashpad/util/linux/thread_info.h b/third_party/crashpad/crashpad/util/linux/thread_info.h
-index 5b55c24a76..dea0d1f39e 100644
---- a/third_party/crashpad/crashpad/util/linux/thread_info.h
-+++ b/third_party/crashpad/crashpad/util/linux/thread_info.h
-@@ -28,6 +28,10 @@
- #include <android/api-level.h>
- #endif
- 
-+#if defined(ARCH_CPU_PPC64_FAMILY)
-+#include <sys/ucontext.h>
-+#endif
-+
- namespace crashpad {
- 
- //! \brief The set of general purpose registers for an architecture family.
-@@ -79,6 +83,8 @@ union ThreadContext {
-     uint32_t cp0_status;
-     uint32_t cp0_cause;
-     uint32_t padding1_;
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+    // PPC64 is 64-bit
- #else
- #error Port.
- #endif  // ARCH_CPU_X86_FAMILY
-@@ -132,6 +138,21 @@ union ThreadContext {
-     uint64_t cp0_badvaddr;
-     uint64_t cp0_status;
-     uint64_t cp0_cause;
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+    // Reflects struct pt_regs in asm/ptrace.h.
-+    uint64_t gpr[32];
-+    uint64_t nip;
-+    uint64_t msr;
-+    uint64_t orig_gpr3;
-+    uint64_t ctr;
-+    uint64_t lnk;
-+    uint64_t xer;
-+    uint64_t ccr;
-+    uint64_t softe;
-+    uint64_t trap;
-+    uint64_t dar;
-+    uint64_t dsisr;
-+    uint64_t result;
- #else
- #error Port.
- #endif  // ARCH_CPU_X86_FAMILY
-@@ -143,6 +164,8 @@ union ThreadContext {
-   using NativeThreadContext = user_regs;
- #elif defined(ARCH_CPU_MIPS_FAMILY)
- // No appropriate NativeThreadsContext type available for MIPS
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+  using NativeThreadContext = struct pt_regs;
- #else
- #error Port.
- #endif  // ARCH_CPU_X86_FAMILY || ARCH_CPU_ARM64
-@@ -218,6 +241,9 @@ union FloatContext {
-     } fpregs[32];
-     uint32_t fpcsr;
-     uint32_t fpu_id;
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+    // Crashpad's PPC support is 64-bit only, so this
-+    // 32bit-only struct is declared as empty.
- #else
- #error Port.
- #endif  // ARCH_CPU_X86_FAMILY
-@@ -252,6 +278,10 @@ union FloatContext {
-     double fpregs[32];
-     uint32_t fpcsr;
-     uint32_t fpu_id;
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+    // Reflects fpregset_t in sys/ucontext.h
-+    double fpregs[32];
-+    double fpscr;
- #else
- #error Port.
- #endif  // ARCH_CPU_X86_FAMILY
-@@ -280,6 +310,8 @@ union FloatContext {
-   static_assert(sizeof(f64) == sizeof(user_fpsimd_struct), "Size mismatch");
- #elif defined(ARCH_CPU_MIPS_FAMILY)
- // No appropriate floating point context native type for available MIPS.
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+  static_assert(sizeof(f64) == sizeof(fpregset_t), "Size mismatch");
- #else
- #error Port.
- #endif  // ARCH_CPU_X86
-@@ -287,6 +319,26 @@ union FloatContext {
- static_assert(std::is_standard_layout<FloatContext>::value,
-               "Not standard layout");
- 
-+//! \brief The vector registers used for an architecture family
-+union VectorContext {
-+  struct v32_t {} v32;
-+#if defined(ARCH_CPU_PPC64_FAMILY)
-+  __attribute__((__aligned__(16))) // Vector context must be doubleword aligned.
-+#endif
-+  struct v64_t {
-+#if defined(ARCH_CPU_PPC64_FAMILY)
-+    // Reflects vrregset_t in sys/ucontext.h
-+    uint32_t vrregs[32][4];
-+    struct {
-+      uint32_t __pad[3];
-+      uint32_t vscr_word;
-+    } vscr;
-+    uint32_t vrsave;
-+    uint32_t __pad[3];
-+#endif
-+  } v64;
-+};
-+
- //! \brief A collection of `ptrace`-able information about a thread.
- struct ThreadInfo {
-   ThreadInfo();
-@@ -298,6 +350,9 @@ struct ThreadInfo {
-   //! \brief The floating point registers for the thread.
-   FloatContext float_context;
- 
-+  //! \brief (Optional) The vector registers used for the thread.
-+  VectorContext vector_context;
-+
-   //! \brief The thread-local storage address for the thread.
-   LinuxVMAddress thread_specific_data_address;
- };
-diff --git a/third_party/crashpad/crashpad/util/misc/capture_context.h b/third_party/crashpad/crashpad/util/misc/capture_context.h
-index a88a10336f..b0d6578bdd 100644
---- a/third_party/crashpad/crashpad/util/misc/capture_context.h
-+++ b/third_party/crashpad/crashpad/util/misc/capture_context.h
-@@ -70,6 +70,7 @@ using NativeCPUContext = ucontext_t;
- //!     macOS/Linux/Fuchsia | x86_64       | `%%rdi`
- //!     Linux               | ARM/ARM64    | `r0`/`x0`
- //!     Linux               | MIPS/MIPS64  | `$a0`
-+//!     Linux               | PPC64        | `r3`
- //!
- //!     Additionally, the value `LR` on ARM/ARM64 will be the return address of
- //!     this function.
-diff --git a/third_party/crashpad/crashpad/util/misc/capture_context_linux.S b/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
-index 52215ee5d0..b3e4a3ec7e 100644
---- a/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
-+++ b/third_party/crashpad/crashpad/util/misc/capture_context_linux.S
-@@ -32,7 +32,7 @@
-   .balign 4, 0x0
-   .type CAPTURECONTEXT_SYMBOL, %function
-   .type CAPTURECONTEXT_SYMBOL2, %function
--#elif defined(__mips__)
-+#elif defined(__mips__) || defined(__powerpc64__)
-   .balign 4, 0x0
- #endif
- 
-@@ -423,4 +423,214 @@ CAPTURECONTEXT_SYMBOL2:
-   jr $ra
- 
-   .set at
-+#elif defined(__powerpc64__)
-+  // Store r0-r31
-+  std 0, 0xe8(3)   // context->uc_mcontext.gp_regs[0]
-+  std 1, 0xf0(3)   // context->uc_mcontext.gp_regs[1]
-+  std 2, 0xf8(3)   // context->uc_mcontext.gp_regs[2]
-+  // note that r3's original value was lost
-+  std 3, 0x100(3)  // context->uc_mcontext.gp_regs[3]
-+  std 4, 0x108(3)  // context->uc_mcontext.gp_regs[4]
-+  std 5, 0x110(3)  // context->uc_mcontext.gp_regs[5]
-+  std 6, 0x118(3)  // context->uc_mcontext.gp_regs[6]
-+  std 7, 0x120(3)  // context->uc_mcontext.gp_regs[7]
-+  std 8, 0x128(3)  // context->uc_mcontext.gp_regs[8]
-+  std 9, 0x130(3)  // context->uc_mcontext.gp_regs[9]
-+  std 10, 0x138(3) // context->uc_mcontext.gp_regs[10]
-+  std 11, 0x140(3) // context->uc_mcontext.gp_regs[11]
-+  std 12, 0x148(3) // context->uc_mcontext.gp_regs[12]
-+  std 13, 0x150(3) // context->uc_mcontext.gp_regs[13]
-+  std 14, 0x158(3) // context->uc_mcontext.gp_regs[14]
-+  std 15, 0x160(3) // context->uc_mcontext.gp_regs[15]
-+  std 16, 0x168(3) // context->uc_mcontext.gp_regs[16]
-+  std 17, 0x170(3) // context->uc_mcontext.gp_regs[17]
-+  std 18, 0x178(3) // context->uc_mcontext.gp_regs[18]
-+  std 19, 0x180(3) // context->uc_mcontext.gp_regs[19]
-+  std 20, 0x188(3) // context->uc_mcontext.gp_regs[20]
-+  std 21, 0x190(3) // context->uc_mcontext.gp_regs[21]
-+  std 22, 0x198(3) // context->uc_mcontext.gp_regs[22]
-+  std 23, 0x1a0(3) // context->uc_mcontext.gp_regs[23]
-+  std 24, 0x1a8(3) // context->uc_mcontext.gp_regs[24]
-+  std 25, 0x1b0(3) // context->uc_mcontext.gp_regs[25]
-+  std 26, 0x1b8(3) // context->uc_mcontext.gp_regs[26]
-+  std 27, 0x1c0(3) // context->uc_mcontext.gp_regs[27]
-+  std 28, 0x1c8(3) // context->uc_mcontext.gp_regs[28]
-+  std 29, 0x1d0(3) // context->uc_mcontext.gp_regs[29]
-+  std 30, 0x1d8(3) // context->uc_mcontext.gp_regs[30]
-+  std 31, 0x1e0(3) // context->uc_mcontext.gp_regs[31]
-+
-+  // For NIP, we can use the value in the link register
-+  mflr 0
-+  std 0, 0x1e8(3) // context->uc_mcontext.gp_regs[PT_NIP]
-+
-+  // CTR
-+  mfctr 0
-+  std 0, 0x200(3) // context->uc_mcontext.gp_regs[PT_CTR]
-+
-+  // For LNK, we'll use the caller's LR save area (2 stack frames up).
-+  // r4 can be used as a scratch register since it has already been saved.
-+  ld 4, 0(1)
-+  ld 4, 16(4)
-+  std 4, 0x208(3) // context->uc_mcontext.gp_regs[PT_LNK]
-+
-+  // XER
-+  mfxer 0
-+  std 0, 0x210(3) // context->uc_mcontext.gp_regs[PT_XER]
-+
-+  // CCR
-+  mfcr 0
-+  std 0, 0x218(3) // context->uc_mcontext.gp_regs[PT_CCR]
-+
-+  // MSR, orig_r3, MQ, TRAP, DAR, DSISR, RESULT, DSCR,
-+  // not used or not relevant,  zero them out.
-+  li 4, 0
-+  std 4, 0x1f0(3) // context->uc_mcontext.gp_regs[PT_MSR]
-+  std 4, 0x1f8(3) // context->uc_mcontext.gp_regs[PT_ORIG_R3]
-+  std 4, 0x220(3) // context->uc_mcontext.gp_regs[PT_MQ]
-+  std 4, 0x228(3) // context->uc_mcontext.gp_regs[PT_TRAP]
-+  std 4, 0x230(3) // context->uc_mcontext.gp_regs[PT_DAR]
-+  std 4, 0x238(3) // context->uc_mcontext.gp_regs[PT_DSISR]
-+  std 4, 0x240(3) // context->uc_mcontext.gp_regs[PT_RESULT]
-+  std 4, 0x248(3) // context->uc_mcontext.gp_regs[PT_DSCR]
-+
-+  // Update context->uc_mcontext.regs to point to gp_regs
-+  addi 0, 3, 0xe8
-+  std 0, 0xe0(3)
-+
-+  // Save floating point registers 0-31
-+  stfd 0, 0x268(3)  // context->uc_mcontext.fp_regs[0]
-+  stfd 1, 0x270(3)  // context->uc_mcontext.fp_regs[1]
-+  stfd 2, 0x278(3)  // context->uc_mcontext.fp_regs[2]
-+  stfd 3, 0x280(3)  // context->uc_mcontext.fp_regs[3]
-+  stfd 4, 0x288(3)  // context->uc_mcontext.fp_regs[4]
-+  stfd 5, 0x290(3)  // context->uc_mcontext.fp_regs[5]
-+  stfd 6, 0x298(3)  // context->uc_mcontext.fp_regs[6]
-+  stfd 7, 0x2a0(3)  // context->uc_mcontext.fp_regs[7]
-+  stfd 8, 0x2a8(3)  // context->uc_mcontext.fp_regs[8]
-+  stfd 9, 0x2b0(3)  // context->uc_mcontext.fp_regs[9]
-+  stfd 10, 0x2b8(3) // context->uc_mcontext.fp_regs[10]
-+  stfd 11, 0x2c0(3) // context->uc_mcontext.fp_regs[11]
-+  stfd 12, 0x2c8(3) // context->uc_mcontext.fp_regs[12]
-+  stfd 13, 0x2d0(3) // context->uc_mcontext.fp_regs[13]
-+  stfd 14, 0x2d8(3) // context->uc_mcontext.fp_regs[14]
-+  stfd 15, 0x2e0(3) // context->uc_mcontext.fp_regs[15]
-+  stfd 16, 0x2e8(3) // context->uc_mcontext.fp_regs[16]
-+  stfd 17, 0x2f0(3) // context->uc_mcontext.fp_regs[17]
-+  stfd 18, 0x2f8(3) // context->uc_mcontext.fp_regs[18]
-+  stfd 19, 0x300(3) // context->uc_mcontext.fp_regs[19]
-+  stfd 20, 0x308(3) // context->uc_mcontext.fp_regs[20]
-+  stfd 21, 0x310(3) // context->uc_mcontext.fp_regs[21]
-+  stfd 22, 0x318(3) // context->uc_mcontext.fp_regs[22]
-+  stfd 23, 0x320(3) // context->uc_mcontext.fp_regs[23]
-+  stfd 24, 0x328(3) // context->uc_mcontext.fp_regs[24]
-+  stfd 25, 0x330(3) // context->uc_mcontext.fp_regs[25]
-+  stfd 26, 0x338(3) // context->uc_mcontext.fp_regs[26]
-+  stfd 27, 0x340(3) // context->uc_mcontext.fp_regs[27]
-+  stfd 28, 0x348(3) // context->uc_mcontext.fp_regs[28]
-+  stfd 29, 0x350(3) // context->uc_mcontext.fp_regs[29]
-+  stfd 30, 0x358(3) // context->uc_mcontext.fp_regs[30]
-+  stfd 31, 0x360(3) // context->uc_mcontext.fp_regs[31]
-+
-+  // FPSCR
-+  mffs 0
-+  stfd 0, 0x368(3) // context->uc_mcontext.fp_regs[32]
-+
-+  // Save VMX Vector registers
-+  // Update r4 to contain the base address of vmx_reserve
-+  addi 4, 3, 0x378
-+  // Ensure that it is quadword aligned
-+  andi. 5, 4, 0xF
-+  beq 1f // No alignment is necessary
-+  // Address is doubleword aligned and not quadword aligned, add 8
-+  addi 4, 4, 8
-+
-+1:
-+  // Store VMX registers 0-31
-+  // r4 will contain the base address
-+  // r5 will contain the index
-+  li 5, 0
-+  stvx 0, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 0]
-+  addi 5, 5, 16
-+  stvx 1, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 1]
-+  addi 5, 5, 16
-+  stvx 2, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 2]
-+  addi 5, 5, 16
-+  stvx 3, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 3]
-+  addi 5, 5, 16
-+  stvx 4, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 4]
-+  addi 5, 5, 16
-+  stvx 5, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 5]
-+  addi 5, 5, 16
-+  stvx 6, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 6]
-+  addi 5, 5, 16
-+  stvx 7, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 7]
-+  addi 5, 5, 16
-+  stvx 8, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 8]
-+  addi 5, 5, 16
-+  stvx 9, 4, 5   // context->uc_mcontext.vmx_reserve[(align) + 9]
-+  addi 5, 5, 16
-+  stvx 10, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 10]
-+  addi 5, 5, 16
-+  stvx 11, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 11]
-+  addi 5, 5, 16
-+  stvx 12, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 12]
-+  addi 5, 5, 16
-+  stvx 13, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 13]
-+  addi 5, 5, 16
-+  stvx 14, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 14]
-+  addi 5, 5, 16
-+  stvx 15, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 15]
-+  addi 5, 5, 16
-+  stvx 16, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 16]
-+  addi 5, 5, 16
-+  stvx 17, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 17]
-+  addi 5, 5, 16
-+  stvx 18, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 18]
-+  addi 5, 5, 16
-+  stvx 19, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 19]
-+  addi 5, 5, 16
-+  stvx 20, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 20]
-+  addi 5, 5, 16
-+  stvx 21, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 21]
-+  addi 5, 5, 16
-+  stvx 22, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 22]
-+  addi 5, 5, 16
-+  stvx 23, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 23]
-+  addi 5, 5, 16
-+  stvx 24, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 24]
-+  addi 5, 5, 16
-+  stvx 25, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 25]
-+  addi 5, 5, 16
-+  stvx 26, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 26]
-+  addi 5, 5, 16
-+  stvx 27, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 27]
-+  addi 5, 5, 16
-+  stvx 28, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 28]
-+  addi 5, 5, 16
-+  stvx 29, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 29]
-+  addi 5, 5, 16
-+  stvx 30, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 30]
-+  addi 5, 5, 16
-+  stvx 31, 4, 5  // context->uc_mcontext.vmx_reserve[(align) + 31]
-+  addi 5, 5, 16
-+
-+  // VSCR
-+  mfvscr 0
-+  stvx 0, 4, 5
-+  addi 5, 5, 16
-+
-+  // VRSAVE
-+  mfvrsave 0
-+  stwx 0, 4, 5
-+
-+  // Update context->uc_mcontext.v_regs to point to vmx_reserve + alignment.
-+  std 4, 0x370(3)
-+
-+  // Zero out all unused fields
-+  li 4, 0
-+  std 4, 0xc8(3) // context->uc_mcontext.signal
-+  std 4, 0xd0(3) // context->uc_mcontext.handler
-+  std 4, 0xd8(3) // context->uc_mcontext.oldmask
-+
-+  blr
- #endif  // __i386__
-diff --git a/third_party/crashpad/crashpad/util/misc/capture_context_test.cc b/third_party/crashpad/crashpad/util/misc/capture_context_test.cc
-index cf23c2deff..5f264bc923 100644
---- a/third_party/crashpad/crashpad/util/misc/capture_context_test.cc
-+++ b/third_party/crashpad/crashpad/util/misc/capture_context_test.cc
-@@ -57,7 +57,7 @@ void TestCaptureContext() {
-   uintptr_t pc = ProgramCounterFromContext(context_1);
- 
- #if !defined(ADDRESS_SANITIZER) && !defined(ARCH_CPU_MIPS_FAMILY) && \
--    !defined(MEMORY_SANITIZER)
-+    !defined(MEMORY_SANITIZER) && !defined(ARCH_CPU_PPC64_FAMILY)
-   // Sanitizers can cause enough code bloat that the “nearby” check would
-   // likely fail.
-   const uintptr_t kReferencePC =
-diff --git a/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc b/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
-index 9fc5db28c4..5f69f8dced 100644
---- a/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
-+++ b/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc
-@@ -36,6 +36,8 @@ void SanityCheckContext(const NativeCPUContext& context) {
-   EXPECT_EQ(context.uc_mcontext.regs[0], FromPointerCast<uintptr_t>(&context));
- #elif defined(ARCH_CPU_MIPS_FAMILY)
-   EXPECT_EQ(context.uc_mcontext.gregs[4], FromPointerCast<uintptr_t>(&context));
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+  EXPECT_EQ(context.uc_mcontext.gp_regs[3], FromPointerCast<uintptr_t>(&context));
- #endif
- }
- 
-@@ -50,6 +52,8 @@ uintptr_t ProgramCounterFromContext(const NativeCPUContext& context) {
-   return context.uc_mcontext.pc;
- #elif defined(ARCH_CPU_MIPS_FAMILY)
-   return context.uc_mcontext.pc;
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+  return context.uc_mcontext.gp_regs[PT_NIP];
- #endif
- }
- 
-@@ -64,6 +68,8 @@ uintptr_t StackPointerFromContext(const NativeCPUContext& context) {
-   return context.uc_mcontext.sp;
- #elif defined(ARCH_CPU_MIPS_FAMILY)
-   return context.uc_mcontext.gregs[29];
-+#elif defined(ARCH_CPU_PPC64_FAMILY)
-+  return context.uc_mcontext.gp_regs[1];
- #endif
- }
- 
-diff --git a/third_party/crashpad/crashpad/util/posix/signals_test.cc b/third_party/crashpad/crashpad/util/posix/signals_test.cc
-index 58bfa8f835..8fc37c464c 100644
---- a/third_party/crashpad/crashpad/util/posix/signals_test.cc
-+++ b/third_party/crashpad/crashpad/util/posix/signals_test.cc
-@@ -46,12 +46,12 @@ bool CanCauseSignal(int sig) {
-   return sig == SIGABRT ||
-          sig == SIGALRM ||
-          sig == SIGBUS ||
--#if !defined(ARCH_CPU_ARM64)
-+#if !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
-          sig == SIGFPE ||
--#endif  // !defined(ARCH_CPU_ARM64)
-+#endif  // !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
- #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
-          sig == SIGILL ||
--#endif  // defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL
-+#endif  // defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
-          sig == SIGPIPE ||
-          sig == SIGSEGV ||
- #if defined(OS_MACOSX)
-@@ -117,9 +117,11 @@ void CauseSignal(int sig) {
-       break;
-     }
- 
--#if !defined(ARCH_CPU_ARM64)
-+#if !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
-     // ARM64 has hardware integer division instructions that don’t generate a
-     // trap for divide-by-zero, so this doesn’t produce SIGFPE.
-+    //
-+    // PPC64 fixed-point division by zero also doesn't produce a SIGFPE.
-     case SIGFPE: {
-       // Optimization makes this tricky, so get zero from a system call likely
-       // to succeed, and try to do something with the result.
-@@ -137,7 +139,7 @@ void CauseSignal(int sig) {
-       fstat(quotient, &stat_buf);
-       break;
-     }
--#endif  // ARCH_CPU_ARM64
-+#endif  // !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64)
- 
- #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL)
-     case SIGILL: {
-diff --git a/third_party/dav1d/BUILD.gn b/third_party/dav1d/BUILD.gn
-index 788dc6cff9..5fd7e8fda0 100644
---- a/third_party/dav1d/BUILD.gn
-+++ b/third_party/dav1d/BUILD.gn
-@@ -182,6 +182,8 @@ static_library("dav1d_8bit") {
-     sources += arm_template_sources
-   } else if (current_cpu == "arm64") {
-     sources += arm_template_sources
-+  } else if (current_cpu == "ppc64") {
-+    sources += ppc64_template_sources
-   }
- 
-   cflags = dav1d_copts
-@@ -210,6 +212,8 @@ static_library("dav1d_10bit") {
-     sources += arm_template_sources
-   } else if (current_cpu == "arm64") {
-     sources += arm_template_sources
-+  } else if (current_cpu == "ppc64") {
-+    sources += ppc64_template_sources
-   }
- 
-   cflags = dav1d_copts
-@@ -256,6 +260,21 @@ if (current_cpu == "x86" || current_cpu == "x64") {
-       ":dav1d_config",
-     ]
- 
-+    cflags = dav1d_copts
-+  }
-+} else if (current_cpu == "ppc64") {
-+  static_library("dav1d_ppc") {
-+    sources = [
-+      "libdav1d/src/ppc/cpu.c",
-+      "libdav1d/src/ppc/cpu.h",
-+    ]
-+
-+    configs -= [ "//build/config/compiler:chromium_code" ]
-+    configs += [
-+      "//build/config/compiler:no_chromium_code",
-+      ":dav1d_config",
-+    ]
-+
-     cflags = dav1d_copts
-   }
- }
-@@ -285,5 +304,7 @@ static_library("dav1d") {
-     }
-   } else if (current_cpu == "arm" || current_cpu == "arm64") {
-     deps += [ ":dav1d_arm" ]
-+  } else if (current_cpu == "ppc64") {
-+    deps += [ ":dav1d_ppc" ]
-   }
- }
-diff --git a/third_party/dav1d/config/linux/ppc64/config.h b/third_party/dav1d/config/linux/ppc64/config.h
-new file mode 100644
-index 0000000000..f6ca57f7f0
---- /dev/null
-+++ b/third_party/dav1d/config/linux/ppc64/config.h
-@@ -0,0 +1,35 @@
-+/*
-+ * Autogenerated by the Meson build system.
-+ * Do not edit, your changes will be lost.
-+ */
-+
-+#pragma once
-+
-+#define ARCH_AARCH64 0
-+
-+#define ARCH_ARM 0
-+
-+#define ARCH_PPC64LE 1
-+
-+#define ARCH_X86 0
-+
-+#define ARCH_X86_32 0
-+
-+#define ARCH_X86_64 0
-+
-+#define CONFIG_16BPC 1
-+
-+#define CONFIG_8BPC 1
-+
-+#define CONFIG_LOG 1
-+
-+#define ENDIANNESS_BIG 0
-+
-+#define HAVE_ASM 1
-+
-+#define HAVE_GETAUXVAL 1
-+
-+#define HAVE_POSIX_MEMALIGN 1
-+
-+#define HAVE_UNISTD_H 1
-+
-diff --git a/third_party/dav1d/dav1d_generated.gni b/third_party/dav1d/dav1d_generated.gni
-index 458935cd8a..f0cbc4aede 100644
---- a/third_party/dav1d/dav1d_generated.gni
-+++ b/third_party/dav1d/dav1d_generated.gni
-@@ -70,6 +70,11 @@ arm_template_sources = [
-   "libdav1d/src/arm/mc_init_tmpl.c",
- ]
- 
-+ppc64_template_sources = [
-+  "libdav1d/src/ppc/cdef_init_tmpl.c",
-+  "libdav1d/src/ppc/looprestoration_init_tmpl.c",
-+]
-+
- template_sources = [
-   "libdav1d/src/cdef_apply_tmpl.c",
-   "libdav1d/src/cdef_tmpl.c",
-diff --git a/third_party/dav1d/generate_source.py b/third_party/dav1d/generate_source.py
-index 9ab5e00b83..ad3feffee4 100755
---- a/third_party/dav1d/generate_source.py
-+++ b/third_party/dav1d/generate_source.py
-@@ -50,7 +50,8 @@ def WriteGn(fd):
-   WriteArray(fd, "arm32_asm_sources", glob.glob("libdav1d/src/arm/32/*.S"))
-   WriteArray(fd, "arm64_asm_sources", glob.glob("libdav1d/src/arm/64/*.S"))
-   WriteArray(fd, "arm_template_sources", glob.glob("libdav1d/src/arm/*_tmpl.c"))
--
-+  WriteArray(fd, "ppc64_template_sources", glob.glob("libdav1d/src/ppc/*_tmpl.c"))
-+ 
-   template_sources = glob.glob("libdav1d/src/*_tmpl.c")
-   WriteArray(fd, "template_sources", template_sources)
- 
-diff --git a/third_party/dav1d/libdav1d/src/ppc/types.h b/third_party/dav1d/libdav1d/src/ppc/types.h
-index 0b4bd72f0e..a0caa5e710 100644
---- a/third_party/dav1d/libdav1d/src/ppc/types.h
-+++ b/third_party/dav1d/libdav1d/src/ppc/types.h
-@@ -51,4 +51,19 @@
- #define u16l_to_i32(v) ((i32x4) vec_mergel((u16x8) v, vec_splat_u16(0)))
- #define i16l_to_i32(v) ((i32x4) vec_unpackl((i16x8)v))
- 
-+#if defined(__clang__)
-+#undef vec_splats
-+#define vec_splats(N)                     \
-+    _Generic((N),                         \
-+        unsigned char:      ((u8x16)(N)), \
-+        signed char:        ((i8x16)(N)), \
-+        unsigned short:     ((u16x8)(N)), \
-+        signed short:       ((i16x8)(N)), \
-+        unsigned int:       ((u32x4)(N)), \
-+        signed int:         ((i32x4)(N)), \
-+        unsigned long long: ((u64x2)(N)), \
-+        signed long long:   ((i64x2)(N))  \
-+    )
-+#endif
-+
- #endif /* DAV1D_SRC_PPC_TYPES_H */
-diff --git a/third_party/libvpx/BUILD.gn b/third_party/libvpx/BUILD.gn
-index 31a26e5b44..84c15b61b8 100644
---- a/third_party/libvpx/BUILD.gn
-+++ b/third_party/libvpx/BUILD.gn
-@@ -38,6 +38,8 @@ if (current_cpu == "x86") {
- 
- if (is_nacl) {
-   platform_include_dir = "source/config/nacl"
-+} else if (current_cpu == "ppc64") {
-+  platform_include_dir = "source/config/linux/generic"
- } else {
-   # The mac configurations are currently a relic. They were useful when
-   # x86inc.asm did not work for MACH_O but now the build is identical to the
-@@ -336,6 +338,8 @@ static_library("libvpx") {
-     } else {
-       sources = libvpx_srcs_arm64
-     }
-+  } else if (current_cpu == "ppc64") {
-+    sources = libvpx_srcs_generic
-   }
- 
-   configs -= [ "//build/config/compiler:chromium_code" ]
-diff --git a/third_party/lss/linux_syscall_support.h b/third_party/lss/linux_syscall_support.h
-index d2baee9d24..9955ce446b 100644
---- a/third_party/lss/linux_syscall_support.h
-+++ b/third_party/lss/linux_syscall_support.h
-@@ -3922,7 +3922,7 @@ struct kernel_statfs {
-       LSS_REG(2, buf);
-       LSS_BODY(void*, mmap2, "0"(__r2));
-     }
--#else
-+#elif !defined(__powerpc64__) /* ppc64 doesn't have mmap2 */
-     #define __NR__mmap2 __NR_mmap2
-     LSS_INLINE _syscall6(void*, _mmap2,            void*, s,
-                          size_t,                   l, int,               p,
-@@ -4033,7 +4033,7 @@ struct kernel_statfs {
-   #if defined(__i386__) ||                                                    \
-       defined(__ARM_ARCH_3__) || defined(__ARM_EABI__) ||                     \
-      (defined(__mips__) && _MIPS_SIM == _MIPS_SIM_ABI32) ||                   \
--      defined(__PPC__) ||                                                     \
-+     (defined(__PPC__) && !defined(__powerpc64__)) ||                                                     \
-      (defined(__s390__) && !defined(__s390x__))
-     /* On these architectures, implement mmap() with mmap2(). */
-     LSS_INLINE void* LSS_NAME(mmap)(void *s, size_t l, int p, int f, int d,
-diff --git a/third_party/pffft/src/pffft.c b/third_party/pffft/src/pffft.c
-index bdac4d7849..51e0f2cacc 100644
---- a/third_party/pffft/src/pffft.c
-+++ b/third_party/pffft/src/pffft.c
-@@ -100,6 +100,7 @@
-    Altivec support macros 
- */
- #if !defined(PFFFT_SIMD_DISABLE) && (defined(__ppc__) || defined(__ppc64__))
-+#include <altivec.h>
- typedef vector float v4sf;
- #  define SIMD_SZ 4
- #  define VZERO() ((vector float) vec_splat_u8(0))
-diff --git a/third_party/skia/src/sksl/SkSLString.cpp b/third_party/skia/src/sksl/SkSLString.cpp
-index 88eb1c7d3b..4be33fa5bd 100644
---- a/third_party/skia/src/sksl/SkSLString.cpp
-+++ b/third_party/skia/src/sksl/SkSLString.cpp
-@@ -240,7 +240,12 @@ String to_string(double value) {
-     if (needsDotZero) {
-         buffer << ".0";
-     }
--    return String(buffer.str().c_str());
-+
-+    std::string ret(buffer.str());
-+    if (signbit(value) && ret[0] == '.') {
-+        ret[0] = '-';
-+    }
-+    return String(ret.c_str());
- }
- 
- SKSL_INT stoi(const String& s) {
-diff --git a/third_party/sqlite/src/amalgamation/sqlite3.c b/third_party/sqlite/src/amalgamation/sqlite3.c
-index b8e84c1b6a..9ba9cb6c14 100644
---- a/third_party/sqlite/src/amalgamation/sqlite3.c
-+++ b/third_party/sqlite/src/amalgamation/sqlite3.c
-@@ -14301,7 +14301,8 @@ typedef INT16_TYPE LogEst;
- # if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
-      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
-      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
--     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
-+     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) ||   \
-+     defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
- #   define SQLITE_BYTEORDER    1234
- # elif defined(sparc)     || defined(__ppc__) || \
-        defined(__ARMEB__) || defined(__AARCH64EB__)
-diff --git a/third_party/sqlite/src/amalgamation_dev/sqlite3.c b/third_party/sqlite/src/amalgamation_dev/sqlite3.c
-index 734ac355d2..e259911dfd 100644
---- a/third_party/sqlite/src/amalgamation_dev/sqlite3.c
-+++ b/third_party/sqlite/src/amalgamation_dev/sqlite3.c
-@@ -14314,7 +14314,8 @@ typedef INT16_TYPE LogEst;
- # if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
-      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
-      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
--     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
-+     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) ||   \
-+     defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
- #   define SQLITE_BYTEORDER    1234
- # elif defined(sparc)     || defined(__ppc__) || \
-        defined(__ARMEB__) || defined(__AARCH64EB__)
-diff --git a/third_party/sqlite/src/ext/rtree/rtree.c b/third_party/sqlite/src/ext/rtree/rtree.c
-index 1eef1a1b53..b53097b7f4 100644
---- a/third_party/sqlite/src/ext/rtree/rtree.c
-+++ b/third_party/sqlite/src/ext/rtree/rtree.c
-@@ -432,7 +432,7 @@ struct RtreeMatchArg {
- #if defined(i386)     || defined(__i386__)   || defined(_M_IX86) ||    \
-     defined(__x86_64) || defined(__x86_64__) || defined(_M_X64)  ||    \
-     defined(_M_AMD64) || defined(_M_ARM)     || defined(__x86)   ||    \
--    defined(__arm__)
-+    defined(__arm__) || defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
- # define SQLITE_BYTEORDER    1234
- #elif defined(sparc)    || defined(__ppc__)
- # define SQLITE_BYTEORDER    4321
-diff --git a/third_party/sqlite/src/src/sqliteInt.h b/third_party/sqlite/src/src/sqliteInt.h
-index 9ef2437b06..db5d3321ed 100644
---- a/third_party/sqlite/src/src/sqliteInt.h
-+++ b/third_party/sqlite/src/src/sqliteInt.h
-@@ -853,7 +853,8 @@ typedef INT16_TYPE LogEst;
- # if defined(i386)      || defined(__i386__)      || defined(_M_IX86) ||    \
-      defined(__x86_64)  || defined(__x86_64__)    || defined(_M_X64)  ||    \
-      defined(_M_AMD64)  || defined(_M_ARM)        || defined(__x86)   ||    \
--     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64)
-+     defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) || \
-+     defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
- #   define SQLITE_BYTEORDER    1234
- # elif defined(sparc)     || defined(__ppc__) || \
-        defined(__ARMEB__) || defined(__AARCH64EB__)
-diff --git a/third_party/webrtc/modules/desktop_capture/differ_block.cc b/third_party/webrtc/modules/desktop_capture/differ_block.cc
-index dd9ab457e0..c005d95990 100644
---- a/third_party/webrtc/modules/desktop_capture/differ_block.cc
-+++ b/third_party/webrtc/modules/desktop_capture/differ_block.cc
-@@ -30,11 +30,7 @@ bool VectorDifference(const uint8_t* image1, const uint8_t* image2) {
-   static bool (*diff_proc)(const uint8_t*, const uint8_t*) = nullptr;
- 
-   if (!diff_proc) {
--#if defined(WEBRTC_ARCH_ARM_FAMILY) || defined(WEBRTC_ARCH_MIPS_FAMILY)
--    // For ARM and MIPS processors, always use C version.
--    // TODO(hclam): Implement a NEON version.
--    diff_proc = &VectorDifference_C;
--#else
-+#if defined(WEBRTC_ARCH_X86_FAMILY)
-     bool have_sse2 = WebRtc_GetCPUInfo(kSSE2) != 0;
-     // For x86 processors, check if SSE2 is supported.
-     if (have_sse2 && kBlockSize == 32) {
-@@ -44,6 +40,10 @@ bool VectorDifference(const uint8_t* image1, const uint8_t* image2) {
-     } else {
-       diff_proc = &VectorDifference_C;
-     }
-+#else
-+    // For other processors, always use C version.
-+    // TODO(hclam): Implement a NEON version.
-+    diff_proc = &VectorDifference_C;
- #endif
-   }
- 
-diff --git a/third_party/webrtc/rtc_base/system/arch.h b/third_party/webrtc/rtc_base/system/arch.h
-index ed216e660f..25d36c071a 100644
---- a/third_party/webrtc/rtc_base/system/arch.h
-+++ b/third_party/webrtc/rtc_base/system/arch.h
-@@ -50,6 +50,18 @@
- #elif defined(__EMSCRIPTEN__)
- #define WEBRTC_ARCH_32_BITS
- #define WEBRTC_ARCH_LITTLE_ENDIAN
-+#elif defined(__PPC__)
-+#define WEBRTC_ARCH_PPC_FAMILY
-+#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-+#define WEBRTC_ARCH_LITTLE_ENDIAN
-+#else
-+#define WEBRTC_ARCH_BIG_ENDIAN
-+#endif
-+#if defined(__LP64__)
-+#define WEBRTC_ARCH_64_BITS
-+#else
-+#define WEBRTC_ARCH_32_BITS
-+#endif
- #else
- #error Please add support for your architecture in rtc_base/system/arch.h
- #endif
-diff --git a/ui/gl/BUILD.gn b/ui/gl/BUILD.gn
-index 8fac30ee40..9e0c536d1b 100644
---- a/ui/gl/BUILD.gn
-+++ b/ui/gl/BUILD.gn
-@@ -15,7 +15,8 @@ declare_args() {
-                         is_chromeos || is_fuchsia) &&
-                        (target_cpu == "x86" || target_cpu == "x64" ||
-                         target_cpu == "arm" || target_cpu == "arm64" ||
--                        target_cpu == "mipsel" || target_cpu == "mips64el")
-+                        target_cpu == "mipsel" || target_cpu == "mips64el" ||
-+                        target_cpu == "ppc64")
- 
-   # Whether service side logging (actual calls into the GL driver) is enabled
-   # or not.
-diff --git a/v8/BUILD.gn b/v8/BUILD.gn
-index b2dde3f9d7..7c28f900e1 100644
---- a/v8/BUILD.gn
-+++ b/v8/BUILD.gn
-@@ -673,6 +673,12 @@ config("toolchain") {
-     }
-     if (host_byteorder == "little") {
-       defines += [ "V8_TARGET_ARCH_PPC_LE" ]
-+        cflags += [
-+        # Enable usage of AltiVec, VSX, and other POWER8 and higher features
-+        "-mcpu=power8",
-+        "-maltivec",
-+        "-mvsx",
-+      ]
-     } else if (host_byteorder == "big") {
-       defines += [ "V8_TARGET_ARCH_PPC_BE" ]
-       if (current_os == "aix") {
-diff --git a/v8/test/BUILD.gn b/v8/test/BUILD.gn
-index f6d30537a8..287b270809 100644
---- a/v8/test/BUILD.gn
-+++ b/v8/test/BUILD.gn
-@@ -31,7 +31,7 @@ group("gn_all") {
-     deps += [
-       "cctest:cctest",
-       "cctest:generate-bytecode-expectations",
--      "unittests:unittests",
-+      #"unittests:unittests",
-     ]
-   }
- }
-@@ -73,7 +73,7 @@ group("v8_bot_default") {
-     "message:v8_message",
-     "mjsunit:v8_mjsunit",
-     "mkgrokdump:mkgrokdump",
--    "unittests:unittests",
-+    #"unittests:unittests",
-     "wasm-api-tests:wasm_api_tests",
-     "wasm-js:v8_wasm_js",
-     "wasm-spec-tests:v8_wasm_spec_tests",
-@@ -93,7 +93,7 @@ group("v8_default") {
-     "message:v8_message",
-     "mjsunit:v8_mjsunit",
-     "mkgrokdump:mkgrokdump",
--    "unittests:unittests",
-+    #"unittests:unittests",
-     "wasm-api-tests:wasm_api_tests",
-     "wasm-js:v8_wasm_js",
-     "wasm-spec-tests:v8_wasm_spec_tests",
--- 
-2.28.0
-
diff --git a/srcpkgs/electron9/files/patches/electron-Add-a-script-to-list-patch-targets.patch.patch b/srcpkgs/electron9/files/patches/electron-Add-a-script-to-list-patch-targets.patch.patch
deleted file mode 100644
index 916dba9dc3bc..000000000000
--- a/srcpkgs/electron9/files/patches/electron-Add-a-script-to-list-patch-targets.patch.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From ff4122f236b70c272c746d0c336cdbd588d78cd1 Mon Sep 17 00:00:00 2001
-From: Elvis Pranskevichus <elvis@magic.io>
-Date: Thu, 12 Dec 2019 16:12:18 -0500
-Subject: [PATCH] Add a script to list patch targets
-
----
- script/list_patch_targets.py | 23 +++++++++++++++++++++++
- 1 file changed, 23 insertions(+)
- create mode 100755 script/list_patch_targets.py
-
-diff --git a/script/list_patch_targets.py b/script/list_patch_targets.py
-new file mode 100755
-index 000000000..55173bac9
---- /dev/null
-+++ b/script/list_patch_targets.py
-@@ -0,0 +1,23 @@
-+#!/usr/bin/env python
-+
-+import argparse
-+import json
-+
-+
-+def parse_args():
-+  parser = argparse.ArgumentParser(description='Apply Electron patches')
-+  parser.add_argument('config', nargs='+',
-+                      type=argparse.FileType('r'),
-+                      help='patches\' config(s) in the JSON format')
-+  return parser.parse_args()
-+
-+
-+def main():
-+  configs = parse_args().config
-+  for config_json in configs:
-+    for patch_dir, repo in json.load(config_json).iteritems():
-+      print(repo)
-+
-+
-+if __name__ == '__main__':
-+  main()
--- 
-2.23.0
-
diff --git a/srcpkgs/electron9/files/patches/electron-Build-fixes.patch.patch b/srcpkgs/electron9/files/patches/electron-Build-fixes.patch.patch
deleted file mode 100644
index 298bfa9bcb2b..000000000000
--- a/srcpkgs/electron9/files/patches/electron-Build-fixes.patch.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/build/args/release.gn b/build/args/release.gn
-index e5017f6e1..59207b389 100644
---- a/build/args/release.gn
-+++ b/build/args/release.gn
-@@ -1,6 +1,4 @@
- import("all.gn")
--is_component_build = false
--is_official_build = true
- 
- # This may be guarded behind is_chrome_branded alongside
- # proprietary_codecs https://webrtc-review.googlesource.com/c/src/+/36321,
-@@ -8,9 +6,3 @@ is_official_build = true
- # The initialization of the decoder depends on whether ffmpeg has
- # been built with H.264 support.
- rtc_use_h264 = proprietary_codecs
--
--# By default, Electron builds ffmpeg with proprietary codecs enabled. In order
--# to facilitate users who don't want to ship proprietary codecs in ffmpeg, or
--# who have an LGPL requirement to ship ffmpeg as a dynamically linked library,
--# we build ffmpeg as a shared library.
--is_component_ffmpeg = true
-diff --git a/build/npm.gni b/build/npm.gni
-index a1987d095..fb33a14c3 100644
---- a/build/npm.gni
-+++ b/build/npm.gni
-@@ -35,7 +35,6 @@ template("npm_action") {
-     if (!defined(deps)) {
-       deps = []
-     }
--    deps += [ ":npm_pre_flight_" + target_name ]
- 
-     script = "//electron/build/npm-run.py"
-     args = [
-diff --git a/patches/node/fix_add_default_values_for_enable_lto_and_build_v8_with_gn_in.patch b/patches/node/fix_add_default_values_for_enable_lto_and_build_v8_with_gn_in.patch
-index 0dc9916be..7eaa46bf5 100644
---- a/patches/node/fix_add_default_values_for_enable_lto_and_build_v8_with_gn_in.patch
-+++ b/patches/node/fix_add_default_values_for_enable_lto_and_build_v8_with_gn_in.patch
-@@ -30,7 +30,7 @@
- +    # these values being accurate.
- +    'build_v8_with_gn': 'false',
- +    'enable_lto%': 'false',
--+
-++    'openssl_fips': '',
-      'conditions': [
-        ['target_arch=="arm64"', {
-          # Disabled pending https://github.com/nodejs/node/issues/23913.
-
diff --git a/srcpkgs/electron9/files/patches/electron-dont-assume-python-is-python2.patch b/srcpkgs/electron9/files/patches/electron-dont-assume-python-is-python2.patch
deleted file mode 100644
index fb134748025b..000000000000
--- a/srcpkgs/electron9/files/patches/electron-dont-assume-python-is-python2.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/build/zip.py.orig	2020-04-27 17:59:53.499281667 +0200
-+++ b/build/zip.py	2020-04-27 17:59:57.655839143 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- from __future__ import print_function
- import os
- import subprocess
-
---- a/build/npm-run.py.orig	2020-04-27 17:59:50.829351807 +0200
-+++ b/build/npm-run.py	2020-04-27 18:00:02.702373256 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- from __future__ import print_function
- import os
- import subprocess
diff --git a/srcpkgs/electron9/files/patches/electron-exclude-content-test-patches.patch b/srcpkgs/electron9/files/patches/electron-exclude-content-test-patches.patch
deleted file mode 100644
index 15735c757705..000000000000
--- a/srcpkgs/electron9/files/patches/electron-exclude-content-test-patches.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/script/apply_all_patches.py	2020-08-22 17:46:41.796707506 +0200
-+++ -	2020-08-22 17:47:05.887813512 +0200
-@@ -14,6 +14,7 @@
-   for patch_dir, repo in dirs.items():
-     git.import_patches(repo=repo, patch_data=patch_from_dir(patch_dir),
-       threeway=threeway is not None,
-+      exclude=['content/test/**', 'test/cctest/**'],
-       committer_name="Electron Scripts", committer_email="scripts@electron")
- 
- 
diff --git a/srcpkgs/electron9/files/sndio-files/audio_manager_openbsd.cc b/srcpkgs/electron9/files/sndio-files/audio_manager_openbsd.cc
deleted file mode 100644
index 2c7aa8efa66f..000000000000
--- a/srcpkgs/electron9/files/sndio-files/audio_manager_openbsd.cc
+++ /dev/null
@@ -1,148 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "base/metrics/histogram_macros.h"
-#include "base/memory/ptr_util.h"
-
-#include "media/audio/openbsd/audio_manager_openbsd.h"
-
-#include "media/audio/audio_device_description.h"
-#include "media/audio/audio_output_dispatcher.h"
-#include "media/audio/sndio/sndio_input.h"
-#include "media/audio/sndio/sndio_output.h"
-#include "media/base/limits.h"
-#include "media/base/media_switches.h"
-
-namespace media {
-
-// Maximum number of output streams that can be open simultaneously.
-static const int kMaxOutputStreams = 4;
-
-// Default sample rate for input and output streams.
-static const int kDefaultSampleRate = 48000;
-
-void AddDefaultDevice(AudioDeviceNames* device_names) {
-  DCHECK(device_names->empty());
-  device_names->push_front(AudioDeviceName::CreateDefault());
-}
-
-bool AudioManagerOpenBSD::HasAudioOutputDevices() {
-  return true;
-}
-
-bool AudioManagerOpenBSD::HasAudioInputDevices() {
-  return true;
-}
-
-void AudioManagerOpenBSD::GetAudioInputDeviceNames(
-    AudioDeviceNames* device_names) {
-  DCHECK(device_names->empty());
-  AddDefaultDevice(device_names);
-}
-
-void AudioManagerOpenBSD::GetAudioOutputDeviceNames(
-    AudioDeviceNames* device_names) {
-  AddDefaultDevice(device_names);
-}
-
-const char* AudioManagerOpenBSD::GetName() {
-  return "SNDIO";
-}
-
-AudioParameters AudioManagerOpenBSD::GetInputStreamParameters(
-    const std::string& device_id) {
-  static const int kDefaultInputBufferSize = 1024;
-
-  int user_buffer_size = GetUserBufferSize();
-  int buffer_size = user_buffer_size ?
-      user_buffer_size : kDefaultInputBufferSize;
-
-  return AudioParameters(
-      AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO,
-      kDefaultSampleRate, buffer_size);
-}
-
-AudioManagerOpenBSD::AudioManagerOpenBSD(std::unique_ptr<AudioThread> audio_thread,
-                                         AudioLogFactory* audio_log_factory)
-    : AudioManagerBase(std::move(audio_thread),
-                       audio_log_factory) {
-  DLOG(WARNING) << "AudioManagerOpenBSD";
-  SetMaxOutputStreamsAllowed(kMaxOutputStreams);
-}
-
-AudioManagerOpenBSD::~AudioManagerOpenBSD() {
-  Shutdown();
-}
-
-AudioOutputStream* AudioManagerOpenBSD::MakeLinearOutputStream(
-    const AudioParameters& params,
-    const LogCallback& log_callback) {
-  DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
-  return MakeOutputStream(params);
-}
-
-AudioOutputStream* AudioManagerOpenBSD::MakeLowLatencyOutputStream(
-    const AudioParameters& params,
-    const std::string& device_id,
-    const LogCallback& log_callback) {
-  DLOG_IF(ERROR, !device_id.empty()) << "Not implemented!";
-  DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
-  return MakeOutputStream(params);
-}
-
-AudioInputStream* AudioManagerOpenBSD::MakeLinearInputStream(
-    const AudioParameters& params,
-    const std::string& device_id,
-    const LogCallback& log_callback) {
-  DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
-  return MakeInputStream(params);
-}
-
-AudioInputStream* AudioManagerOpenBSD::MakeLowLatencyInputStream(
-    const AudioParameters& params,
-    const std::string& device_id,
-    const LogCallback& log_callback) {
-  DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
-  return MakeInputStream(params);
-}
-
-AudioParameters AudioManagerOpenBSD::GetPreferredOutputStreamParameters(
-    const std::string& output_device_id,
-    const AudioParameters& input_params) {
-  // TODO(tommi): Support |output_device_id|.
-  DLOG_IF(ERROR, !output_device_id.empty()) << "Not implemented!";
-  static const int kDefaultOutputBufferSize = 2048;
-
-  ChannelLayout channel_layout = CHANNEL_LAYOUT_STEREO;
-  int sample_rate = kDefaultSampleRate;
-  int buffer_size = kDefaultOutputBufferSize;
-  if (input_params.IsValid()) {
-    sample_rate = input_params.sample_rate();
-    channel_layout = input_params.channel_layout();
-    buffer_size = std::min(buffer_size, input_params.frames_per_buffer());
-  }
-
-  int user_buffer_size = GetUserBufferSize();
-  if (user_buffer_size)
-    buffer_size = user_buffer_size;
-
-  return AudioParameters(
-      AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout,
-      sample_rate, buffer_size);
-}
-
-AudioInputStream* AudioManagerOpenBSD::MakeInputStream(
-    const AudioParameters& params) {
-  DLOG(WARNING) << "MakeInputStream";
-  return new SndioAudioInputStream(this,
-             AudioDeviceDescription::kDefaultDeviceId, params);
-}
-
-AudioOutputStream* AudioManagerOpenBSD::MakeOutputStream(
-    const AudioParameters& params) {
-  DLOG(WARNING) << "MakeOutputStream";
-  return new SndioAudioOutputStream(params, this);
-}
-
-}  // namespace media
diff --git a/srcpkgs/electron9/files/sndio-files/audio_manager_openbsd.h b/srcpkgs/electron9/files/sndio-files/audio_manager_openbsd.h
deleted file mode 100644
index 8c99db966d65..000000000000
--- a/srcpkgs/electron9/files/sndio-files/audio_manager_openbsd.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MEDIA_AUDIO_OPENBSD_AUDIO_MANAGER_OPENBSD_H_
-#define MEDIA_AUDIO_OPENBSD_AUDIO_MANAGER_OPENBSD_H_
-
-#include <set>
-
-#include "base/compiler_specific.h"
-#include "base/macros.h"
-#include "base/memory/ref_counted.h"
-#include "base/threading/thread.h"
-#include "media/audio/audio_manager_base.h"
-
-namespace media {
-
-class MEDIA_EXPORT AudioManagerOpenBSD : public AudioManagerBase {
- public:
-  AudioManagerOpenBSD(std::unique_ptr<AudioThread> audio_thread,
-                   AudioLogFactory* audio_log_factory);
-  ~AudioManagerOpenBSD() override;
-
-  // Implementation of AudioManager.
-  bool HasAudioOutputDevices() override;
-  bool HasAudioInputDevices() override;
-  void GetAudioInputDeviceNames(AudioDeviceNames* device_names) override;
-  void GetAudioOutputDeviceNames(AudioDeviceNames* device_names) override;
-  AudioParameters GetInputStreamParameters(
-      const std::string& device_id) override;
-  const char* GetName() override;
-
-  // Implementation of AudioManagerBase.
-  AudioOutputStream* MakeLinearOutputStream(
-      const AudioParameters& params,
-      const LogCallback& log_callback) override;
-  AudioOutputStream* MakeLowLatencyOutputStream(
-      const AudioParameters& params,
-      const std::string& device_id,
-      const LogCallback& log_callback) override;
-  AudioInputStream* MakeLinearInputStream(
-      const AudioParameters& params,
-      const std::string& device_id,
-      const LogCallback& log_callback) override;
-  AudioInputStream* MakeLowLatencyInputStream(
-      const AudioParameters& params,
-      const std::string& device_id,
-      const LogCallback& log_callback) override;
-
- protected:
-  AudioParameters GetPreferredOutputStreamParameters(
-      const std::string& output_device_id,
-      const AudioParameters& input_params) override;
-
- private:
-  // Called by MakeLinearOutputStream and MakeLowLatencyOutputStream.
-  AudioOutputStream* MakeOutputStream(const AudioParameters& params);
-  AudioInputStream* MakeInputStream(const AudioParameters& params);
-
-  DISALLOW_COPY_AND_ASSIGN(AudioManagerOpenBSD);
-};
-
-}  // namespace media
-
-#endif  // MEDIA_AUDIO_OPENBSD_AUDIO_MANAGER_OPENBSD_H_
diff --git a/srcpkgs/electron9/files/sndio-files/sndio_input.cc b/srcpkgs/electron9/files/sndio-files/sndio_input.cc
deleted file mode 100644
index 6c7bc8b8025b..000000000000
--- a/srcpkgs/electron9/files/sndio-files/sndio_input.cc
+++ /dev/null
@@ -1,201 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "base/bind.h"
-#include "base/logging.h"
-#include "base/macros.h"
-#include "base/message_loop/message_loop.h"
-#include "media/base/audio_timestamp_helper.h"
-#include "media/audio/openbsd/audio_manager_openbsd.h"
-#include "media/audio/audio_manager.h"
-#include "media/audio/sndio/sndio_input.h"
-
-namespace media {
-
-static const SampleFormat kSampleFormat = kSampleFormatS16;
-
-void SndioAudioInputStream::OnMoveCallback(void *arg, int delta)
-{
-  SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);
-
-  self->hw_delay += delta;
-}
-
-void *SndioAudioInputStream::ThreadEntry(void *arg) {
-  SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);
-
-  self->ThreadLoop();
-  return NULL;
-}
-
-SndioAudioInputStream::SndioAudioInputStream(AudioManagerBase* manager,
-                                             const std::string& device_name,
-                                             const AudioParameters& params)
-    : manager(manager),
-      params(params),
-      audio_bus(AudioBus::Create(params)),
-      state(kClosed) {
-}
-
-SndioAudioInputStream::~SndioAudioInputStream() {
-  if (state != kClosed)
-    Close();
-}
-
-bool SndioAudioInputStream::Open() {
-  struct sio_par par;
-  int sig;
-
-  if (state != kClosed)
-    return false;
-
-  if (params.format() != AudioParameters::AUDIO_PCM_LINEAR &&
-      params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) {
-    LOG(WARNING) << "Unsupported audio format.";
-    return false;
-  }
-
-  sio_initpar(&par);
-  par.rate = params.sample_rate();
-  par.rchan = params.channels();
-  par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
-  par.bps = par.bits / 8;
-  par.sig = sig = par.bits != 8 ? 1 : 0;
-  par.le = SIO_LE_NATIVE;
-  par.appbufsz = params.frames_per_buffer();
-
-  hdl = sio_open(SIO_DEVANY, SIO_REC, 0);
-
-  if (hdl == NULL) {
-    LOG(ERROR) << "Couldn't open audio device.";
-    return false;
-  }
-
-  if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
-    LOG(ERROR) << "Couldn't set audio parameters.";
-    goto bad_close;
-  }
-
-  if (par.rate  != (unsigned int)params.sample_rate() ||
-      par.rchan != (unsigned int)params.channels() ||
-      par.bits  != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) ||
-      par.sig   != (unsigned int)sig ||
-      (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
-      (par.bits != par.bps * 8)) {
-    LOG(ERROR) << "Unsupported audio parameters.";
-    goto bad_close;
-  }
-  state = kStopped;
-  buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
-  sio_onmove(hdl, &OnMoveCallback, this);
-  return true;
-bad_close:
-  sio_close(hdl);
-  return false;
-}
-
-void SndioAudioInputStream::Start(AudioInputCallback* cb) {
-
-  StartAgc();
-
-  state = kRunning;
-  hw_delay = 0;
-  callback = cb;
-  sio_start(hdl);
-  if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) {
-    LOG(ERROR) << "Failed to create real-time thread for recording.";
-    sio_stop(hdl);
-    state = kStopped;
-  }
-}
-
-void SndioAudioInputStream::Stop() {
-
-  if (state == kStopped)
-    return;
-
-  state = kStopWait;
-  pthread_join(thread, NULL);
-  sio_stop(hdl);
-  state = kStopped;
-
-  StopAgc();
-}
-
-void SndioAudioInputStream::Close() {
-
-  if (state == kClosed)
-    return;
-
-  if (state == kRunning)
-    Stop();
-
-  state = kClosed;
-  delete [] buffer;
-  sio_close(hdl);
-
-  manager->ReleaseInputStream(this);
-}
-
-double SndioAudioInputStream::GetMaxVolume() {
-  // Not supported
-  return 0.0;
-}
-
-void SndioAudioInputStream::SetVolume(double volume) {
-  // Not supported. Do nothing.
-}
-
-double SndioAudioInputStream::GetVolume() {
-  // Not supported.
-  return 0.0;
-}
-
-bool SndioAudioInputStream::IsMuted() {
-  // Not supported.
-  return false;
-}
-
-void SndioAudioInputStream::SetOutputDeviceForAec(
-    const std::string& output_device_id) {
-  // Not supported.
-}
-
-void SndioAudioInputStream::ThreadLoop(void) {
-  size_t todo, n;
-  char *data;
-  unsigned int nframes;
-  double normalized_volume = 0.0;
-
-  nframes = audio_bus->frames();
-
-  while (state == kRunning && !sio_eof(hdl)) {
-
-    GetAgcVolume(&normalized_volume);
-
-    // read one block
-    todo = nframes * params.GetBytesPerFrame(kSampleFormat);
-    data = buffer;
-    while (todo > 0) {
-      n = sio_read(hdl, data, todo);
-      if (n == 0)
-        return;	// unrecoverable I/O error
-      todo -= n;
-      data += n;
-    }
-    hw_delay -= nframes;
-
-    // convert frames count to TimeDelta
-    const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
-      params.sample_rate());
-
-    // push into bus
-    audio_bus->FromInterleaved(buffer, nframes, SampleFormatToBytesPerChannel(kSampleFormat));
-
-    // invoke callback
-    callback->OnData(audio_bus.get(), base::TimeTicks::Now() - delay, 1.);
-  }
-}
-
-}  // namespace media
diff --git a/srcpkgs/electron9/files/sndio-files/sndio_input.h b/srcpkgs/electron9/files/sndio-files/sndio_input.h
deleted file mode 100644
index d868e0469db5..000000000000
--- a/srcpkgs/electron9/files/sndio-files/sndio_input.h
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
-#define MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
-
-#include <stdint.h>
-#include <string>
-#include <sndio.h>
-
-#include "base/compiler_specific.h"
-#include "base/macros.h"
-#include "base/memory/weak_ptr.h"
-#include "base/time/time.h"
-#include "media/audio/agc_audio_stream.h"
-#include "media/audio/audio_io.h"
-#include "media/audio/audio_device_description.h"
-#include "media/base/audio_parameters.h"
-
-namespace media {
-
-class AudioManagerBase;
-
-// Implementation of AudioOutputStream using sndio(7)
-class SndioAudioInputStream : public AgcAudioStream<AudioInputStream> {
- public:
-  // Pass this to the constructor if you want to attempt auto-selection
-  // of the audio recording device.
-  static const char kAutoSelectDevice[];
-
-  // Create a PCM Output stream for the SNDIO device identified by
-  // |device_name|. If unsure of what to use for |device_name|, use
-  // |kAutoSelectDevice|.
-  SndioAudioInputStream(AudioManagerBase* audio_manager,
-                     const std::string& device_name,
-                     const AudioParameters& params);
-
-  ~SndioAudioInputStream() override;
-
-  // Implementation of AudioInputStream.
-  bool Open() override;
-  void Start(AudioInputCallback* callback) override;
-  void Stop() override;
-  void Close() override;
-  double GetMaxVolume() override;
-  void SetVolume(double volume) override;
-  double GetVolume() override;
-  bool IsMuted() override;
-  void SetOutputDeviceForAec(const std::string& output_device_id) override;
-
- private:
-
-  enum StreamState {
-    kClosed,            // Not opened yet
-    kStopped,           // Device opened, but not started yet
-    kRunning,           // Started, device playing
-    kStopWait           // Stopping, waiting for the real-time thread to exit
-  };
-
-  // C-style call-backs
-  static void OnMoveCallback(void *arg, int delta);
-  static void* ThreadEntry(void *arg);
-
-  // Continuously moves data from the device to the consumer
-  void ThreadLoop();
-  // Our creator, the audio manager needs to be notified when we close.
-  AudioManagerBase* manager;
-  // Parameters of the source
-  AudioParameters params;
-  // We store data here for consumer
-  std::unique_ptr<AudioBus> audio_bus;
-  // Call-back that consumes recorded data
-  AudioInputCallback* callback;  // Valid during a recording session.
-  // Handle of the audio device
-  struct sio_hdl* hdl;
-  // Current state of the stream
-  enum StreamState state;
-  // High priority thread running ThreadLoop()
-  pthread_t thread;
-  // Number of frames buffered in the hardware
-  int hw_delay;
-  // Temporary buffer where data is stored sndio-compatible format
-  char* buffer;
-
-  DISALLOW_COPY_AND_ASSIGN(SndioAudioInputStream);
-};
-
-}  // namespace media
-
-#endif  // MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
diff --git a/srcpkgs/electron9/files/sndio-files/sndio_output.cc b/srcpkgs/electron9/files/sndio-files/sndio_output.cc
deleted file mode 100644
index a6719f9aac8d..000000000000
--- a/srcpkgs/electron9/files/sndio-files/sndio_output.cc
+++ /dev/null
@@ -1,183 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "base/logging.h"
-#include "base/time/time.h"
-#include "base/time/default_tick_clock.h"
-#include "media/audio/audio_manager_base.h"
-#include "media/base/audio_timestamp_helper.h"
-#include "media/audio/sndio/sndio_output.h"
-
-namespace media {
-
-static const SampleFormat kSampleFormat = kSampleFormatS16;
-
-void SndioAudioOutputStream::OnMoveCallback(void *arg, int delta) {
-  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
-
-  self->hw_delay -= delta;
-}
-
-void SndioAudioOutputStream::OnVolCallback(void *arg, unsigned int vol) {
-  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
-
-  self->vol = vol;
-}
-
-void *SndioAudioOutputStream::ThreadEntry(void *arg) {
-  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
-
-  self->ThreadLoop();
-  return NULL;
-}
-
-SndioAudioOutputStream::SndioAudioOutputStream(const AudioParameters& params,
-                                               AudioManagerBase* manager)
-    : manager(manager),
-      params(params),
-      audio_bus(AudioBus::Create(params)),
-      state(kClosed),
-      mutex(PTHREAD_MUTEX_INITIALIZER) {
-}
-
-SndioAudioOutputStream::~SndioAudioOutputStream() {
-  if (state != kClosed)
-    Close();
-}
-
-bool SndioAudioOutputStream::Open() {
-  struct sio_par par;
-  int sig;
-
-  if (params.format() != AudioParameters::AUDIO_PCM_LINEAR &&
-      params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) {
-    LOG(WARNING) << "Unsupported audio format.";
-    return false;
-  }
-  sio_initpar(&par);
-  par.rate = params.sample_rate();
-  par.pchan = params.channels();
-  par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
-  par.bps = par.bits / 8;
-  par.sig = sig = par.bits != 8 ? 1 : 0;
-  par.le = SIO_LE_NATIVE;
-  par.appbufsz = params.frames_per_buffer();
-
-  hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0);
-  if (hdl == NULL) {
-    LOG(ERROR) << "Couldn't open audio device.";
-    return false;
-  }
-  if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
-    LOG(ERROR) << "Couldn't set audio parameters.";
-    goto bad_close;
-  }
-  if (par.rate  != (unsigned int)params.sample_rate() ||
-      par.pchan != (unsigned int)params.channels() ||
-      par.bits  != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) ||
-      par.sig   != (unsigned int)sig ||
-      (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
-      (par.bits != par.bps * 8)) {
-    LOG(ERROR) << "Unsupported audio parameters.";
-    goto bad_close;
-  }
-  state = kStopped;
-  volpending = 0;
-  vol = 0;
-  buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
-  sio_onmove(hdl, &OnMoveCallback, this);
-  sio_onvol(hdl, &OnVolCallback, this);
-  return true;
- bad_close:
-  sio_close(hdl);
-  return false;
-}
-
-void SndioAudioOutputStream::Close() {
-  if (state == kClosed)
-    return;
-  if (state == kRunning)
-    Stop();
-  state = kClosed;
-  delete [] buffer;
-  sio_close(hdl);
-  manager->ReleaseOutputStream(this);  // Calls the destructor
-}
-
-void SndioAudioOutputStream::Start(AudioSourceCallback* callback) {
-  state = kRunning;
-  hw_delay = 0;
-  source = callback;
-  sio_start(hdl);
-  if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) {
-    LOG(ERROR) << "Failed to create real-time thread.";
-    sio_stop(hdl);
-    state = kStopped;
-  }
-}
-
-void SndioAudioOutputStream::Stop() {
-  if (state == kStopped)
-    return;
-  state = kStopWait;
-  pthread_join(thread, NULL);
-  sio_stop(hdl);
-  state = kStopped;
-}
-
-void SndioAudioOutputStream::SetVolume(double v) {
-  pthread_mutex_lock(&mutex);
-  vol = v * SIO_MAXVOL;
-  volpending = 1;
-  pthread_mutex_unlock(&mutex);
-}
-
-void SndioAudioOutputStream::GetVolume(double* v) {
-  pthread_mutex_lock(&mutex);
-  *v = vol * (1. / SIO_MAXVOL);
-  pthread_mutex_unlock(&mutex);
-}
-
-// This stream is always used with sub second buffer sizes, where it's
-// sufficient to simply always flush upon Start().
-void SndioAudioOutputStream::Flush() {}
-
-void SndioAudioOutputStream::ThreadLoop(void) {
-  int avail, count, result;
-
-  while (state == kRunning) {
-    // Update volume if needed
-    pthread_mutex_lock(&mutex);
-    if (volpending) {
-      volpending = 0;
-      sio_setvol(hdl, vol);
-    }
-    pthread_mutex_unlock(&mutex);
-
-    // Get data to play
-    const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
-	params.sample_rate());
-    count = source->OnMoreData(delay, base::TimeTicks::Now(), 0, audio_bus.get());
-    audio_bus->ToInterleaved(count, SampleFormatToBytesPerChannel(kSampleFormat), buffer);
-    if (count == 0) {
-      // We have to submit something to the device
-      count = audio_bus->frames();
-      memset(buffer, 0, count * params.GetBytesPerFrame(kSampleFormat));
-      LOG(WARNING) << "No data to play, running empty cycle.";
-    }
-
-    // Submit data to the device
-    avail = count * params.GetBytesPerFrame(kSampleFormat);
-    result = sio_write(hdl, buffer, avail);
-    if (result == 0) {
-      LOG(WARNING) << "Audio device disconnected.";
-      break;
-    }
-
-    // Update hardware pointer
-    hw_delay += count;
-  }
-}
-
-}  // namespace media
diff --git a/srcpkgs/electron9/files/sndio-files/sndio_output.h b/srcpkgs/electron9/files/sndio-files/sndio_output.h
deleted file mode 100644
index ead220ca96e7..000000000000
--- a/srcpkgs/electron9/files/sndio-files/sndio_output.h
+++ /dev/null
@@ -1,86 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
-#define MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
-
-#include <pthread.h>
-#include <sndio.h>
-
-#include "base/time/tick_clock.h"
-#include "base/time/time.h"
-#include "media/audio/audio_io.h"
-
-namespace media {
-
-class AudioManagerBase;
-
-// Implementation of AudioOutputStream using sndio(7)
-class SndioAudioOutputStream : public AudioOutputStream {
- public:
-  // The manager is creating this object
-  SndioAudioOutputStream(const AudioParameters& params,
-                         AudioManagerBase* manager);
-  virtual ~SndioAudioOutputStream();
-
-  // Implementation of AudioOutputStream.
-  bool Open() override;
-  void Close() override;
-  void Start(AudioSourceCallback* callback) override;
-  void Stop() override;
-  void SetVolume(double volume) override;
-  void GetVolume(double* volume) override;
-  void Flush() override;
-
-  friend void sndio_onmove(void *arg, int delta);
-  friend void sndio_onvol(void *arg, unsigned int vol);
-  friend void *sndio_threadstart(void *arg);
-
- private:
-  enum StreamState {
-    kClosed,            // Not opened yet
-    kStopped,           // Device opened, but not started yet
-    kRunning,           // Started, device playing
-    kStopWait           // Stopping, waiting for the real-time thread to exit
-  };
-
-  // C-style call-backs
-  static void OnMoveCallback(void *arg, int delta);
-  static void OnVolCallback(void *arg, unsigned int vol);
-  static void* ThreadEntry(void *arg);
-
-  // Continuously moves data from the producer to the device
-  void ThreadLoop(void);
-
-  // Our creator, the audio manager needs to be notified when we close.
-  AudioManagerBase* manager;
-  // Parameters of the source
-  AudioParameters params;
-  // Source stores data here
-  std::unique_ptr<AudioBus> audio_bus;
-  // Call-back that produces data to play
-  AudioSourceCallback* source;
-  // Handle of the audio device
-  struct sio_hdl* hdl;
-  // Current state of the stream
-  enum StreamState state;
-  // High priority thread running ThreadLoop()
-  pthread_t thread;
-  // Protects vol, volpending and hw_delay
-  pthread_mutex_t mutex;
-  // Current volume in the 0..SIO_MAXVOL range
-  int vol;
-  // Set to 1 if volumes must be refreshed in the realtime thread
-  int volpending;
-  // Number of frames buffered in the hardware
-  int hw_delay;
-  // Temporary buffer where data is stored sndio-compatible format
-  char* buffer;
-
-  DISALLOW_COPY_AND_ASSIGN(SndioAudioOutputStream);
-};
-
-}  // namespace media
-
-#endif  // MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
diff --git a/srcpkgs/electron9/files/sndio-patches/media_audio_linux_audio_manager_linux.cc.patch b/srcpkgs/electron9/files/sndio-patches/media_audio_linux_audio_manager_linux.cc.patch
deleted file mode 100644
index cf8e81b11d67..000000000000
--- a/srcpkgs/electron9/files/sndio-patches/media_audio_linux_audio_manager_linux.cc.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff --git a/chromium/media/audio/linux/audio_manager_linux.cc b/chromium/media/audio/linux/audio_manager_linux.cc
-index 5d703549372..9e60b40c749 100644
---- media/audio/linux/audio_manager_linux.cc
-+++ media/audio/linux/audio_manager_linux.cc
-@@ -20,6 +20,10 @@
- #include "media/audio/pulse/audio_manager_pulse.h"
- #include "media/audio/pulse/pulse_util.h"
- #endif
-+#if defined(USE_SNDIO)
-+#include <sndio.h>
-+#include "media/audio/openbsd/audio_manager_openbsd.h"
-+#endif
- 
- namespace media {
- 
-@@ -27,7 +31,8 @@ enum LinuxAudioIO {
-   kPulse,
-   kAlsa,
-   kCras,
--  kAudioIOMax = kCras  // Must always be equal to largest logged entry.
-+  kSndio,
-+  kAudioIOMax = kSndio  // Must always be equal to largest logged entry.
- };
- 
- std::unique_ptr<media::AudioManager> CreateAudioManager(
-@@ -41,6 +46,17 @@ std::unique_ptr<media::AudioManager> CreateAudioManager(
-   }
- #endif
- 
-+#if defined(USE_SNDIO)
-+  struct sio_hdl * hdl = NULL;
-+  if ((hdl=sio_open(SIO_DEVANY, SIO_PLAY, 1)) != NULL) {
-+    sio_close(hdl);
-+    UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kSndio, kAudioIOMax +1);
-+    return std::make_unique<AudioManagerOpenBSD>(std::move(audio_thread),
-+                                               audio_log_factory);
-+  }
-+  DVLOG(1) << "Sndio is not available on the OS";
-+#endif
-+
- #if defined(USE_PULSEAUDIO)
-   pa_threaded_mainloop* pa_mainloop = nullptr;
-   pa_context* pa_context = nullptr;
diff --git a/srcpkgs/electron9/files/sndio-patches/src_3rdparty_chromium_media_BUILD.gn.patch b/srcpkgs/electron9/files/sndio-patches/src_3rdparty_chromium_media_BUILD.gn.patch
deleted file mode 100644
index ec6040026688..000000000000
--- a/srcpkgs/electron9/files/sndio-patches/src_3rdparty_chromium_media_BUILD.gn.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- media/BUILD.gn	2020-03-24 10:16:30.000000000 +0100
-+++ -	2020-04-06 14:32:27.960817513 +0200
-@@ -65,6 +65,9 @@
-   if (use_cras) {
-     defines += [ "USE_CRAS" ]
-   }
-+  if (use_sndio) {
-+    defines += [ "USE_SNDIO" ]
-+  }
- }
- 
- # Internal grouping of the configs necessary to support sub-folders having their
diff --git a/srcpkgs/electron9/files/sndio-patches/src_3rdparty_chromium_media_audio_BUILD.gn.patch b/srcpkgs/electron9/files/sndio-patches/src_3rdparty_chromium_media_audio_BUILD.gn.patch
deleted file mode 100644
index c856de0bf2ec..000000000000
--- a/srcpkgs/electron9/files/sndio-patches/src_3rdparty_chromium_media_audio_BUILD.gn.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- media/audio/BUILD.gn	2020-03-24 10:16:30.000000000 +0100
-+++ -	2020-04-06 14:31:28.871450217 +0200
-@@ -232,9 +232,19 @@
-     deps += [ "//media/base/android:media_jni_headers" ]
-   }
- 
--  if (is_linux) {
-+  if (is_linux) {
-     sources += [ "linux/audio_manager_linux.cc" ]
-   }
-+  if (use_sndio) {
-+    libs += [ "sndio" ]
-+    sources += [
-+      "openbsd/audio_manager_openbsd.cc",
-+      "sndio/sndio_input.cc",
-+      "sndio/sndio_input.h",
-+      "sndio/sndio_output.cc",
-+      "sndio/sndio_output.h"
-+   ]
-+ }
- 
-   if (use_alsa) {
-     libs += [ "asound" ]
diff --git a/srcpkgs/electron9/files/sndio-patches/src_3rdparty_chromium_media_media__options.gni.patch b/srcpkgs/electron9/files/sndio-patches/src_3rdparty_chromium_media_media__options.gni.patch
deleted file mode 100644
index 14807d8e1d36..000000000000
--- a/srcpkgs/electron9/files/sndio-patches/src_3rdparty_chromium_media_media__options.gni.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- media/media_options.gni	2020-03-24 10:16:30.000000000 +0100
-+++ -	2020-04-06 14:29:22.958630783 +0200
-@@ -114,6 +114,9 @@
-   # Enables runtime selection of ALSA library for audio.
-   use_alsa = false
- 
-+  # Enables runtime selection of sndio library for audio.
-+  use_sndio = false
-+
-   # Alsa should be used on non-Android, non-Mac POSIX systems.
-   # Alsa should be used on desktop Chromecast and audio-only Chromecast builds.
-   if (is_posix && !is_android && !is_mac &&
diff --git a/srcpkgs/electron9/template b/srcpkgs/electron9/template
deleted file mode 100644
index 9d8ce3dd5e60..000000000000
--- a/srcpkgs/electron9/template
+++ /dev/null
@@ -1,354 +0,0 @@
-# Template file for 'electron9'
-pkgname=electron9
-version=9.4.1
-_nodever=12.14.1
-_chromiumver=83.0.4103.119
-revision=1
-archs="x86_64* i686* aarch64* ppc64le*"
-build_wrksrc="src"
-create_wrksrc=yes
-hostmakedepends="$(vopt_if clang clang) yasm python pkgconf perl gperf bison ninja nodejs hwids
- libwebp-devel freetype-devel harfbuzz-devel libpng-devel nss-devel which git libevent-devel
- pciutils-devel libatomic-devel ffmpeg-devel libxml2-devel libglib-devel yarn openjdk libxslt-devel
- opus-devel libXcursor-devel libXcomposite-devel libXtst-devel libXrandr-devel libXScrnSaver-devel
- alsa-lib-devel re2-devel snappy-devel mit-krb5-devel $(vopt_if pulseaudio pulseaudio-devel)
- $(vopt_if sndio sndio-devel)"
-makedepends="libpng-devel gtk+-devel gtk+3-devel nss-devel pciutils-devel
- libXi-devel libgcrypt-devel libgnome-keyring-devel cups-devel elfutils-devel
- libXcomposite-devel speech-dispatcher-devel libXrandr-devel mit-krb5-devel
- libXScrnSaver-devel alsa-lib-devel snappy-devel libdrm-devel
- libxml2-devel libxslt-devel $(vopt_if pulseaudio pulseaudio-devel) libexif-devel
- libXcursor-devel libflac-devel speex-devel libmtp-devel libwebp-devel
- libjpeg-turbo-devel libevent-devel json-c-devel harfbuzz-devel
- minizip-devel jsoncpp-devel zlib-devel libcap-devel libXdamage-devel
- re2-devel fontconfig-devel freetype-devel opus-devel libatomic-devel
- $(vopt_if sndio sndio-devel) ffmpeg-devel libva-devel libuv-devel c-ares-devel libnotify-devel"
-short_desc="Cross platform application development framework based on web technologies"
-maintainer="John <me@johnnynator.dev>"
-license="BSD-3-Clause"
-homepage="https://electronjs.org"
-distfiles="https://github.com/electron/electron/archive/v$version.tar.gz>electron-${version}.tar.gz
- https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$_chromiumver.tar.xz
- https://github.com/nodejs/node/archive/v$_nodever.tar.gz>node-$_nodever.tar.gz"
-checksum="953e34b156fc9cd49b8f39daf662b279930913eea7bf47265ce60b576dfc7a36
- 452cbc58895a46b2b87ba450a3f86897de92ad08ce28ffdbed6b3f12101d3788
- 01e4a960be3e26b87c55509ee1cb44a14946a4169d5cdec046dd05058d995b26"
-
-no_generic_pkgconfig_link=yes
-lib32disabled=yes
-nodebug=yes
-nopie=yes  # contains tools that are not PIE, enables PIE itself
-
-build_options="pulseaudio sndio clang"
-build_options_default="pulseaudio sndio clang"
-
-if [ "$build_option_clang" ]; then
-	nocross="No proper setup for using clang as cross compiler in void yet"
-elif [ "${XBPS_TARGET_MACHINE%%-musl}" = "aarch64" ]; then
-	broken="Falls apart at runtime when compiled with gcc"
-fi
-
-_buildtype=Release
-_is_debug=false
-
-CFLAGS="-Wno-unknown-warning-option -fPIC"
-CXXFLAGS="-Wno-unknown-warning-option -fPIC"
-
-_apply_patch() {
-	local args="$1" pname="$(basename $2)"
-
-	if [ ! -f ".${pname}_done" ]; then
-		msg_normal "$pkgver: patching: ${pname}.\n"
-		patch -N $args -i $2
-		touch .${pname}_done
-	fi
-}
-
-_get_chromium_arch() {
-	case "$1" in
-		x86_64*) echo x64 ;;
-		i686*) echo x86 ;;
-		arm*) echo arm ;;
-		aarch64*) echo arm64 ;;
-		ppc64*) echo ppc64 ;;
-		ppc*) echo ppc ;;
-		mipsel*) echo mipsel ;;
-		mips*) echo mips ;;
-		*) msg_error "$pkgver: cannot be compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
-	esac
-}
-
-post_extract() {
-	ln -s chromium-$_chromiumver src
-	mkdir -p src/third_party/
-	ln -s ../../node-$_nodever src/third_party/electron_node
-	ln -s ../electron-${version} src/electron
-
-}
-post_patch() {
-	cd $wrksrc
-	for x in $FILESDIR/patches/*; do
-		case "${x##*/}" in
-			electron*.patch)
-				cd src/electron
-				_apply_patch -p1 "$x"
-				cd "$wrksrc";;
-		esac
-	done
-
-	# Sigh, electron uses git am...
-	if [ ! -f ".electron_patches_done" ]; then
-	python2 src/electron/script/list_patch_targets.py src/electron/patches/config.json | while read -r repopath; do
-		cd "$wrksrc"/"$repopath"
-		git init -q
-		git config "gc.auto" 0
-		if [ "$repopath" != "src" ]; then
-			echo "/${repopath#src/}" >> "$wrksrc/$build_wrksrc/.gitignore"
-		fi
-		git add .
-		git -c 'user.name=Electron build' -c 'user.email=electron@ebuild' \
-			commit -q -m "." || true
-	done
-	cd $wrksrc
-	python2 src/electron/script/apply_all_patches.py src/electron/patches/config.json
-	touch .electron_patches_done
-	fi
-
-	for x in $FILESDIR/patches/*; do
-		case "${x##*/}" in
-			chromium*.patch)
-				cd src
-				_apply_patch -p1 "$x"
-				cd "$wrksrc";;
-		esac
-	done
-
-	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
-	for x in $FILESDIR/musl-patches/*; do
-		case "${x##*/}" in
-			chromium*.patch)
-				cd src
-				_apply_patch -p1 "$x"
-				cd "$wrksrc";;
-			electron*.patch)
-				cd src/electron
-				_apply_patch -p1 "$x"
-				cd "$wrksrc";;
-		esac
-	done
-	fi
-	if [ "$build_option_sndio" ]; then
-		mkdir -p ${wrksrc}/${build_wrksrc}/media/audio/{sndio,openbsd}
-		cp ${FILESDIR}/sndio-files/sndio_*put.* \
-			${wrksrc}/${build_wrksrc}/media/audio/sndio
-		cp ${FILESDIR}/sndio-files/audio_manager_openbsd.* \
-			${wrksrc}/${build_wrksrc}/media/audio/openbsd
-		for f in "${FILESDIR}"/sndio-patches/*.patch; do
-			cd src
-			_apply_patch -p0 "$f"
-			cd "$wrksrc"
-		done
-	fi
-}
-
-pre_configure() {
-	cd "$wrksrc/$build_wrksrc"
-
-	# https://groups.google.com/a/chromium.org/d/topic/chromium-packagers/9JX1N2nf4PU/discussion
-	touch chrome/test/data/webui/i18n_process_css_test.html
-	# Use the file at run time instead of effectively compiling it in
-	sed 's|//third_party/usb_ids/usb.ids|/usr/share/hwdata/usb.ids|g' \
-		-i services/device/public/cpp/usb/BUILD.gn
-
-	mkdir -p third_party/node/linux/node-linux-x64/bin
-	ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/
-
-	# reusable system library settings
-	local use_system="
-		ffmpeg
-		flac
-		fontconfig
-		freetype
-		harfbuzz-ng
-		libdrm
-		libevent
-		libjpeg
-		libpng
-		libwebp
-		libxml
-		libxslt
-		opus
-		re2
-		snappy
-		yasm
-		"
-	for _lib in $use_system libjpeg_turbo; do
-		msg_normal "Removing buildscripts for system provided $_lib\n"
-		find -type f -path "*third_party/$_lib/*" \
-			\! -path "*third_party/$_lib/chromium/*" \
-			\! -path "*third_party/$_lib/google/*" \
-			\! -path './base/third_party/icu/*' \
-			\! -path './third_party/pdfium/third_party/freetype/include/pstables.h' \
-			\! -path './third_party/harfbuzz-ng/utils/hb_scoped.h' \
-			\! -path './third_party/yasm/run_yasm.py' \
-			\! -regex '.*\.\(gn\|gni\|isolate\|py\)' \
-			-delete
-	done
-
-
-	msg_normal "Replacing gn files\n"
-	python2 build/linux/unbundle/replace_gn_files.py --system-libraries \
-		$use_system
-	third_party/libaddressinput/chromium/tools/update-strings.py
-}
-
-do_configure() {
-	local target_arch="$(_get_chromium_arch ${XBPS_TARGET_MACHINE})"
-	local host_arch="$(_get_chromium_arch ${XBPS_MACHINE})"
-	# the build system will set march for use, adding it to cflags will break builds
-	export CXXFLAGS=$( shopt -s extglob; echo ${CXXFLAGS/-march=*([^ ])} )
-	export CFLAGS=$( shopt -s extglob; echo ${CFLAGS/-march=*([^ ])} )
-	local conf=()
-	cd third_party/electron_node
-	if [ "$CROSS_BUILD" ]; then
-		conf_args=" --dest-cpu=${target_arch} --cross-compiling"
-	fi
-	./configure --prefix=/usr \
-		--shared-zlib \
-		--shared-libuv \
-		--shared-openssl \
-		--shared-cares \
-		--openssl-use-def-ca-store \
-		--without-npm \
-		--without-dtrace \
-		--without-bundled-v8 \
-		${conf_args}
-
-	cd "$wrksrc/$build_wrksrc"/electron
-	yarn install
-	cd "$wrksrc/$build_wrksrc"
-
-	if [ "$build_option_clang" ]; then
-		export CC=clang
-		export CXX=clang++
-		export HOST_CC=clang
-		export HOST_CXX=clang++
-	else
-		export CXXFLAGS="$CXXFLAGS -fpermissive"
-		export BUILD_CXXFLAGS="$BUILD_CXXFLAGS -fpermissive"
-		export BUILD_AR="$AR_host"
-		export BUILD_NM="$NM_host"
-	fi
-
-	# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
-	# Note: These are for Void Linux use ONLY.
-	conf+=(
-		'google_api_key="AIzaSyA9gWazKaHaNIPPg2hrMj6_ZSG8AFmq738"'
-		'google_default_client_id="126659149423-hoo6ickbk3p1u2qjsdsp0ddciurfvb4t.apps.googleusercontent.com"'
-		'google_default_client_secret="_ozIx2D-DKm_se_2NPwV4l5b"'
-	)
-
-	conf+=(
-		'blink_symbol_level=0'
-		'clang_use_chrome_plugins=false'
-		'closure_compile=true'
-		'custom_toolchain="//build/toolchain/linux/unbundle:default"'
-	)
-	if [ "$CROSS_BUILD" ]; then
-		conf+=(
-			'host_toolchain="//build/toolchain/linux/unbundle:host"'
-			'v8_snapshot_toolchain="//build/toolchain/linux/unbundle:host"'
-			"host_pkg_config=\"$PKG_CONFIG_FOR_BUILD\""
-			"pkg_config=\"$PKG_CONFIG\""
-		)
-	else
-		conf+=(
-			'host_toolchain="//build/toolchain/linux/unbundle:default"'
-			'v8_snapshot_toolchain="//build/toolchain/linux/unbundle:default"'
-		)
-	fi
-	if [ "$build_option_sndio" ]; then
-		conf+=(
-			'use_sndio=true'
-		)
-	fi
-	conf+=(
-		'enable_hangout_services_extension=true'
-		'enable_nacl_nonsfi=false'
-		'enable_nacl=false'
-		'enable_precompiled_headers=false'
-		'fatal_linker_warnings=false'
-		'ffmpeg_branding="Chrome"'
-		'fieldtrial_testing_like_official_build=true'
-		'gold_path="/usr/bin/ld.gold"'
-		'icu_use_data_file=true'
-		"is_clang=$(vopt_if clang true false)"
-		'is_component_build=false'
-		"is_debug=$_is_debug"
-		'is_desktop_linux=true'
-		'linux_use_bundled_binutils=false'
-		'proprietary_codecs=true'
-		'symbol_level=0'
-		'treat_warnings_as_errors=false'
-		'use_allocator_shim=false'
-		'use_allocator="none"'
-		'use_cups=true'
-		'use_custom_libcxx=false'
-		'use_gnome_keyring=false'
-		'use_gold=false'
-		'use_lld=false'
-		"use_pulseaudio=$(vopt_if pulseaudio 'true' 'false')"
-		'use_sysroot=false'
-		'use_system_harfbuzz=true'
-		"target_cpu=\"$target_arch\""
-		"host_cpu=\"$host_arch\""
-		'import("//electron/build/args/release.gn")'
-	)
-
-	msg_normal "Bootstrapping GN\n"
-	CC="${CC_FOR_BUILD:-$CC}" CXX="${CXX_FOR_BUILD:-$CXX}" LD="${LD_FOR_BUILD:-$LD}" \
-	CFLAGS="${CFLAGS_FOR_BUILD:-$CFLAGS}" CXXFLAGS="${CXXFLAGS_FOR_BUILD:-$CXXFLAGS}" \
-	LDFLAGS="${XBPS_LDFLAGS}" \
-		python2 tools/gn/bootstrap/bootstrap.py -s -v --skip-generate-buildfiles
-
-	msg_normal "Configuring build\n"
-	out/Release/gn gen out/$_buildtype --args="${conf[*]}"
-}
-
-do_build() {
-	export CXXFLAGS=$( shopt -s extglob; echo ${CXXFLAGS/-march=*([^ ])} )
-	export CFLAGS=$( shopt -s extglob; echo ${CFLAGS/-march=*([^ ])} )
-	if [ "$build_option_clang" ]; then
-		export CC=clang
-		export CXX=clang++
-		export HOST_CC=clang
-		export HOST_CXX=clang++
-	else
-		export BUILD_CXXFLAGS="$BUILD_CXXFLAGS -fpermissive"
-		export CXXFLAGS="$CXXFLAGS -fpermissive"
-		export BUILD_AR="$AR_host"
-		export BUILD_NM="$NM_host"
-	fi
-	msg_normal "Ninja turtles GO!\n"
-	ninja ${makejobs} -C out/$_buildtype electron third_party/electron_node:headers
-	# finish rest of the build
-	strip -s out/$_buildtype/electron
-	ninja ${makejobs} -C out/$_buildtype electron_dist_zip
-}
-
-do_install() {
-	vmkdir /usr/lib/$pkgname
-	vmkdir /usr/include/$pkgname
-	bsdtar -xf out/$_buildtype/dist.zip -C "$DESTDIR/usr/lib/$pkgname"
-
-	chmod u+s "$DESTDIR/usr/lib/$pkgname/chrome-sandbox"
-
-	cp out/$_buildtype/gen/node_headers.tar.gz "$DESTDIR"/usr/include/$pkgname
-
-	vlicense ${wrksrc}/src/LICENSE chromium.LICENSE
-	vlicense ${wrksrc}/src/electron/LICENSE electron.LICENSE
-	vlicense ${wrksrc}/src/third_party/electron_node/LICENSE node.LICENSE
-
-	vmkdir /usr/bin
-	ln -s ../lib/$pkgname/electron "$DESTDIR"/usr/bin/$pkgname
-}
diff --git a/srcpkgs/electron9/update b/srcpkgs/electron9/update
deleted file mode 100644
index 3af8e58b5358..000000000000
--- a/srcpkgs/electron9/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site=https://www.electronjs.org/releases/stable?version=${version%%.*}
-pattern='tag/v\K[\d\.]+(?=")'
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 7e5d660788ad..a13a60849e36 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=43
+revision=44
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -59,6 +59,7 @@ replaces="
  ebtables<=2.0.10.4_8
  eclipse-ecj<=4.9_3
  electron7<=7.3.3_1
+ electron9<=9.4.1_1
  enventor<=1.0.0_2
  epstopdf<=2.27_3
  fontmatrix<=0.6.0.20171228_2

From 24022bc1c1fc20e836564e0ebb93ff2231ead0d5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 26 Apr 2021 09:06:55 +0200
Subject: [PATCH 1735/2024] vscode: use electron10

---
 srcpkgs/vscode/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index 16c925c3d90d..50304de55eee 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,11 +1,11 @@
 # Template file for 'vscode'
 pkgname=vscode
 version=1.55.2
-revision=1
-_electronver=9.4.1
+revision=2
+_electronver=10.4.3
 hostmakedepends="pkg-config python nodejs yarn tar git"
-makedepends="libxkbfile-devel libsecret-devel electron9"
-depends="libXtst libxkbfile nss dejavu-fonts-ttf xdg-utils ripgrep electron9"
+makedepends="libxkbfile-devel libsecret-devel electron10"
+depends="libXtst libxkbfile nss dejavu-fonts-ttf xdg-utils ripgrep electron10"
 short_desc="Microsoft Code for Linux"
 maintainer="shizonic <realtiaz@gmail.com>"
 license="MIT"

From 7136d22a366781c52f013541b9f404dfd2d8bb14 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 26 Apr 2021 13:58:29 +0200
Subject: [PATCH 1736/2024] amdvlk: update to 2021.Q2.1.

---
 .../patches/cmake-build-type-none.patch       | 24 ++++++++++---------
 srcpkgs/amdvlk/template                       | 22 ++++++++---------
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
index 7a629e58548e..897bbe44b142 100644
--- a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
+++ b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
@@ -46,15 +46,17 @@ Index: xgl/CMakeLists.txt
      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()
+--- xgl/cmake/Modules/AmdCmakeHelper.cmake	2021-04-07 06:57:17.000000000 +0200
++++ -	2021-04-26 14:11:03.415683706 +0200
+@@ -35,11 +35,6 @@
+ else()
+     string(TOUPPER "${CMAKE_BUILD_TYPE}" capital_CMAKE_BUILD_TYPE)
  
-     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)
+-    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)
diff --git a/srcpkgs/amdvlk/template b/srcpkgs/amdvlk/template
index 4de14e893433..a525ce00ae11 100644
--- a/srcpkgs/amdvlk/template
+++ b/srcpkgs/amdvlk/template
@@ -1,11 +1,11 @@
 # Template file for 'amdvlk'
 pkgname=amdvlk
-version=2021.Q1.4
+version=2021.Q2.1
 revision=1
-_llpc_commit=2692228d80d8be2221641b719eb7135f52bc34aa
-_xgl_commit=e5c5ad454049892ed803b0adcc15ef6fb27ec50e
-_pal_commit=575d41ff01c856d9566168d65b31e4b49db4734b
-_llvm_project_commit=90d06712ff54e242b7bd225321e4fc8629292d46
+_llpc_commit=a8ec3c6e6372dcfd812a2ea592141a821e9584b1
+_xgl_commit=e1be7ee14c39d3a36d9d1aacd00caf3acc437cde
+_pal_commit=83635fbee82fb21662a4737e34437c41172c6fe0
+_llvm_project_commit=b0392f639492720b268697f4261aaccfa3459537
 _spvgen_commit=59823e6c3557cb7f3fae4a9f2760ad3f6b694997
 _MetroHash_commit=3c566dd9cda44ca7fd97659e0b53ac953f9037d2
 _CWPack_commit=7387247eb9889ddcabbc1053b9c2052e253b088e
@@ -18,7 +18,7 @@ configure_args="-DBUILD_WAYLAND_SUPPORT=ON
  -DXGL_CWPACK_PATH=../../cwpack
  -DLLVM_PARALLEL_LINK_JOBS=2"
 hostmakedepends="pkg-config python3 perl"
-makedepends="libxml2-devel xorg-server-devel libXrandr-devel libffi-devel"
+makedepends="libxml2-devel xorg-server-devel libXrandr-devel libffi-devel wayland-devel"
 depends="vulkan-loader"
 short_desc="AMD Open Source Driver For Vulkan"
 maintainer="John <me@johnnynator.dev>"
@@ -32,11 +32,11 @@ distfiles="https://github.com/GPUOpen-Drivers/AMDVLK/archive/v-${version}.tar.gz
  https://github.com/GPUOpen-Drivers/spvgen/archive/${_spvgen_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/MetroHash/archive/${_MetroHash_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/CWPack/archive/${_CWPack_commit}.tar.gz"
-checksum="c88b946a0dd8d9442e798ce3a182b6f23ffab0b96e9967292ad6ba84c74d9273
- 1e043aee70e5690bc5934a2352a19c182e5d27c59ac9870089d979ce59c125cc
- 571fdf549864eea95e716149bbc54d6906ac74d5d5811c46047b4483256590e6
- 42e048a5ea32fb44f26ad96b538754bbffdcd9f20a019bacd1efd2302a3502ac
- e7e9a943486fb16426fb5584a992a227a3e014142bdc70e25ce18a7ccdb830f5
+checksum="c491929f959404527816ec9a88755916282aceeb191cd7bfb0440682e202e186
+ f585fd7d43985cb396f8470781f80229018bedc96aae7939b979015ce1caf064
+ a999ff6400b0e16b4f47dd9fb063b071ec5b8226f5bca84d58e6a9f52a36966c
+ ad36dab535943239357fc6101e9d4be532e950366d97f761f8cb63a6f4ee755d
+ 18665c4ba9bc80179315f18c877c3a9e9790e53e2ceb3090c03bc2510f30652e
  124e37608f2ef49a980c3fff9cc73bcb154c9724ee00397e0dee6cc8cf1b4244
  cc8ff538fede25fe023984b3fde27f09b000bdc49793534794cd1d2bf881750a
  186060fbcf87165224ba7df0e1858b66ebc42cf190c481aef1df8d89ebab7abd"

From ee2bcd4b6d2207f512e0cad70467395831849ba8 Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Sun, 25 Apr 2021 21:29:05 -0400
Subject: [PATCH 1737/2024] oragono: update to 2.6.1.

---
 srcpkgs/oragono/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/oragono/template b/srcpkgs/oragono/template
index 3ad30e162f30..33a91197e97c 100644
--- a/srcpkgs/oragono/template
+++ b/srcpkgs/oragono/template
@@ -1,6 +1,6 @@
 # Template file for 'oragono'
 pkgname=oragono
-version=2.6.0
+version=2.6.1
 revision=1
 build_style=go
 go_import_path="github.com/oragono/oragono"
@@ -10,7 +10,7 @@ maintainer="Peter Bui <pbui@github.bx612.space>"
 license="MIT"
 homepage="https://oragono.io/"
 distfiles="https://github.com/oragono/oragono/archive/v${version}.tar.gz"
-checksum=c0fdca73fa39a34166b747c5f556f568edd46d063e9f19d7d4ee066a3803f2ae
+checksum=d123f1aa413bb4541ca0b174286ccb372bf924cec2d635a7cde65791682c41bf
 conf_files="/etc/oragono.conf"
 system_accounts="_oragono"
 _oragono_homedir="/var/lib/oragono"

From 0dcb84da215a54c95073f6448cd834cf0c7b3b65 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Mon, 26 Apr 2021 11:37:28 +0300
Subject: [PATCH 1738/2024] cointop: update to 1.6.5

---
 srcpkgs/cointop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cointop/template b/srcpkgs/cointop/template
index b2e5d1f98ba9..c93d4204bb45 100644
--- a/srcpkgs/cointop/template
+++ b/srcpkgs/cointop/template
@@ -1,6 +1,6 @@
 # Template file for 'cointop'
 pkgname=cointop
-version=1.6.4
+version=1.6.5
 revision=1
 build_style=go
 go_import_path="github.com/miguelmota/${pkgname}"
@@ -9,4 +9,4 @@ maintainer="FollieHiyuki <folliekazetani@protonmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/miguelmota/cointop"
 distfiles="https://github.com/miguelmota/cointop/archive/v${version}.tar.gz"
-checksum=da9698695e955dad148f989abcd716c683788d2378e088a6f52c275f44f9447c
+checksum=87c1e9f1dfb6de83b3ea0fc4ae90b35328772f6d841f70ae95800028f3dfd45a

From e80961220b00f1e89f40a18540847074494819a6 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Mon, 26 Apr 2021 11:41:22 +0300
Subject: [PATCH 1739/2024] font-sarasa-gothic: update to 0.31.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 0217e0cc39df..9d689359f0e6 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.30.2
+version=0.31.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=44b14ab8ec5da43c7804c7d5e077de887bc889c1a1eca62765d46e0a0df36b99
+checksum=4d6e520500fef185461457aad8f397fd1f9407b9624cbeff50999650a3f525af
 
 font_dirs="/usr/share/fonts/TTF"
 

From d8c64497219ab9654faac5022edebf534e8817fd Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Mon, 26 Apr 2021 11:46:01 +0300
Subject: [PATCH 1740/2024] hugo: remove build options

---
 srcpkgs/hugo/template | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index 1a241f234e9b..88b46c4c244e 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,11 +1,10 @@
 # Template file for 'hugo'
 pkgname=hugo
 version=0.82.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/gohugoio/hugo"
-go_build_tags="$(vopt_if extended extended)"
-depends="$(vopt_if pygments python3-Pygments)"
+go_build_tags="extended"
 short_desc="Fast & Modern Static Website Engine"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
@@ -13,11 +12,6 @@ homepage="https://gohugo.io"
 distfiles="https://github.com/gohugoio/hugo/archive/v${version}.tar.gz"
 checksum=3190ae848fdb1a04339c233faab5934c422d85cf85ea3b0c0b5a842239c84e75
 
-build_options="pygments extended"
-build_options_default="extended"
-desc_option_pygments="Alternative syntax highlighter"
-desc_option_extended="SASS/SCSS build support for Hugo"
-
 post_install() {
 	vdoc README.md
 }

From e793c14bdd107c813359df3e4b82e19db66a66c2 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Mon, 5 Apr 2021 03:28:43 +0300
Subject: [PATCH 1741/2024] font-iosevka: update to 6.0.1

Change to use super-ttc format
---
 srcpkgs/font-iosevka/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template
index 41f0e6194abf..e87a1837b5cb 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.2.1
+version=6.0.1
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -9,11 +9,11 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="OFL-1.1"
 homepage="https://typeof.net/Iosevka/"
 distfiles="https://raw.githubusercontent.com/be5invis/Iosevka/v${version}/LICENSE.md>LICENSE.txt
- 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"
+ https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-${version}.zip
+ https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-slab-${version}.zip"
 checksum="72c3d557ff41d871680652f56afd565ba6834c90eadc45a4ec15410dce1c0c80
- c160178621f7c2943b3c00b2f33146e5c0b7945cecfb5008bd8f80aa5f1946bc
- f12ad8fe3a1ccb398302456154107420b0411fc039993a5966b36dc43f361435"
+ 644b3b5695151228657af0df2fd3c8af85d31d01ef3625b603f8d9776754bb6f
+ b7f58505f408ed8fafa3312198d06e1312ee6b96eac1456a2597cc4e0a2ca221"
 
 font_dirs="/usr/share/fonts/TTF"
 

From e8549804813552640ca0e6f60f2d9bcdc1951ce7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 26 Apr 2021 11:17:32 -0400
Subject: [PATCH 1742/2024] python3-hypothesis: bring sanity to update cycles

Because upstream cuts a new release with every gust of wind, let's cut
down on update madness and peg the updates to X.Y.0.
---
 srcpkgs/python3-hypothesis/update | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/python3-hypothesis/update b/srcpkgs/python3-hypothesis/update
index d92e11af9555..3c99b323e612 100644
--- a/srcpkgs/python3-hypothesis/update
+++ b/srcpkgs/python3-hypothesis/update
@@ -1 +1,2 @@
 pkgname=hypothesis-python
+pattern="${pkgname}-\K[0-9.]+\.0(?=\.tar\.gz)"

From 519325088ce1309f29f41b2546e9aeb558701141 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 24 Apr 2021 16:32:19 +0200
Subject: [PATCH 1743/2024] libkdegames: update to 21.04.0.

---
 common/shlibs                |  2 +-
 srcpkgs/libkdegames/template | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 47a56de6dd87..182d311e70f2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3466,7 +3466,7 @@ libwoff2enc.so.1.0.2 libwoff2enc1.0.2-1.0.2_1
 libwoff2dec.so.1.0.2 libwoff2dec1.0.2-1.0.2_1
 libcloudproviders.so.0 libcloudproviders-0.2.5_2
 libKF5KDEGames.so.7 libkdegames-18.08.3_1
-libKF5KDEGamesPrivate.so.1 libkdegames-19.12.3_1
+libKF5KDEGamesPrivate.so.7 libkdegames-21.04.0_1
 libidn2.so.0 libidn2-2.1.1_1
 libgmime-3.0.so.0 gmime3-3.2.3_1
 libgetdns.so.10 getdns-1.5.1_7
diff --git a/srcpkgs/libkdegames/template b/srcpkgs/libkdegames/template
index e9460e8b41fb..c39ab1f9e7a7 100644
--- a/srcpkgs/libkdegames/template
+++ b/srcpkgs/libkdegames/template
@@ -1,17 +1,21 @@
 # Template file for 'libkdegames'
 pkgname=libkdegames
-version=20.12.2
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
  kcoreaddons kdoctools gettext"
 makedepends="qt5-svg-devel knewstuff-devel kdnssd-devel kdeclarative-devel libopenal-devel libsndfile-devel"
 short_desc="Common code and data for many KDE games"
-maintainer="1is7ac3 <isaac.qa13@gmail.com>"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/games"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdegames-${version}.tar.xz"
-checksum=19d93fe25f1ea5173d5130b2d270038b26e6cc6f09238724f330d05fbe019439
+checksum=4766ce2c73a17b05a7a79c326edaa2c29718719218f48d7ea7543f31f02415e0
+
+pre_check() {
+	export QT_QPA_PLATFORM=offscreen
+}
 
 libkdegames-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 79670dcfa321c0a970eebf490140709fb41110ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 24 Apr 2021 16:32:19 +0200
Subject: [PATCH 1744/2024] kpat: update to 21.04.0.

---
 srcpkgs/kpat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpat/template b/srcpkgs/kpat/template
index ca73073f74bd..7a560bf9acf9 100644
--- a/srcpkgs/kpat/template
+++ b/srcpkgs/kpat/template
@@ -1,6 +1,6 @@
 # Template file for 'kpat'
 pkgname=kpat
-version=20.12.3
+version=21.04.0
 revision=1
 build_style=cmake
 configure_args="-DWITH_BH_SOLVER=OFF"
@@ -13,7 +13,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-only"
 homepage="https://kde.org/applications/games/kpat"
 distfiles="${KDE_SITE}/release-service/${version}/src/kpat-${version}.tar.xz"
-checksum=21d802097e8891d7655407a56a42a79107a4002096a2a3ea26b0ac0ee8fe34ec
+checksum=d645882d8de0e5ec6c79e01f13fef258553e1d59bb18189b6888cd5276bb6a10
 
 pre_check() {
 	export QT_QPA_PLATFORM=offscreen

From 41ab5140aad17ee8b7845a6d6bf676ff152c679c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 24 Apr 2021 16:32:19 +0200
Subject: [PATCH 1745/2024] kapman: update to 21.04.0.

---
 srcpkgs/kapman/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kapman/template b/srcpkgs/kapman/template
index b35c13250062..478ccf48598a 100644
--- a/srcpkgs/kapman/template
+++ b/srcpkgs/kapman/template
@@ -1,6 +1,6 @@
 # Template file for 'kapman'
 pkgname=kapman
-version=20.12.1
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kdoctools kconfig
@@ -12,4 +12,4 @@ maintainer="toluschr <toluschr@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/games/org.kde.kapman"
 distfiles="${KDE_SITE}/release-service/${version}/src/kapman-${version}.tar.xz"
-checksum=c9919534b08b58e593b48c95ae880193c87693b665ed04f276a8d002094648c3
+checksum=1523fb4d100cebfe26b418c212aeb326f59f0e2e63b0b5d2e7640f483bcaf2c4

From 026f072ed9f666b3ee957a93af0507ead55cd485 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 24 Apr 2021 16:32:19 +0200
Subject: [PATCH 1746/2024] kblocks: update to 21.04.0.

---
 srcpkgs/kblocks/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kblocks/template b/srcpkgs/kblocks/template
index 66f93edd49f7..17b5abfd6b05 100644
--- a/srcpkgs/kblocks/template
+++ b/srcpkgs/kblocks/template
@@ -1,6 +1,6 @@
 # Template file for 'kblocks'
 pkgname=kblocks
-version=20.12.1
+version=21.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kdoctools kconfig
@@ -13,4 +13,8 @@ maintainer="toluschr <toluschr@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/games/org.kde.kblocks"
 distfiles="${KDE_SITE}/release-service/${version}/src/kblocks-${version}.tar.xz"
-checksum=9a601c46ffcf2b90f6fb45fcbb8accd6b6b006a3263c9b52468099261eee2d09
+checksum=f678d652875cdad8612fc572ad86970a716e7701c9d246fdf6a621fda3232206
+
+pre_check() {
+	export QT_QPA_PLATFORM=offscreen
+}

From 993c2b7efcae6e7ce376604a768d81e4fc27943d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 20 Apr 2021 00:05:49 +0200
Subject: [PATCH 1747/2024] xbps-src: add make_check=ci-skip

---
 Manual.md                                   | 14 +++++++++-----
 common/travis/prepare.sh                    |  1 +
 common/xbps-src/libexec/xbps-src-docheck.sh |  6 ++++++
 etc/defaults.conf                           |  6 ++++++
 xbps-src                                    |  2 +-
 5 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/Manual.md b/Manual.md
index 8c2afbaca71d..73cd9088f9bc 100644
--- a/Manual.md
+++ b/Manual.md
@@ -176,9 +176,8 @@ can be used to perform other operations before configuring the package.
 - `check` This optional phase checks the result of the `build` phase by running the testsuite provided by the package.
 If the default `do_check` function provided by the build style doesn't do anything, the template should set
 `make_check_target` and/or `make_check_args` appropriately or define its own `do_check` function. If tests take too long
-or can't run in all environments, they should be run only if `XBPS_CHECK_PKGS` is `full`, which means they should either
-be under a `[ "$XBPS_CHECK_PKGS" = full ]` conditional (especially useful with custom `do_check`) or `make_check=extended`
-should be set in the template.
+or can't run in all environments, `make_check` should be set to fitting value or
+`do_check` should be customized to limit testsuite unless `XBPS_CHECK_PKGS` is `full`.
 
 - `install` This phase installs the `package files` into the package destdir `<masterdir>/destdir/<pkgname>-<version>`,
 via `make install` or any other compatible method.
@@ -606,10 +605,15 @@ patches to the package sources during `do_patch()`. Patches are stored in
 - `disable_parallel_build` If set the package won't be built in parallel
 and `XBPS_MAKEJOBS` has no effect.
 
-- `make_check` Sets the cases in which the `check` phase is run. Can be `yes` (the default) to run if
-`XBPS_CHECK_PKGS` is set, `extended` to run if `XBPS_CHECK_PKGS` is `full` and `no` to never run.
+- `make_check` Sets the cases in which the `check` phase is run.
 This option should usually be accompanied by a comment explaining why it was set, especially when
 set to `no`.
+Allowed values:
+  - `yes` (the default) to run if `XBPS_CHECK_PKGS` is set.
+  - `extended` to run if `XBPS_CHECK_PKGS` is `full`.
+  - `ci-skip` to run locally if `XBPS_CHECK_PKGS` is set, but not as part of pull request checks.
+  - `no` to never run.
+
 
 - `keep_libtool_archives` If enabled the `GNU Libtool` archives won't be removed. By default those
 files are always removed automatically.
diff --git a/common/travis/prepare.sh b/common/travis/prepare.sh
index 1e17be97545b..550fbd7598d0 100755
--- a/common/travis/prepare.sh
+++ b/common/travis/prepare.sh
@@ -5,6 +5,7 @@
 [ "$XLINT" ] && exit 0
 
 /bin/echo -e '\x1b[32mUpdating etc/conf...\x1b[0m'
+echo XBPS_BUILD_ENVIRONMENT=void-packages-ci >> etc/conf
 echo XBPS_ALLOW_RESTRICTED=yes >> etc/conf
 
 /bin/echo -e '\x1b[32mEnabling ethereal chroot-style...\x1b[0m'
diff --git a/common/xbps-src/libexec/xbps-src-docheck.sh b/common/xbps-src/libexec/xbps-src-docheck.sh
index 1cb9f6ab13aa..1e82c1a3739f 100755
--- a/common/xbps-src/libexec/xbps-src-docheck.sh
+++ b/common/xbps-src/libexec/xbps-src-docheck.sh
@@ -43,6 +43,12 @@ if [ "$make_check" = extended -a "$XBPS_CHECK_PKGS" != full ]; then
     exit 0
 fi
 
+if [ "$make_check" = ci-skip ] && [ "$XBPS_BUILD_ENVIRONMENT" = void-packages-ci ]; then
+    msg_warn \
+        "${pkgname}-${version}_${revision}: skipping here because of make_check=ci-skip. Tests should be run locally.\n"
+    exit 0
+fi
+
 for f in $XBPS_COMMONDIR/environment/check/*.sh; do
     source_file "$f"
 done
diff --git a/etc/defaults.conf b/etc/defaults.conf
index 133449a150d6..6147954a18af 100644
--- a/etc/defaults.conf
+++ b/etc/defaults.conf
@@ -136,6 +136,12 @@ XBPS_SUCMD="sudo /bin/sh -c"
 #
 #XBPS_USE_BUILD_MTIME=yes
 
+# [OPTIONAL]
+# Enable continuous integration specific mode of operation. Currently this
+# disables do_check for some packages.
+#
+#XBPS_BUILD_ENVIRONMENT=void-packages-ci
+
 # [OPTIONAL]
 # When using the 'ethereal' chroot-style this switch must be activated, it is
 # meant as safeguard against users casually destroying their systems
diff --git a/xbps-src b/xbps-src
index 9d88873ab2c5..c3cd7e5db10b 100755
--- a/xbps-src
+++ b/xbps-src
@@ -635,7 +635,7 @@ export XBPS_SHUTILSDIR XBPS_CROSSPFDIR XBPS_TRIGGERSDIR \
     XBPS_DESTDIR XBPS_MACHINE XBPS_TEMP_MASTERDIR XBPS_BINPKG_EXISTS \
     XBPS_LIBEXECDIR XBPS_DISTDIR XBPS_DISTFILES_MIRROR XBPS_ALLOW_RESTRICTED \
     XBPS_USE_GIT_COMMIT_DATE XBPS_PKG_COMPTYPE XBPS_REPO_COMPTYPE \
-    XBPS_BUILDHELPERDIR XBPS_USE_BUILD_MTIME
+    XBPS_BUILDHELPERDIR XBPS_USE_BUILD_MTIME XBPS_BUILD_ENVIRONMENT
 
 for i in REPOSITORY DESTDIR BUILDDIR SRCDISTDIR; do
     eval val="\$XBPS_$i"

From 2bde817833bb375a121cd9135649c3c68d441b61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 20 Apr 2021 00:05:50 +0200
Subject: [PATCH 1748/2024] elogind: enable tests locally

---
 srcpkgs/elogind/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/elogind/template b/srcpkgs/elogind/template
index 72f4aa18f421..784b60e6462d 100644
--- a/srcpkgs/elogind/template
+++ b/srcpkgs/elogind/template
@@ -21,7 +21,7 @@ distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz"
 checksum=dd2fcf22a89a078cad22e633d2f14a4cc9f4a9c8bae25c0e39fc4aec3e273bc9
 conf_files="/etc/elogind/*.conf"
 # tests fail differently due to containerization and kernel features
-make_check=extended
+make_check=ci-skip
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" -Dutmp=false"

From c2f61110fc2ecc4f1d59e0966557d9ff0a1d4df7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 20 Apr 2021 00:05:50 +0200
Subject: [PATCH 1749/2024] fish-shell: enable tests locally

---
 srcpkgs/fish-shell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fish-shell/template b/srcpkgs/fish-shell/template
index 35ce6f0967ea..c7d3076af03a 100644
--- a/srcpkgs/fish-shell/template
+++ b/srcpkgs/fish-shell/template
@@ -16,7 +16,7 @@ distfiles="https://github.com/fish-shell/fish-shell/releases/download/${version}
 checksum=5944da1a8893d11b0828a4fd9136ee174549daffb3d0adfdd8917856fe6b4009
 register_shell="/bin/fish /usr/bin/fish"
 # tests don't work as root
-make_check=extended
+make_check=ci-skip
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From e2a40b85bed95064d2af38c4fb4b9764e32fdfe0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 20 Apr 2021 00:05:50 +0200
Subject: [PATCH 1750/2024] flac: enable tests locally

---
 srcpkgs/flac/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/flac/template b/srcpkgs/flac/template
index bc126d52029c..8166b9f00655 100644
--- a/srcpkgs/flac/template
+++ b/srcpkgs/flac/template
@@ -15,7 +15,7 @@ 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
+make_check=ci-skip
 
 # TODO: make into options
 case "$XBPS_TARGET_MACHINE" in

From cf0efa45f591be2688d5aba5fd8ed133dbadb060 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 20 Apr 2021 00:05:50 +0200
Subject: [PATCH 1751/2024] igt-gpu-tools: enable tests locally

---
 srcpkgs/igt-gpu-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/igt-gpu-tools/template b/srcpkgs/igt-gpu-tools/template
index 2588c2ddff5c..3b222ecd18d8 100644
--- a/srcpkgs/igt-gpu-tools/template
+++ b/srcpkgs/igt-gpu-tools/template
@@ -16,7 +16,7 @@ homepage="https://gitlab.freedesktop.org/drm/igt-gpu-tools"
 distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz"
 checksum=40454d8f0484ea2477862007398a08eef78a6c252c4defce1c934548593fdd11
 # tests don't behave in containers
-make_check=extended
+make_check=ci-skip
 
 lib32disabled=yes
 archs="i686* x86_64*"

From 88d0eed833af0bf93c87c38bd20b543959684051 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 20 Apr 2021 00:05:49 +0200
Subject: [PATCH 1752/2024] inetutils: enable tests locally

---
 srcpkgs/inetutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/inetutils/template b/srcpkgs/inetutils/template
index 7918a4641a87..ced4ac1166cd 100644
--- a/srcpkgs/inetutils/template
+++ b/srcpkgs/inetutils/template
@@ -20,8 +20,8 @@ subpackages="inetutils-dnsdomainname inetutils-ftp inetutils-hostname
 
 CFLAGS="-fcommon"
 
-# tests can't run in CI
-make_check=extended
+# hostname test can't run in CI
+make_check=ci-skip
 
 case "$XBPS_TARGET_MACHINE" in
 *-musl)

From 433afe24b38c824a82ba1e38d70b913175ea8ce3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 20 Apr 2021 00:05:50 +0200
Subject: [PATCH 1753/2024] libgusb: enable tests locally

---
 srcpkgs/libgusb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgusb/template b/srcpkgs/libgusb/template
index e26b6ccf96d3..a7cc76a8c8b1 100644
--- a/srcpkgs/libgusb/template
+++ b/srcpkgs/libgusb/template
@@ -17,7 +17,7 @@ changelog="https://raw.githubusercontent.com/hughsie/libgusb/master/NEWS"
 distfiles="http://people.freedesktop.org/~hughsient/releases/${pkgname}-${version}.tar.xz"
 checksum=13277948a2ee06861234938089aea21bce6ad862f14c81a2efa85340ed701efd
 # requires access to USB devices, not available on CI
-make_check=extended
+make_check=ci-skip
 
 build_options="gir vala"
 build_options_default="gir vala"

From 33883208fb628dc76e477cf579346e806d6d382b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 20 Apr 2021 00:05:50 +0200
Subject: [PATCH 1754/2024] openvpn: enable tests locally

---
 srcpkgs/openvpn/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template
index 31a9679a33f1..d521cf4c4061 100644
--- a/srcpkgs/openvpn/template
+++ b/srcpkgs/openvpn/template
@@ -21,8 +21,7 @@ desc_option_mbedtls="Build with mbedtls support"
 desc_option_pkcs11="Enable support for PKCS#11"
 vopt_conflict mbedtls pkcs11
 
-# tests can't run in CI
-make_check=extended
+make_check=ci-skip
 
 post_install() {
 	vmkdir usr/share/examples/${pkgname}

From fa7407fa15869498a1eccd0d65ea8f5360670911 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 20 Apr 2021 00:05:50 +0200
Subject: [PATCH 1755/2024] postgresql: enable tests locally

---
 srcpkgs/postgresql/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index 25f7e62bd8da..fcbf3e2a67c4 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -21,7 +21,7 @@ changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html"
 distfiles="https://ftp.postgresql.org/pub/source/v${version}/${pkgname}-${version}.tar.bz2"
 checksum=930feaef28885c97ec40c26ab6221903751eeb625de92b22602706d7d47d1634
 # initdb fails on github actions, works locally with xbps-uunshare
-make_check=extended
+make_check=ci-skip
 
 conf_files="
 	/etc/default/${pkgname}

From 27808f34931f3e842b8ef5c8f02c9b869507425b Mon Sep 17 00:00:00 2001
From: a dinosaur <nick@a-dinosaur.com>
Date: Mon, 26 Apr 2021 13:30:04 +1000
Subject: [PATCH 1756/2024] libopenmpt: update to 0.5.8

---
 srcpkgs/libopenmpt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libopenmpt/template b/srcpkgs/libopenmpt/template
index d9ba1879ff41..5ab2dc672940 100644
--- a/srcpkgs/libopenmpt/template
+++ b/srcpkgs/libopenmpt/template
@@ -1,6 +1,6 @@
 # Template file for 'libopenmpt'
 pkgname=libopenmpt
-version=0.5.7
+version=0.5.8
 revision=1
 wrksrc="libopenmpt-${version}+release.autotools"
 build_style=gnu-configure
@@ -16,7 +16,7 @@ maintainer="a dinosaur <nick@a-dinosaur.com>"
 license="BSD-3-Clause"
 homepage="https://lib.openmpt.org/libopenmpt/"
 distfiles="https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"
-checksum=c86026c47e208f1849676d1b6c5c9a068247154f38d368628c05c1f354d72c77
+checksum=29e2c21174b73f67f2ba5ee76808d62f182b130e4f704ee2d9ae8283982d8acd
 
 post_install() {
 	vlicense LICENSE

From ea1282ca430d99c4cff9a6dd08d5a60ec21219a6 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Mon, 26 Apr 2021 16:03:45 +0300
Subject: [PATCH 1757/2024] libdvdnav: update to 6.1.1.

---
 srcpkgs/libdvdnav/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libdvdnav/template b/srcpkgs/libdvdnav/template
index ce2ede85aff1..5a7a859c4c0b 100644
--- a/srcpkgs/libdvdnav/template
+++ b/srcpkgs/libdvdnav/template
@@ -1,7 +1,7 @@
 # Template file for 'libdvdnav'
 pkgname=libdvdnav
-version=6.1.0
-revision=2
+version=6.1.1
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libdvdcss-devel libdvdread-devel"
@@ -11,7 +11,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.videolan.org/developers/libdvdnav.html"
 changelog="https://code.videolan.org/videolan/libdvdnav/blob/master/ChangeLog"
 distfiles="https://download.videolan.org/pub/videolan/libdvdnav/${version}/libdvdnav-${version}.tar.bz2"
-checksum=f697b15ea9f75e9f36bdf6ec3726308169f154e2b1e99865d0bbe823720cee5b
+checksum=c191a7475947d323ff7680cf92c0fb1be8237701885f37656c64d04e98d18d48
 
 libdvdnav-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From 25c59f7a4ab5d57ec17ca1bd1eccbfbd25385caa Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Mon, 26 Apr 2021 16:07:49 +0300
Subject: [PATCH 1758/2024] libdvdcss: update to 1.4.3.

---
 srcpkgs/libdvdcss/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libdvdcss/template b/srcpkgs/libdvdcss/template
index 75bea67fbb54..ca9d26cd31cd 100644
--- a/srcpkgs/libdvdcss/template
+++ b/srcpkgs/libdvdcss/template
@@ -1,6 +1,6 @@
 # Template file for 'libdvdcss'
 pkgname=libdvdcss
-version=1.4.2
+version=1.4.3
 revision=1
 build_style=gnu-configure
 short_desc="Simple library designed for accessing DVDs"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.videolan.org/developers/libdvdcss.html"
 distfiles="https://download.videolan.org/pub/${pkgname}/${version}/${pkgname}-${version}.tar.bz2"
-checksum=78c2ed77ec9c0d8fbed7bf7d3abc82068b8864be494cfad165821377ff3f2575
+checksum=233cc92f5dc01c5d3a96f5b3582be7d5cee5a35a52d3a08158745d3d86070079
 
 libdvdcss-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From cb28ef867ecaef29f1f60a1271424e0a1e2705e5 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Thu, 22 Apr 2021 23:51:01 +0200
Subject: [PATCH 1759/2024] lf: fix update pattern

---
 srcpkgs/lf/update | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/lf/update b/srcpkgs/lf/update
index 42dfad0fb8eb..c83d7030902f 100644
--- a/srcpkgs/lf/update
+++ b/srcpkgs/lf/update
@@ -1,2 +1 @@
-pattern='\Kr\d+'
-ignore=r95
+pattern='archive/refs/tags/\Kr[0-9]+(?=\.tar.gz)'

From b0fe2d8058ed2a07525c4c6cd69d9a4492dc5ee4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 25 Apr 2021 13:08:57 +0200
Subject: [PATCH 1760/2024] libkdcraw5: update to 21.04.0.

---
 srcpkgs/libkdcraw5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkdcraw5/template b/srcpkgs/libkdcraw5/template
index 34a2e432eee4..2ae5b619e823 100644
--- a/srcpkgs/libkdcraw5/template
+++ b/srcpkgs/libkdcraw5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdcraw5'
 pkgname=libkdcraw5
-version=20.04.0
+version=21.04.0
 revision=1
 wrksrc="libkdcraw-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdcraw-${version}.tar.xz"
-checksum=a8abe962fc739abcc2efeb97472a366c6c3c47b7398e61660e71febe9aedfe5a
+checksum=4bbd654879c629b08ba6d30d4bf5046b4a999afcb67799068bc0a1e583a926c7
 
 libkdcraw5-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 65a272669728fe5c03ce62450eaa46683e915fbd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 25 Apr 2021 13:06:51 +0200
Subject: [PATCH 1761/2024] gwenview: update to 21.04.0

---
 srcpkgs/gwenview/template | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/gwenview/template b/srcpkgs/gwenview/template
index b771d3e490ad..03230dee99bb 100644
--- a/srcpkgs/gwenview/template
+++ b/srcpkgs/gwenview/template
@@ -1,8 +1,9 @@
 # Template file for 'gwenview'
 pkgname=gwenview
-version=20.04.0
+version=21.04.0
 revision=1
 build_style=cmake
+build_helper=qemu
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
  python3 kdoctools kconfig kcoreaddons gettext"
 makedepends="qt5-devel qt5-svg-devel phonon-qt5-devel kio-devel kactivities5-devel
@@ -14,14 +15,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/gwenview"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=420671703565f5d2824d430589cd104e6030fd2ffd13ba6453af92d897c9a574
-patch_args="-Np1"
-
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		mkdir build
-		_libjpeg_version=$(grep 'define JPEG_LIB_VERSION' /usr/${XBPS_CROSS_TRIPLET}/include/jconfig.h  | awk '{print $3}')
-		echo "JPEGLIB_RUN_RESULT:STRING=${_libjpeg_version}" >> build/CMakeCache.txt
-		echo "JPEGLIB_RUN_RESULT__TRYRUN_OUTPUT:STRING=${_libjpeg_version}" >> build/CMakeCache.txt
-	fi
-}
+checksum=a5f9839db9e756c4e442982314a053b4765f5907398350d7776cf544dc71de1b

From 29db2327db570a910926381006fbf7c607c7159a Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 26 Apr 2021 13:26:52 -0500
Subject: [PATCH 1762/2024] bpytop: update to 1.0.64.

---
 srcpkgs/bpytop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bpytop/template b/srcpkgs/bpytop/template
index 734197029833..f20fcbf99fb8 100644
--- a/srcpkgs/bpytop/template
+++ b/srcpkgs/bpytop/template
@@ -1,6 +1,6 @@
 # Template file for 'bpytop'
 pkgname=bpytop
-version=1.0.63
+version=1.0.64
 revision=1
 build_style=gnu-makefile
 depends="python3-psutil"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/aristocratos/bpytop"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=a543d8e0e342c03c7c235d468d116c501312a9c7f389e7d82d7931392a067c33
+checksum=233299db3f17863ab69b0f7b149b586c499f5697177ab71b2006770398b11196
 
 pre_configure() {
 	vsed -e '/^update_check/s/\$update_check/false/' -i bpytop.py

From 7ce7e70a8570943294149209dba113cd4b47d2c1 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 26 Apr 2021 13:26:54 -0500
Subject: [PATCH 1763/2024] Amass: update to 3.12.2.

---
 srcpkgs/Amass/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template
index 957e15f5f662..2d8a44324103 100644
--- a/srcpkgs/Amass/template
+++ b/srcpkgs/Amass/template
@@ -1,6 +1,6 @@
 # Template file for 'Amass'
 pkgname=Amass
-version=3.12.1
+version=3.12.2
 revision=1
 build_style=go
 go_import_path="github.com/OWASP/Amass/v3/..."
@@ -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=136984d32e6b19d830c15a4aee90cbff7bfd7691edb9be1bdeec9d1bb6ff4f39
+checksum=e4162b84a25ea6e21aa88c5afb556a4fe8e52c73deb411915faca845842bc769

From d57b289b6f095c72c3cd37de245dd24ae2d49fec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 26 Apr 2021 20:53:02 +0200
Subject: [PATCH 1764/2024] telegram-desktop: update to 2.7.2.

---
 .../patches/0003-gdk-include.patch            | 10 +++
 .../patches/0003-stdint.patch                 | 10 ---
 ...bca53a1e195a31760978dc41f67ce44fc7e4.patch | 22 -----
 ...148bafc27f35011b805e773993300c55713f.patch | 84 -------------------
 srcpkgs/telegram-desktop/template             |  8 +-
 5 files changed, 14 insertions(+), 120 deletions(-)
 create mode 100644 srcpkgs/telegram-desktop/patches/0003-gdk-include.patch
 delete mode 100644 srcpkgs/telegram-desktop/patches/0003-stdint.patch
 delete mode 100644 srcpkgs/telegram-desktop/patches/3582bca53a1e195a31760978dc41f67ce44fc7e4.patch
 delete mode 100644 srcpkgs/telegram-desktop/patches/c08a148bafc27f35011b805e773993300c55713f.patch

diff --git a/srcpkgs/telegram-desktop/patches/0003-gdk-include.patch b/srcpkgs/telegram-desktop/patches/0003-gdk-include.patch
new file mode 100644
index 000000000000..c97df09382e0
--- /dev/null
+++ b/srcpkgs/telegram-desktop/patches/0003-gdk-include.patch
@@ -0,0 +1,10 @@
+--- Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h	2021-04-26 18:33:58.641158572 +0200
++++ -	2021-04-26 18:46:55.642218961 +0200
+@@ -12,6 +12,7 @@
+ #undef signals
+ #include <JavaScriptCore/JavaScript.h>
+ #include <gtk/gtk.h>
++#include <gdk/gdkx.h>
+ #include <webkit2/webkit2.h>
+ #include <X11/Xlib.h>
+ #define signals public
diff --git a/srcpkgs/telegram-desktop/patches/0003-stdint.patch b/srcpkgs/telegram-desktop/patches/0003-stdint.patch
deleted file mode 100644
index e73238fc0341..000000000000
--- a/srcpkgs/telegram-desktop/patches/0003-stdint.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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
deleted file mode 100644
index 585e35b49cf3..000000000000
--- a/srcpkgs/telegram-desktop/patches/3582bca53a1e195a31760978dc41f67ce44fc7e4.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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
deleted file mode 100644
index e8cc81c0a1fc..000000000000
--- a/srcpkgs/telegram-desktop/patches/c08a148bafc27f35011b805e773993300c55713f.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-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/template b/srcpkgs/telegram-desktop/template
index 8940f58c01a6..393bd2f178d7 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=2
+version=2.7.2
+revision=1
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
 build_helper="qemu"
@@ -17,7 +17,7 @@ makedepends="alsa-lib-devel ffmpeg-devel libdbusmenu-glib-devel libopenal-devel
  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)
- kwayland-devel glibmm-devel tg_owt"
+ kwayland-devel glibmm-devel tg_owt webkit2gtk-devel"
 depends="qt5-imageformats qt5-core>=5.15.2<5.15.3"
 short_desc="Telegram Desktop messaging app"
 maintainer="John <me@johnnynator.dev>"
@@ -25,7 +25,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=41bfbe1ee63da9a6af7cf7d11b1cdd13a6754b51b294ac5a9d56f5f11dfbdd05
+checksum=b67acb650e72efb8f8d3eb9175f210f5820d9cabb7f12891a197da6a69f454de
 
 build_options="spellcheck"
 build_options_default="spellcheck"

From 1cf22f8e454debfd82eeb69a00cd7c7ba33b1901 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 26 Apr 2021 20:53:05 +0200
Subject: [PATCH 1765/2024] tg_owt: update to 0.0.0.20210422.

---
 srcpkgs/tg_owt/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index 7fc356b67f61..b5241349c4e4 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -1,8 +1,8 @@
 # Template file for 'tg_owt'
 pkgname=tg_owt
-version=0.0.0.20210321
+version=0.0.0.20210422
 revision=2
-_commit=2d804d2c9c5d05324c8ab22f2e6ff8306521b3c3
+_commit=18cb4cd9bb4c2f5f5f5e760ec808f74c302bc1bf
 _libyuv_commit=ad890067f661dc747a975bc55ba3767fe30d4452
 _libvpx_commit=5b63f0f821e94f8072eb483014cfc33b05978bb9
 wrksrc="tg_owt-$_commit"
@@ -19,7 +19,7 @@ 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
+checksum="@cbe521309b75443a07be1c470d9e432456a8c5ddc424220ffcaec2232dfb7610
  @ea967f58e720be3a8f8105d48fedb983570679c8ced8ffbad48fb673089c7ed9
  @1dd51820852df840c339bf3f18e6cf1166de33d5631a69cd1eae5b2b34c113e3"
 skip_extraction="${_libvpx_commit}.tar.gz ${_libyuv_commit}.tar.gz"

From d497e3c9d8294e2ca5af1908baffd9e02d37a555 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sun, 20 Dec 2020 15:50:13 +0100
Subject: [PATCH 1766/2024] ansible-base: update to 2.10.8.

---
 srcpkgs/ansible-base/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ansible-base/template b/srcpkgs/ansible-base/template
index 718daa0881ec..195856106a84 100644
--- a/srcpkgs/ansible-base/template
+++ b/srcpkgs/ansible-base/template
@@ -1,19 +1,19 @@
 # Template file for 'ansible-base'
 pkgname=ansible-base
-version=2.10.2
+version=2.10.8
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="${hostmakedepends} python3-cryptography python3-Jinja2 python3-paramiko
  python3-yaml"
-checkdepends="python3-pytest"
 short_desc="Simple deployment, configuration management and execution framework"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="GPL-3.0-or-later"
 homepage="https://www.ansible.com/"
 distfiles="${PYPI_SITE}/a/ansible-base/ansible-base-${version}.tar.gz"
-checksum=c79fe108e13b286bad21734208624aaef9dabb49bb4211b13bc96d88829e22ab
+checksum=f45df824051339d8bec32d7ab4e9e676498c05e2d9cfce6d54c9698a577e15e2
 conflicts="ansible<2.10.1_1"
+make_check=no
 
 post_install() {
 	vsconf examples/ansible.cfg

From e4b8a2f74652ac207e95cd4af41d27685702b867 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sun, 20 Dec 2020 15:51:14 +0100
Subject: [PATCH 1767/2024] ansible: update to 3.3.0.

---
 srcpkgs/ansible/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ansible/template b/srcpkgs/ansible/template
index e51df9e38709..143f1e3f6ea4 100644
--- a/srcpkgs/ansible/template
+++ b/srcpkgs/ansible/template
@@ -1,14 +1,14 @@
 # Template file for 'ansible'
 pkgname=ansible
-version=2.10.1
+version=3.3.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3 ansible-base"
-checkdepends="python3-pytest"
 short_desc="Simple deployment, configuration management and execution framework"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="GPL-3.0-or-later"
 homepage="https://www.ansible.com/"
 distfiles="${PYPI_SITE}/a/ansible/ansible-${version}.tar.gz"
-checksum=75708c67e2ac926cea42856af72cbc9494bf8008197652f9609089f7b4c2515a
+checksum=2de5385c48a2a24a19f6cbaccc7d7684c64b6194f9a9b175aba7949d53b07bc9
+make_check=no

From c5b50692494f81e5e6975a839125d8115e574c23 Mon Sep 17 00:00:00 2001
From: Lon Willett <xgit@lonw.net>
Date: Tue, 20 Apr 2021 13:14:36 +0200
Subject: [PATCH 1768/2024] libsearpc: update to 3.2.0.20200318

Update to 3.2.0.20200318 (i.e. 3.2-latest).

Remove patch to support python3.

Add patch to support include of header file within extern "C".
---
 .../patches/001-python3-support.patch         | 114 ------------------
 .../patches/01-glib-include-kludge.patch      |  21 ++++
 srcpkgs/libsearpc/template                    |  13 +-
 3 files changed, 29 insertions(+), 119 deletions(-)
 delete mode 100644 srcpkgs/libsearpc/patches/001-python3-support.patch
 create mode 100644 srcpkgs/libsearpc/patches/01-glib-include-kludge.patch

diff --git a/srcpkgs/libsearpc/patches/001-python3-support.patch b/srcpkgs/libsearpc/patches/001-python3-support.patch
deleted file mode 100644
index 7b4ae20c2819..000000000000
--- a/srcpkgs/libsearpc/patches/001-python3-support.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-upstream: yes
-
-From b0079d2a0c3ce0cb4698a162498b108244726912 Mon Sep 17 00:00:00 2001
-From: Xiangyue Cai <caixiangyue007@gmail.com>
-Date: Mon, 8 Jun 2020 15:09:06 +0800
-Subject: [PATCH] configure with python3 (#53)
-
-* configure with python3
-
-* remove future
----
- configure.ac              | 2 +-
- pysearpc/client.py        | 1 -
- pysearpc/named_pipe.py    | 3 ---
- pysearpc/pygencode.py     | 3 ---
- pysearpc/server.py        | 2 --
- pysearpc/test_pysearpc.py | 1 -
- pysearpc/transport.py     | 2 --
- pysearpc/utils.py         | 1 -
- 8 files changed, 1 insertion(+), 14 deletions(-)
-
-diff --git configure.ac configure.ac
-index 53d7438..9c2159a 100644
---- configure.ac
-+++ configure.ac
-@@ -98,7 +98,7 @@ PKG_CHECK_MODULES(JANSSON, [jansson >= $JANSSON_REQUIRED])
- AC_SUBST(JANSSON_CFLAGS)
- AC_SUBST(JANSSON_LIBS)
- 
--AM_PATH_PYTHON([2.4])
-+AM_PATH_PYTHON([3.5])
- if test "$bwin32" = true; then
-    if test x$PYTHON_DIR != x; then
-    # set pyexecdir to somewhere like /c/Python26/Lib/site-packages
-diff --git pysearpc/client.py pysearpc/client.py
-index 20e5535..3650cb1 100644
---- pysearpc/client.py
-+++ pysearpc/client.py
-@@ -1,4 +1,3 @@
--from builtins import object
- import json
- from .common import SearpcError
- 
-diff --git pysearpc/named_pipe.py pysearpc/named_pipe.py
-index a0ca619..73df576 100644
---- pysearpc/named_pipe.py
-+++ pysearpc/named_pipe.py
-@@ -2,9 +2,6 @@
- RPC client/server implementation based on named pipe transport.
- """
- 
--from future import standard_library
--standard_library.install_aliases()
--from builtins import object
- import json
- import logging
- import os
-diff --git pysearpc/pygencode.py pysearpc/pygencode.py
-index 62a635b..8c718ce 100644
---- pysearpc/pygencode.py
-+++ pysearpc/pygencode.py
-@@ -1,8 +1,5 @@
- #!/usr/bin/python
- 
--
--from __future__ import print_function
--from builtins import str
- import string
- import sys
- 
-diff --git pysearpc/server.py pysearpc/server.py
-index a7ec7be..94d9bac 100644
---- pysearpc/server.py
-+++ pysearpc/server.py
-@@ -1,5 +1,3 @@
--from builtins import str
--from builtins import object
- import json
- 
- from .common import SearpcError
-diff --git pysearpc/test_pysearpc.py pysearpc/test_pysearpc.py
-index a9c6f8b..64a455d 100755
---- pysearpc/test_pysearpc.py
-+++ pysearpc/test_pysearpc.py
-@@ -1,7 +1,6 @@
- #!/usr/bin/env python
- #coding: UTF-8
- 
--from builtins import object
- import json
- import logging
- import os
-diff --git pysearpc/transport.py pysearpc/transport.py
-index 3c6e821..3deb42c 100644
---- pysearpc/transport.py
-+++ pysearpc/transport.py
-@@ -1,5 +1,3 @@
--
--from builtins import object
- class SearpcTransport(object):
-     """
-     A transport is repsonsible to send the serialized request to the
-diff --git pysearpc/utils.py pysearpc/utils.py
-index 2aeda93..451ad4e 100644
---- pysearpc/utils.py
-+++ pysearpc/utils.py
-@@ -1,4 +1,3 @@
--from builtins import bytes
- import os
- import socket
- 
--- 
-2.30.0
-
diff --git a/srcpkgs/libsearpc/patches/01-glib-include-kludge.patch b/srcpkgs/libsearpc/patches/01-glib-include-kludge.patch
new file mode 100644
index 000000000000..a899439cdfbd
--- /dev/null
+++ b/srcpkgs/libsearpc/patches/01-glib-include-kludge.patch
@@ -0,0 +1,21 @@
+  Recent versions of glib don't work inside an extern "C" block, but some seafile sources
+  include searpc-client.h inside one. See https://github.com/haiwen/libsearpc/pull/57.
+
+  This is the easy fix, needed until upstream fixes the problem.
+--- lib/searpc-client.h~	2020-06-18 05:23:11.000000000 +0200
++++ lib/searpc-client.h	2021-04-10 15:48:09.994005146 +0200
+@@ -7,8 +7,14 @@
+ #define LIBSEARPC_API
+ #endif
+ 
++#ifdef __cplusplus
++extern "C++" {
++#endif
+ #include <glib.h>
+ #include <glib-object.h>
++#ifdef __cplusplus
++}
++#endif
+ #include <jansson.h>
+ 
+ #ifndef DFT_DOMAIN
diff --git a/srcpkgs/libsearpc/template b/srcpkgs/libsearpc/template
index 02273e1ef58d..22fbb7987d06 100644
--- a/srcpkgs/libsearpc/template
+++ b/srcpkgs/libsearpc/template
@@ -1,18 +1,21 @@
 # Template file for 'libsearpc'
 # WARNING: upstream sometimes retag source. Wait for official announcement
 pkgname=libsearpc
-version=3.2.0
-revision=4
+# 3.2-latest (as of 2021-04-10)
+version=3.2.0.20200318
+revision=1
+_gitrev=50ff08b03c7cec8e10b35ba438633b9fe08a8d90
+wrksrc="${pkgname}-${_gitrev}"
 build_style=gnu-configure
-configure_args="PYTHON=python3 --disable-static --disable-compile-demo"
+configure_args="--with-python3 --disable-static --disable-compile-demo"
 hostmakedepends="automake libtool pkg-config python3 glib-devel"
 makedepends="libglib-devel jansson-devel"
 short_desc="Seafile RPC library"
 maintainer="yopito <pierre.bourgin@free.fr>"
 license="LGPL-3.0-or-later, Apache-2.0"
 homepage="https://seafile.com"
-distfiles="https://github.com/haiwen/libsearpc/archive/v${version}.tar.gz"
-checksum=cd00197fcc40b45b1d5e892b2d08dfa5947f737e0d80f3ef26419334e75b0bff
+distfiles="https://github.com/haiwen/libsearpc/archive/${_gitrev}.tar.gz"
+checksum=2a58894cefbc1d7398581fc58103261688c93a9cf63f11afc5e92142ed948c00
 python_version=3
 
 pre_configure() {

From d8f2a4d37fddde6e6cd332e79a5b84b75645ff1f Mon Sep 17 00:00:00 2001
From: Lon Willett <xgit@lonw.net>
Date: Tue, 20 Apr 2021 13:17:49 +0200
Subject: [PATCH 1769/2024] seafile-libclient: update to 8.0.1

---
 srcpkgs/seafile-libclient/template | 6 +++---
 srcpkgs/seafile-libclient/update   | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/seafile-libclient/update

diff --git a/srcpkgs/seafile-libclient/template b/srcpkgs/seafile-libclient/template
index db394362f188..5a462985b88d 100644
--- a/srcpkgs/seafile-libclient/template
+++ b/srcpkgs/seafile-libclient/template
@@ -1,8 +1,8 @@
 # Template file for 'seafile-libclient'
 # WARNING: upstream sometimes retag source. Wait for official announcement
 pkgname=seafile-libclient
-version=7.0.10
-revision=2
+version=8.0.1
+revision=1
 _distname="${pkgname/-libclient/}"
 wrksrc="${_distname}-${version}"
 build_style=gnu-configure
@@ -15,7 +15,7 @@ maintainer="yopito <pierre.bourgin@free.fr>"
 license="GPL-2.0-or-later" # Has openssl exception not yet present on SPDX
 homepage="https://seafile.com"
 distfiles="https://github.com/haiwen/seafile/archive/v${version}.tar.gz"
-checksum=9ac0a1c25e6f2bf874b5b080a165319f29cb3d03f044da8db8aed8412c8b4f45
+checksum=117e686301f32e91d46b16453c43eb959cbd818f8c28ee3a594705bd103e59b9
 
 pre_configure() {
 	./autogen.sh
diff --git a/srcpkgs/seafile-libclient/update b/srcpkgs/seafile-libclient/update
new file mode 100644
index 000000000000..a26f83a4fe01
--- /dev/null
+++ b/srcpkgs/seafile-libclient/update
@@ -0,0 +1,4 @@
+# upstream sometimes retag source
+# use upstream's Ubuntu focal repo to detect new version.
+site='https://linux-clients.seafile.com/seafile-deb/focal/pool/main/s/seafile-daemon/'
+pattern='seafile-daemon_\K[\d.]+(?=_amd64.deb)'

From e04536117808d96f65d39eee0839bf722246410c Mon Sep 17 00:00:00 2001
From: Lon Willett <xgit@lonw.net>
Date: Tue, 20 Apr 2021 13:19:17 +0200
Subject: [PATCH 1770/2024] seafile-client-qt: update to 8.0.1

Remove libressl patch.
---
 srcpkgs/seafile-client-qt/patches/libressl.patch | 11 -----------
 srcpkgs/seafile-client-qt/template               |  4 ++--
 srcpkgs/seafile-client-qt/update                 |  8 ++++----
 3 files changed, 6 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/seafile-client-qt/patches/libressl.patch

diff --git a/srcpkgs/seafile-client-qt/patches/libressl.patch b/srcpkgs/seafile-client-qt/patches/libressl.patch
deleted file mode 100644
index 1774719fa34a..000000000000
--- a/srcpkgs/seafile-client-qt/patches/libressl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/utils/rsa.cpp.orig
-+++ src/utils/rsa.cpp
-@@ -13,7 +13,7 @@
- 
- /* Forward compatibility functions if libssl < 1.1.0. */
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
- 
- int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d)
- {
diff --git a/srcpkgs/seafile-client-qt/template b/srcpkgs/seafile-client-qt/template
index c0a475106e45..b2e16639780a 100644
--- a/srcpkgs/seafile-client-qt/template
+++ b/srcpkgs/seafile-client-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'seafile-client-qt'
 pkgname=seafile-client-qt
-version=7.0.10
+version=8.0.1
 revision=1
 _sourcename="seafile-client"
 wrksrc="${_sourcename}-${version}"
@@ -14,7 +14,7 @@ maintainer="yopito <pierre.bourgin@free.fr>"
 license="Apache-2.0"
 homepage="https://seafile.com"
 distfiles="https://github.com/haiwen/seafile-client/archive/v${version}.tar.gz"
-checksum=3b373e13fd56fd1cb768db598302f19669919194a3d2a54b0eb929ff04310333
+checksum=49bd391549b54f1cf043026862e765c8c27e84be07835c8ffc21d81570968367
 
 build_options="shibboleth"
 desc_option_shibboleth="Build with Shibboleth support"
diff --git a/srcpkgs/seafile-client-qt/update b/srcpkgs/seafile-client-qt/update
index 8a583259f495..7c03301dc426 100644
--- a/srcpkgs/seafile-client-qt/update
+++ b/srcpkgs/seafile-client-qt/update
@@ -1,4 +1,4 @@
-# upstream sometimes retag source until official announcement.
-# rely on windows client availabiliy to detect new version.
-site=https://download.seadrive.org/
-pattern='<Key>seafile-\K[\d.]+(?=-en.msi</Key>)'
+# upstream sometimes retag source
+# use upstream's Ubuntu focal repo to detect new version.
+site='https://linux-clients.seafile.com/seafile-deb/focal/pool/main/s/seafile-gui/'
+pattern='seafile-gui_\K[\d.]+(?=_amd64.deb)'

From 2639519ae63e9195f96c2fa69a56835fa2762569 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Mon, 26 Apr 2021 20:13:45 +0300
Subject: [PATCH 1771/2024] calibre: update to 5.16.1.

---
 srcpkgs/calibre/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index ec8a9466d446..9546f815e3bd 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,6 +1,6 @@
 # Template file for 'calibre'
 pkgname=calibre
-version=5.14.0
+version=5.16.1
 revision=1
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
@@ -27,7 +27,7 @@ license="GPL-3.0-only"
 homepage="https://calibre-ebook.com"
 changelog="https://raw.githubusercontent.com/kovidgoyal/calibre/master/Changelog.txt"
 distfiles="https://download.calibre-ebook.com/${version}/calibre-${version}.tar.xz"
-checksum=186cce57b6990af0b014282fa1d3d914fffc11e40d8495ea43d91485534e1271
+checksum=9535c25b430634e7b379c6863bd736246538ca5c293e605a3174d8de72cd72b1
 lib32disabled=yes
 nocross=yes
 

From 391af954ef78925bd84071b09729f99a7a34b324 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Mon, 26 Apr 2021 21:04:52 +0200
Subject: [PATCH 1772/2024] slack-desktop: update to 4.15.0

---
 srcpkgs/slack-desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/slack-desktop/template b/srcpkgs/slack-desktop/template
index 794c7470bdb9..f0b3ae3331db 100644
--- a/srcpkgs/slack-desktop/template
+++ b/srcpkgs/slack-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'slack-desktop'
 pkgname=slack-desktop
-version=4.14.0
+version=4.15.0
 revision=1
 archs="x86_64"
 hostmakedepends="tar xz"
@@ -10,7 +10,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="custom:Proprietary"
 homepage="https://slack.com/"
 distfiles="https://slack-ssb-updates.global.ssl.fastly.net/linux_releases/${pkgname}-${version}-amd64.deb"
-checksum=cfa500b6c5109724d5fc123477d5e4c9740e332a56397a1413462da9358ac977
+checksum=31aa7cdcff637c642cfeb2786d4cbcc076f226048080c91d76c38e48283ef7f7
 restricted=yes
 repository="nonfree"
 nopie=yes

From 83ebbd04dcada2cc949c8a5f096a55252ad36d87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 25 Apr 2021 02:03:14 -0300
Subject: [PATCH 1773/2024] tar: remove outdated CVE patch.

Patch was added d95a0b07065a6cde65cfb94e5581024696883610, apparently
based on the one discussed in [1], but using ERROR instead of
FATAL_ERROR. However, per [2], this was fixed in another way, though
upstream seems to not consider it worthy of a CVE.

[1] https://lists.gnu.org/archive/html/bug-tar/2016-10/msg00014.html
[2] https://lists.gnu.org/archive/html/bug-tar/2016-10/msg00016.html
---
 .../tar-1.29-extract-pathname-bypass.patch    | 27 -------------------
 srcpkgs/tar/template                          |  2 +-
 2 files changed, 1 insertion(+), 28 deletions(-)
 delete mode 100644 srcpkgs/tar/patches/tar-1.29-extract-pathname-bypass.patch

diff --git a/srcpkgs/tar/patches/tar-1.29-extract-pathname-bypass.patch b/srcpkgs/tar/patches/tar-1.29-extract-pathname-bypass.patch
deleted file mode 100644
index cf0c3725b9b8..000000000000
--- a/srcpkgs/tar/patches/tar-1.29-extract-pathname-bypass.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- lib/paxnames.c.orig	2016-04-06 00:04:47.314860045 +0300
-+++ lib/paxnames.c	2016-04-06 02:08:44.962297881 +0300
-@@ -18,6 +18,7 @@
- #include <system.h>
- #include <hash.h>
- #include <paxlib.h>
-+#include <quotearg.h>
- 
- \f
- /* Hash tables of strings.  */
-@@ -114,7 +115,15 @@
-       for (p = file_name + prefix_len; *p; )
- 	{
-           if (p[0] == '.' && p[1] == '.' && (ISSLASH (p[2]) || !p[2]))
--	    prefix_len = p + 2 - file_name;
-+            {
-+	      static char const *const diagnostic[] =
-+	      {
-+		N_("%s: Member name contains '..'"),
-+		N_("%s: Hard link target contains '..'")
-+	      };
-+	      ERROR ((0, 0, _(diagnostic[link_target]),
-+	              quotearg_colon (file_name)));
-+	    }
- 
- 	  do
- 	    {
diff --git a/srcpkgs/tar/template b/srcpkgs/tar/template
index 2ac475c035a2..c18acdba1120 100644
--- a/srcpkgs/tar/template
+++ b/srcpkgs/tar/template
@@ -1,7 +1,7 @@
 # Template file for 'tar'
 pkgname=tar
 version=1.34
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="gl_cv_struct_dirent_d_ino=yes"
 makedepends="acl-devel"

From 434affda287a0ead6e78b949b8129d4f31095400 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Mon, 26 Apr 2021 21:21:34 +0200
Subject: [PATCH 1774/2024] google-chrome: update to 90.0.4430.93

---
 srcpkgs/google-chrome/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template
index 9705611f5cb1..a82ae4df6ad7 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,5 +1,5 @@
 # Template file for 'google-chrome'
-_chromeVersion=90.0.4430.85
+_chromeVersion=90.0.4430.93
 _chromeRevision=1
 _channel=stable
 
@@ -22,7 +22,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=39de976ede3d759fd696e59bd7ac3447093ab67b65972a41caa557edbee12952
+checksum=86bedf3e385dcc819fa7863b28445c403090fb20b45a8b0f063199ed72662eee
 
 do_extract() {
 	mkdir -p ${DESTDIR}

From ee660122e1a34a331623ab6cd0eafa76e3ea6d74 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 26 Apr 2021 15:01:42 -0500
Subject: [PATCH 1775/2024] zeek: update to 4.0.1.

---
 common/shlibs                      |  2 +-
 srcpkgs/zeek/patches/timeval.patch | 40 ------------------------------
 srcpkgs/zeek/template              |  4 +--
 3 files changed, 3 insertions(+), 43 deletions(-)
 delete mode 100644 srcpkgs/zeek/patches/timeval.patch

diff --git a/common/shlibs b/common/shlibs
index 182d311e70f2..4e69b5ccb4ae 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3481,7 +3481,7 @@ libtexpdf.so.0 libtexpdf-0.9.5_1
 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
+libbroker.so.3 zeek-4.0.1_1
 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
diff --git a/srcpkgs/zeek/patches/timeval.patch b/srcpkgs/zeek/patches/timeval.patch
deleted file mode 100644
index 47f0730becde..000000000000
--- a/srcpkgs/zeek/patches/timeval.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- 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 13625e90c744..e071ae02cb68 100644
--- a/srcpkgs/zeek/template
+++ b/srcpkgs/zeek/template
@@ -1,6 +1,6 @@
 # Template file for 'zeek'
 pkgname=zeek
-version=4.0.0
+version=4.0.1
 revision=1
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=cmake
@@ -13,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=f2eedab3262eaa3f58a83442b1f38bad35ed72399564917b71bba42266f1ff54
+checksum=659a890f433cb730519966bdc41f1a03fb67e27e94b5d52ad9ee890022a12c3a
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-fts-devel musl-legacy-compat"

From 4b8b983eadf62e72479c88c940fb47f665c272d4 Mon Sep 17 00:00:00 2001
From: Sora Morimoto <sora@morimoto.io>
Date: Tue, 27 Apr 2021 07:11:12 +0900
Subject: [PATCH 1776/2024] ghq: update to 1.1.7

Signed-off-by: Sora Morimoto <sora@morimoto.io>
---
 srcpkgs/ghq/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ghq/template b/srcpkgs/ghq/template
index 029cc3fbf9f5..92b9f7722015 100644
--- a/srcpkgs/ghq/template
+++ b/srcpkgs/ghq/template
@@ -1,6 +1,6 @@
 # Template file for 'ghq'
 pkgname=ghq
-version=1.1.5
+version=1.1.7
 revision=1
 build_style=go
 go_import_path=github.com/x-motemen/ghq
@@ -12,7 +12,7 @@ maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="MIT"
 homepage="https://github.com/x-motemen/ghq"
 distfiles="https://github.com/x-motemen/ghq/archive/v${version}.tar.gz"
-checksum=129e421020002d7d07af7e40f2c9706e96569f67562a01d56d09f98ae5d65f37
+checksum=3c9cc7763f947a918609868311048d387dbb586b34c993d8af18b0fd97c6c2eb
 
 post_install() {
 	vlicense LICENSE

From ffbe9b232194baff6a8e99b5a75b743cd203b0a4 Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Tue, 27 Apr 2021 10:40:28 +1000
Subject: [PATCH 1777/2024] MoarVM: update to 2021.04.

---
 srcpkgs/MoarVM/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/MoarVM/template b/srcpkgs/MoarVM/template
index 52236814e470..332f6cc745d6 100644
--- a/srcpkgs/MoarVM/template
+++ b/srcpkgs/MoarVM/template
@@ -1,6 +1,6 @@
 # Template file for 'MoarVM'
 pkgname=MoarVM
-version=2021.03
+version=2021.04
 revision=1
 build_style=configure
 configure_script="perl Configure.pl"
@@ -15,6 +15,6 @@ license="Artistic-2.0"
 homepage="https://moarvm.org"
 changelog="https://github.com/MoarVM/MoarVM/raw/master/docs/ChangeLog"
 distfiles="https://moarvm.org/releases/MoarVM-${version}.tar.gz"
-checksum=8a0cf32273e473af884f409a02ad13c4aed5646628facf86544f6b3757e5cacf
+checksum=e094728536da421dc9a3e8651160ab6a5e8d0eafa834e8953feecf33285a11e7
 nocross=yes
 shlib_provides="libmoar.so"

From 19e911757ba4d9b3d6719bb7571284012b5ad117 Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Tue, 27 Apr 2021 10:42:12 +1000
Subject: [PATCH 1778/2024] nqp: update to 2021.04.

---
 srcpkgs/nqp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nqp/template b/srcpkgs/nqp/template
index b6d660c413ab..dd19e0aa9d1b 100644
--- a/srcpkgs/nqp/template
+++ b/srcpkgs/nqp/template
@@ -1,6 +1,6 @@
 # Template file for 'nqp'
 pkgname=nqp
-version=2021.03
+version=2021.04
 revision=1
 build_style=configure
 make_check_target=test
@@ -15,5 +15,5 @@ maintainer="Andy Weidenbaum <atweiden@tutanota.de>"
 license="Artistic-2.0"
 homepage="https://github.com/Raku/nqp"
 distfiles="https://rakudo.org/dl/nqp/${pkgname}-${version}.tar.gz"
-checksum=73498f685b8efbd54e43176d41a8f001c32abd27bcb0a801dcd69d38f4e61c11
+checksum=939a17ed6d44f913c8bb1319ee426d6b86361bb8b3d2ab3c9a4369270f6c7553
 nocross=yes

From a4a1bc62dbf9c722ff5360c754d49a8b895a15aa Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Tue, 27 Apr 2021 10:43:56 +1000
Subject: [PATCH 1779/2024] rakudo: update to 2021.04.

---
 srcpkgs/rakudo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rakudo/template b/srcpkgs/rakudo/template
index 903206d04182..fc92cc528298 100644
--- a/srcpkgs/rakudo/template
+++ b/srcpkgs/rakudo/template
@@ -1,6 +1,6 @@
 # Template file for 'rakudo'
 pkgname=rakudo
-version=2021.03
+version=2021.04
 revision=1
 build_style=configure
 make_check_target=test
@@ -32,7 +32,7 @@ license="Artistic-2.0"
 homepage="https://rakudo.org"
 changelog="https://github.com/rakudo/rakudo/raw/master/docs/ChangeLog"
 distfiles="https://rakudo.org/dl/rakudo/${pkgname}-${version}.tar.gz"
-checksum=98eb57fa0f4953aa6617111f36a2706799d8082b42e22c37cf104a918d914ec2
+checksum=6a5105d619d5e9fe8c3699dc331fc0efd32f6786de55b3cf0f438cd59e44e38e
 nocross=yes
 provides="raku-${version}_${revision}"
 

From 13bbe9ca1a4047ef7c0de99e7f4a7e4db2ef1948 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Tue, 20 Apr 2021 13:49:13 +0200
Subject: [PATCH 1780/2024] makedumpfile: update to 1.6.8.

---
 srcpkgs/makedumpfile/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/makedumpfile/template b/srcpkgs/makedumpfile/template
index cffe72b97be6..72597a79b929 100644
--- a/srcpkgs/makedumpfile/template
+++ b/srcpkgs/makedumpfile/template
@@ -1,15 +1,15 @@
 # Template file for 'makedumpfile'
 pkgname=makedumpfile
-version=1.6.7
+version=1.6.8
 revision=1
 makedepends="elfutils-devel zlib-devel bzip2-devel liblzma-devel lzo-devel"
 depends="perl"
 short_desc="Make a small dumpfile of kdump"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
-homepage="http://sourceforge.net/projects/makedumpfile/"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=e702fbdf62b4cd829a76e46f3e24eb3fc7501918b85ebdcd8baef4f53d6ee2c8
+homepage="https://github.com/makedumpfile/makedumpfile"
+distfiles="${homepage}/archive/refs/tags/${version}.tar.gz"
+checksum=85d79b7090e9a8ce0d426795d3bc1de2858def7e12954d9bc6ae03de160b694c
 
 CFLAGS="-fcommon"
 

From a23b660872fdbf2f4b7c48125beb05a9bb673712 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Tue, 20 Apr 2021 13:50:15 +0200
Subject: [PATCH 1781/2024] ghostscript: update to 9.54.0.

---
 .../ghostscript-9.53.3-freetype_fix-1.patch   | 39 -------------------
 srcpkgs/ghostscript/template                  |  6 +--
 2 files changed, 3 insertions(+), 42 deletions(-)
 delete mode 100644 srcpkgs/ghostscript/patches/ghostscript-9.53.3-freetype_fix-1.patch

diff --git a/srcpkgs/ghostscript/patches/ghostscript-9.53.3-freetype_fix-1.patch b/srcpkgs/ghostscript/patches/ghostscript-9.53.3-freetype_fix-1.patch
deleted file mode 100644
index 66b5f6556f46..000000000000
--- a/srcpkgs/ghostscript/patches/ghostscript-9.53.3-freetype_fix-1.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
-Date: 2020-10-20
-Initial Package Version: 9.53.3
-Upstream Status: Applied
-Origin: https://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=41ef9a0bc36b#patch1
-Description: Fixes build failure with freetype-2.10.3 and later.
-
-diff --git a/base/fapi_ft.c b/base/fapi_ft.c
-index 65fa6dc..21aef2f 100644 (file)
---- a/base/fapi_ft.c
-+++ b/base/fapi_ft.c
-@@ -125,7 +125,7 @@ static void
- delete_inc_int_info(gs_fapi_server * a_server,
-                     FT_IncrementalRec * a_inc_int_info);
- 
--FT_CALLBACK_DEF(void *)
-+static void *
- FF_alloc(FT_Memory memory, long size)
- {
-     gs_memory_t *mem = (gs_memory_t *) memory->user;
-@@ -133,7 +133,7 @@ FF_alloc(FT_Memory memory, long size)
-     return (gs_malloc(mem, size, 1, "FF_alloc"));
- }
- 
--FT_CALLBACK_DEF(void *)
-+static void *
-     FF_realloc(FT_Memory memory, long cur_size, long new_size, void *block)
- {
-     gs_memory_t *mem = (gs_memory_t *) memory->user;
-@@ -153,7 +153,7 @@ FT_CALLBACK_DEF(void *)
-     return (tmp);
- }
- 
--FT_CALLBACK_DEF(void)
-+static void
-     FF_free(FT_Memory memory, void *block)
- {
-     gs_memory_t *mem = (gs_memory_t *) memory->user;
-
diff --git a/srcpkgs/ghostscript/template b/srcpkgs/ghostscript/template
index 22927d660273..1d7aed4dc834 100644
--- a/srcpkgs/ghostscript/template
+++ b/srcpkgs/ghostscript/template
@@ -1,7 +1,7 @@
 # Template file for 'ghostscript'
 pkgname=ghostscript
-version=9.53.3
-revision=2
+version=9.54.0
+revision=1
 hostmakedepends="automake libtool pkg-config"
 makedepends="$(vopt_if cups cups-devel) dbus-devel fontconfig-devel jasper-devel jbig2dec-devel
  lcms2-devel libXext-devel libXt-devel libopenjpeg2-devel libpaper-devel"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-or-later, CPL-1.0"
 homepage="https://www.ghostscript.com/"
 distfiles="https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${version//./}/ghostscript-${version}.tar.xz"
-checksum=9c9f5bc85b6c7eb08368c05b1e3339f7aaf9677ddca710c6283f872d55e2a234
+checksum=c2b7b43cde600f4e70efb2cd95865f6d884a67315c3de235914697d8ccde6e3b
 patch_args="-Np1"
 
 build_options="cups"

From 01b7067720d6c7bc1dc0260dc22b47624221a03f Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Tue, 20 Apr 2021 13:28:05 +0200
Subject: [PATCH 1782/2024] nnn: update to 4.0.

---
 srcpkgs/nnn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nnn/template b/srcpkgs/nnn/template
index 704b749716e6..467ad2ec0dea 100644
--- a/srcpkgs/nnn/template
+++ b/srcpkgs/nnn/template
@@ -1,6 +1,6 @@
 # Template file for 'nnn'
 pkgname=nnn
-version=3.6
+version=4.0
 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=875094caebcc22ecf53b3722d139b127d25e1d5563a954342f32ded8980978b5
+checksum=a219ec8fad3dd0512aadae5840176f3265188c4c22da3b17b133bac602b40754
 
 post_install() {
 	vinstall misc/auto-completion/bash/nnn-completion.bash 644 \

From 2abea9977e63addbff3868f33aea61ed8bee705b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 26 Apr 2021 10:45:39 +0200
Subject: [PATCH 1783/2024] janet: update to 1.15.5.

---
 srcpkgs/janet/patches/dynlink.patch | 4 ++--
 srcpkgs/janet/template              | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/janet/patches/dynlink.patch b/srcpkgs/janet/patches/dynlink.patch
index 4518660e0e1b..81397b105b4b 100644
--- a/srcpkgs/janet/patches/dynlink.patch
+++ b/srcpkgs/janet/patches/dynlink.patch
@@ -1,13 +1,13 @@
 --- meson.build.orig
 +++ meson.build
-@@ -184,10 +184,11 @@
+@@ -192,10 +192,11 @@
  else
    extra_cflags = []
  endif
 -janet_mainclient = executable('janet', janetc, mainclient_src,
 +janet_mainclient = executable('janet', mainclient_src,
    include_directories : incdir,
-   dependencies : [m_dep, dl_dep, thread_dep],
+   dependencies : janet_dependencies,
    c_args : extra_cflags,
 +  link_with : [libjanet],
    install : true)
diff --git a/srcpkgs/janet/template b/srcpkgs/janet/template
index 4cd9ddacf2e2..56ff6277f68b 100644
--- a/srcpkgs/janet/template
+++ b/srcpkgs/janet/template
@@ -1,6 +1,6 @@
 # Template file for 'janet'
 pkgname=janet
-version=1.15.4
+version=1.15.5
 revision=1
 build_style=meson
 configure_args="-Db_lto=false"  # breaks jpm
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://janet-lang.org/"
 distfiles="https://github.com/janet-lang/janet/archive/v${version}.tar.gz"
-checksum=8eed302c8ded1df882544d13ce7e415b213cf7bc8fa77ca16110c89b36d19763
+checksum=7f90dbad2d7049847034182240d61b491411544ed82b110c5778dabd9eea84ca
 
 post_install() {
 	vlicense LICENSE

From e3adf2d98302c488ca907f1fea9665e0409b5652 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 27 Apr 2021 11:36:27 +0200
Subject: [PATCH 1784/2024] ugrep: update to 3.1.12.

---
 srcpkgs/ugrep/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index 567a712401c4..7f1c9e0ba389 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.1.11
+version=3.1.12
 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=43542115612f066ae22610da1510356955b142135bb23e97ed4266be28ec3e13
+checksum=f783b8bcc628f792ba418f073b38f089a14d709cbd0438ee27a0cc437e0543ac
 
 post_install() {
 	vlicense LICENSE.txt LICENSE

From 8423f2dc2554940d8942333d59be7d0467e7808e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 27 Apr 2021 11:38:40 +0200
Subject: [PATCH 1785/2024] debootstrap: update to 1.0.124.

---
 srcpkgs/debootstrap/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/debootstrap/template b/srcpkgs/debootstrap/template
index f1be3ccca072..0c2813d9b0ce 100644
--- a/srcpkgs/debootstrap/template
+++ b/srcpkgs/debootstrap/template
@@ -1,16 +1,16 @@
 # Template file for 'debootstrap'
 pkgname=debootstrap
-version=1.0.123
-revision=2
+version=1.0.124
+revision=1
 build_style=fetch
-depends="binutils gnupg gzip tar wget xz"
+depends="binutils gnupg gzip tar wget xz zstd"
 short_desc="Bootstrap a basic Debian system"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="http://packages.qa.debian.org/d/debootstrap.html"
 distfiles="${DEBIAN_SITE}/main/d/${pkgname}/${pkgname}_${version}_all.deb
  ${DEBIAN_SITE}/main/d/debian-archive-keyring/debian-archive-keyring_2019.1_all.deb"
-checksum="0ab37218fa9719517fccee68b552545f17a5336bbf5801c6d565213ca1aa014e
+checksum="df202f7e485be563270e803d25072d0c027d9ba3f624d1dd370dcaeaaa493210
  9cefd8917f3d97a999c136aa87f04a3024408b5bc1de470de7d6dfa5e4bd4361"
 
 case "$XBPS_TARGET_MACHINE" in

From 48041a9dbc903c35c7ead9dfda20a1b3e2234eed Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 27 Apr 2021 11:40:01 +0200
Subject: [PATCH 1786/2024] tcsh: update to 6.22.04.

---
 srcpkgs/tcsh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tcsh/template b/srcpkgs/tcsh/template
index ba88789c6328..6a54f6f55c5c 100644
--- a/srcpkgs/tcsh/template
+++ b/srcpkgs/tcsh/template
@@ -1,6 +1,6 @@
 # Template file for 'tcsh'
 pkgname=tcsh
-version=6.22.03
+version=6.22.04
 revision=1
 build_style=gnu-configure
 conf_files="/etc/csh.login /etc/csh.cshrc"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="http://www.tcsh.org/"
 distfiles="http://ftp.astron.com/pub/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=be2cfd653d2a0c7f506d2dd14c12324ba749bd484037be6df44a3973f52262b7
+checksum=eb16356243218c32f39e07258d72bf8b21e62ce94bb0e8a95e318b151397e231
 register_shell="/bin/tcsh /bin/csh"
 
 CFLAGS="-fcommon"

From 563760a37ccdb5e08d04532b05ca3e4f18cc8741 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 27 Apr 2021 11:44:19 +0200
Subject: [PATCH 1787/2024] tcsh: update to 6.22.04.

---
 srcpkgs/tcsh/template | 2 --
 1 file changed, 2 deletions(-)

diff --git a/srcpkgs/tcsh/template b/srcpkgs/tcsh/template
index 6a54f6f55c5c..a107625c7992 100644
--- a/srcpkgs/tcsh/template
+++ b/srcpkgs/tcsh/template
@@ -13,8 +13,6 @@ distfiles="http://ftp.astron.com/pub/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=eb16356243218c32f39e07258d72bf8b21e62ce94bb0e8a95e318b151397e231
 register_shell="/bin/tcsh /bin/csh"
 
-CFLAGS="-fcommon"
-
 post_extract() {
 	sed -i '/define BSDWAIT/d' sh.proc.c
 }

From 1471ee1f80efc3a2a164154375b96211b2a5fa5d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 27 Apr 2021 11:46:05 +0200
Subject: [PATCH 1788/2024] at: update to 3.2.2.

---
 srcpkgs/at/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/at/template b/srcpkgs/at/template
index 172ab638ee48..772c4582b3e7 100644
--- a/srcpkgs/at/template
+++ b/srcpkgs/at/template
@@ -1,7 +1,7 @@
 # Template file for 'at'
 pkgname=at
-version=3.1.23
-revision=2
+version=3.2.2
+revision=1
 build_style=gnu-configure
 configure_args="--with-jobdir=/var/spool/atd --with-atspool=/var/spool/atd
  --sbindir=/usr/bin --with-daemon_username=at --with-daemon_groupname=at
@@ -14,7 +14,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://packages.qa.debian.org/a/at.html"
 distfiles="${DEBIAN_SITE}/main/a/${pkgname}/${pkgname}_${version}.orig.tar.gz"
-checksum=97450aa954aaa8a70218cc8e61a33df9fee9f86527e9f861de302fb7a3c81710
+checksum=2211da14914fde1f9cc83592838fb6385a32fb11fcecb7816c77700df6559088
 disable_parallel_build=yes
 
 conf_files="/etc/at.deny"

From 88c7d007ad3393119d960a400d8ef273181d5cae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 27 Apr 2021 09:09:15 -0300
Subject: [PATCH 1789/2024] libgpg-error: update to 1.42.

Remove gen-lock-obj.sh workaround added in
e79f72db82769fef0830b0c34803a7685be1d268 (should have been removed at
the first update after that).

Use rm -r in post_install.
---
 srcpkgs/libgpg-error/patches/cross.patch    | 20 +++++++++++++
 srcpkgs/libgpg-error/patches/echo-fix.patch | 32 +++++++++++++++++++++
 srcpkgs/libgpg-error/template               | 17 ++++-------
 3 files changed, 57 insertions(+), 12 deletions(-)
 create mode 100644 srcpkgs/libgpg-error/patches/cross.patch
 create mode 100644 srcpkgs/libgpg-error/patches/echo-fix.patch

diff --git a/srcpkgs/libgpg-error/patches/cross.patch b/srcpkgs/libgpg-error/patches/cross.patch
new file mode 100644
index 000000000000..253fc50f6614
--- /dev/null
+++ b/srcpkgs/libgpg-error/patches/cross.patch
@@ -0,0 +1,20 @@
+Upstream commit 1fb90a7da186ee2ee098a666f6f3a35bb1720e59 added a
+--disable-threads config option and changed the case to only match linux-gnu*
+instead of linux*, because those are obviously very related changes.
+
+This patch reverts that part of the commit, and fixes cross building to musl
+archs for us.
+
+diff --git a/configure b/configure
+index 24b1cee..89a9937 100755
+--- a/configure
++++ b/configure
+@@ -17433,7 +17433,7 @@ if test x"$gl_use_threads" = xno; then
+ $as_echo "$as_me: generated src/lock-obj-pub.native.h for $host" >&6;}
+ elif test x$cross_compiling = xyes; then
+   case $host in
+-    *-*-linux-gnu*)
++    *-*-linux*)
+     if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}objdump; ac_word=$2
diff --git a/srcpkgs/libgpg-error/patches/echo-fix.patch b/srcpkgs/libgpg-error/patches/echo-fix.patch
new file mode 100644
index 000000000000..78d98dd7b3d1
--- /dev/null
+++ b/srcpkgs/libgpg-error/patches/echo-fix.patch
@@ -0,0 +1,32 @@
+From 33593864cd54143db594c4237bba41e14179061c Mon Sep 17 00:00:00 2001
+From: David Michael <fedora.dm0@gmail.com>
+Date: Fri, 26 Mar 2021 16:06:50 +0900
+Subject: [PATCH] build: Fix generation of lock-obj-pub.native.h for cross
+ build.
+
+* src/gen-lock-obj.sh: Capture echo output with quotes.
+
+--
+
+Fixes-commit: 99ae862a96a569724f49a604ebb7d3f6d2c2d374
+Signed-off-by: David Michael <fedora.dm0@gmail.com>
+---
+ src/gen-lock-obj.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/gen-lock-obj.sh b/src/gen-lock-obj.sh
+index a710f0c..258eec6 100755
+--- a/src/gen-lock-obj.sh
++++ b/src/gen-lock-obj.sh
+@@ -38,7 +38,7 @@
+ #     AWK=gawk ./gen-lock-obj.sh
+ #
+ 
+-if test -n `echo -n`; then
++if test -n "`echo -n`"; then
+     ECHO_C='\c'
+     ECHO_N=''
+ else
+-- 
+2.11.0
+
diff --git a/srcpkgs/libgpg-error/template b/srcpkgs/libgpg-error/template
index dbccf9aecf65..309860f3f5a7 100644
--- a/srcpkgs/libgpg-error/template
+++ b/srcpkgs/libgpg-error/template
@@ -1,29 +1,22 @@
 # Template file for 'libgpg-error'
 pkgname=libgpg-error
-version=1.41
+version=1.42
 revision=1
 build_style=gnu-configure
 short_desc="Library for error values used by GnuPG component"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://www.gnupg.org"
-distfiles="https://www.gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${version}.tar.bz2
- https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=blob_plain;f=src/gen-lock-obj.sh;h=13858cfbf6c5f69f5f5fd64cd6fcc6a6c80eca3b>gen-lock-obj.sh"
-checksum="64b078b45ac3c3003d7e352a5e05318880a5778c42331ce1ef33d1a0d9922742
- 83892a9ebe3e19e8fd754a7ad02b6c81240e64554aab6490a4ea5aa36ea49a81"
-skip_extraction="gen-lock-obj.sh"
+distfiles="https://www.gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${version}.tar.bz2"
+checksum=fc07e70f6c615f8c4f590a8e37a9b8dd2e2ca1e9408f8e60459c67452b925e23
+patch_args=-Np1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends="qemu-user-static"
 fi
 
-pre_configure() {
-	cp -p ${XBPS_SRCDISTDIR}/${pkgname}-${version}/gen-lock-obj.sh ${wrksrc}/src
-	chmod +x ${wrksrc}/src/gen-lock-obj.sh
-}
-
 post_install() {
-	rm -rf ${DESTDIR}/usr/share/common-lisp
+	rm -r ${DESTDIR}/usr/share/common-lisp
 }
 
 libgpg-error-devel_package() {

From d0f94c66c72d658c597c4ab1d2515c2a9c6ce762 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Tue, 27 Apr 2021 09:39:04 +0200
Subject: [PATCH 1790/2024] youtube-dl: update to 2021.04.26.

---
 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 e98055f1c8af..90f696378b97 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.04.17
+version=2021.04.26
 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=75eff59a6a81708e1bf075f1a46cea4058694c286f154a35ee7d6dd760da0e42
+checksum=4ccf21f4a0daee0d58bef569c71dd459bd1f629248995b4e4856b6926531ea4a
 
 do_check() {
 	PYTHON=/usr/bin/python3 make offlinetest

From 8a1083afe545237dcffd0c2026e674dc8ee6cd4c Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Tue, 27 Apr 2021 09:45:02 +0200
Subject: [PATCH 1791/2024] hdparm: update to 9.61.

Closes: #30541 [via git-merge-pr]
---
 srcpkgs/hdparm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hdparm/template b/srcpkgs/hdparm/template
index 7b4ae3c99857..f742d1e42891 100644
--- a/srcpkgs/hdparm/template
+++ b/srcpkgs/hdparm/template
@@ -1,6 +1,6 @@
 # Template file for 'hdparm'
 pkgname=hdparm
-version=9.60
+version=9.61
 revision=1
 build_style=gnu-makefile
 make_install_args="exec_prefix=/usr sbindir=/usr/bin"
@@ -9,7 +9,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="0BSD" # Upstream is very unclear and names their stuff 'bsd-style'
 homepage="https://sourceforge.net/projects/hdparm/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=8397739c73e44d5ab96c4aef28fa9c0147276d53a1b5657ce04c4565cf6635cc
+checksum=da1a1c3887f10b8397e8e02013caa61142e0e72cb0d73997421ca2f2f4df5343
 
 post_install() {
 	vlicense LICENSE.TXT

From 6d3af6bd471e3e5bc7ae7d7149bfef40923173c3 Mon Sep 17 00:00:00 2001
From: biopsin <biopsin@teknik.io>
Date: Sun, 25 Apr 2021 07:24:04 +0000
Subject: [PATCH 1792/2024] firefox-esr: update to 78.10.0

[ci skip]
---
 srcpkgs/firefox-esr/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index 61f36d2058e8..fbd9ed2fb8ec 100644
--- a/srcpkgs/firefox-esr/template
+++ b/srcpkgs/firefox-esr/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-esr-i18n".
 #
 pkgname=firefox-esr
-version=78.8.0
+version=78.10.0
 revision=1
 wrksrc="firefox-${version}"
 build_helper="rust qemu"
@@ -22,13 +22,17 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/organizations/"
 distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
-checksum=1cf2dfdee2e31fd0a5ecced6275a33fa11bee1d2a7c65e23350b26992584a110
+checksum=979141a6d94bbe303815e9cd1ab1d23b5ce2f9c77d9d5486871eaecf0ea2df40
 lib32disabled=yes
 conflicts="firefox>=0"
 
 build_options="alsa jack dbus pulseaudio xscreensaver sndio wayland"
 build_options_default="alsa jack dbus pulseaudio xscreensaver sndio wayland"
 
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+fi
+
 case $XBPS_TARGET_MACHINE in
 	armv[56]*) broken="required NEON extensions are not supported on armv[56]" ;;
 	ppc64*) ;;
@@ -37,10 +41,6 @@ esac
 
 CXXFLAGS="-Wno-class-memaccess -Wno-unused-function"
 
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	makedepends+=" libatomic-devel"
-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 cf6ed90f6e5a1af44bab7848cbaeb16b540b8771 Mon Sep 17 00:00:00 2001
From: biopsin <biopsin@teknik.io>
Date: Sun, 25 Apr 2021 07:24:54 +0000
Subject: [PATCH 1793/2024] firefox-esr-i18n: update to 78.10.0

---
 srcpkgs/firefox-esr-i18n/template | 188 +++++++++++++++---------------
 1 file changed, 94 insertions(+), 94 deletions(-)

diff --git a/srcpkgs/firefox-esr-i18n/template b/srcpkgs/firefox-esr-i18n/template
index 5d62a9f8a99a..db026b7334d4 100644
--- a/srcpkgs/firefox-esr-i18n/template
+++ b/srcpkgs/firefox-esr-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-esr-i18n'
 pkgname=firefox-esr-i18n
-version=78.8.0
+version=78.10.0
 revision=1
 build_style=meta
 short_desc="Firefox ESR language packs"
@@ -135,96 +135,96 @@ _pkgtmpl() {
 	}
 }
 
-checksum="7f0782919012140a2eb30fe22b011b2a9c43248ea1037a8bae85c18e68e4285e
- 25387a38fc9fb8aded62119033b98b72f8c8229e90dfb7403352d578cc6528cc
- ab375580808e6f4599f4c2c0643885c33f5863eacfb966c05984165c4c5a7ad1
- abd9a55274de8aedab52164dbb61275971f81e454dae9e6f63c5b3545da91c3b
- e3e2758c38736c05855ea61dc9b54d3ea4830cce5441cb5121022c7996ec1759
- e7efd2e42c4c8f858e85b0342e1179d0e7e3f2e3c8fc815a9fd37b25030a4869
- 64579e748d87dc1eb63fea3bb00408759d48ba3226e66afcbf48c554fe32dc0e
- ab898e74b67d0e3dd39a516b7ee642050847b03512b59461a7dd7077e8719e59
- b3355aeb801c41ac1a4dd70f1c26ef440ef5e7f85b1c52ef1517d99544f5e614
- 7ce0eba825fa22519c2ec15db24321cdd795c2f086d5c35861e1c36693cf15a7
- 6645dce4ba62d3e4fb387f572dd56c9c794148d9f08aeae3600e2f69073bc6ee
- d4cd2b9edd691962f6e579ea59525d8756a2bcbaa08f180efd9725b82377c8bc
- 061d0023fcb04bd93fcfa72c8d4b43614bb2037eb6feccaa7ef889ceff2598c5
- 360dcd18c92376fe36261ec8fd338fc2c1d2142e3f2851d26d2f6c66a28438a7
- e1774876227de045ef25d5618a22be81c2990259726ae1ebdaa07667de5b73a0
- def26117eef49e2cdc340527d8e6712803b0da5d729574ffa82789cc1de94a8d
- a50344da84226cc163d72e9c50e8dde9d1f73598b9a0dd3107dc0bda5728de70
- 2b52d1d1809bfd704e130fccf229b9e01d14cb012de14ad84508ae516be6f0db
- 5894674b57a0095e4d0173f5ad7a7f34f69a89f8bcbae74ce304ed38613231fa
- 092f137b5155b599f2dbd1c2dd3c69877222f43628633ae9ff6b684b970bbea8
- 72038ab140d7e89ff17f2b498dd8ae3c872b3dc846038c4d68ac742d6b5a4229
- 6cf32136e9d634fa5bbc4f5f7dedc0b20ad7f3138e9952b5a28a98f46c8b6d02
- 37230145ed4d4c60798f4c1562bef24645af563b387f7df27684b4aa946c35e7
- 5d7c57b5a1a361deb43eb7990adb7a3f40e5dd65799e814a99707b4556e7c353
- 1613ce3a8fc3696a2cb55eb179ee563236388755065ee102c238b88c6b523983
- 4c27a15f06f72aed3e95f32eaee8eacfa9bebca54ee7bf9615dbd4725101bbdd
- e1c659fcbc02435e5f4e99c5d0b0efc94809b26010ae448165246b8f6fc8eb56
- a3f23e82e18cf9fed95e56feea74ab39d46fae2c9cac5208ea24fae2b098600a
- e7f9aa97ddc952f61cfcfc5e85400fce57a3a4ce58d883d1412c84bd351450b6
- 1fdc53d91df16e7ccd82aeb94ca75620e74160b86db89288067d7e3557ebd476
- 6b5820aeaba3307743adc13df898f6136e349f085d50d69aa4542a35ef8a4956
- 8a1314cbd61b1ddcc0a1b048c9cf6a73a17bc44c7103cdc3f3befe5c3ab8c5d2
- a672cd6fe8e193441a9df8ce900727c41a92ccec0b402b18539c5fb0fbd316d4
- b6aeb12ae4ea45bd344fd1763f15a3ce5e6a69fe3f0a5644ebcfc35b246ba544
- a57253a35ad63f78c4e4a53477b52a3c59feee1003c8e7376ae03a6a5ec7035d
- 9e64eaa8fe170ae8ada477cf9f68aca9e3a0c1a45cbb8ac05f27fcb21b86abc5
- 69d8297a877a44836bff65af73218152b7bf0ed796996b020d1101af54b0d8bd
- 93422ec57211be52fb9d967beefc8e56aa1de24b80a3ae7ce8e331a6fcec2e74
- 8eaddc78b47e54e52b4d86c7329f6ab923909a8202694c32bf069a1899d4dc55
- 25d33eb6d9a6c401ac9bf608a8151fa408a654cd737aab07273a132db3b60be7
- 8e6e17c9760a93d53342bc3d6257ac30f11477e3f8b9a9f752f8d9adf26550dd
- 73e51cc2f87b13efb074d98e5c8148952e5379562a7e73ad9cb36ca374b1a6b8
- 17c5d45278fba93625fd9d00eccbfd3c739923a30873050ffda8f2ae12df6a86
- c4df8dd56ebca61488ecf55fb893f5cbfa2600249b45e382a8a0a9d9152ae704
- 29d4e5587319023c7f1490ae364be792ffea6c8a70003a87d1d68a5deafea660
- 9a0f31c479973454eca83c3e0e00cdbb4fc99f2d933bdc07bd0040d2c11d6ad2
- 7fc60239662a92e17d1d98e541468f09e3d11c7d6782caefc66a7af9b36a4c38
- 357d06e25fd60cc71a4099bfa5f1105b49a9059748fa5918012b7bbe481aca4b
- aa7678ed21dc12960e1caac3a0cf4a096297f98f125f9b723da1718b366bd213
- 8370f53002d8606b5fd535832347a5392075df802f62512f6e9db0cf6697978f
- 3fe01327107ea48bb372ecd940f6e3bb5a317d517ccfef1e3e4db0d64e68d022
- af0b696bc5c16de8b285d889bbae049a087469b4dec330b1179c0e0e4a566da4
- 05c56f48e1b523e7e5cc37b31870347f7d8139a7ca678d6208f2ee56b40cdd92
- 5b000fe576ee76c39762c864a74d3d1b8cceb764f79b679a5ba293ac6035d39d
- 91a9c4c3bc53412dc839c59effa82e329848f2021cef5cd4ad9f66a0379baa74
- 3925fb837da23f0082fcb645f153e7832cbda5e7298427d2cedd87ca438f5e6e
- 98e7ae2a552d020820cc28e71c59fc17650589c5df58817b98d1a32a651b1731
- 6d30e58330e3fc166003a8d6899f0c310c654b5fd8dfe7f0f7fe3e5592320b13
- 4409a6110b26dee020222f3fa62c2fb7a05c80a2529afc039163ddb839a94851
- 57a59face2e0a28792239fca9d973341fbe915dc3ef44fd14392c22d34ed5c59
- cc7cc0492a45923b4b716961152774bb4757506d07c147af013e6b19ab60db53
- b49316db77d0ab229c2ff8cde3e12c664900d01544d45dc421d39a1917bd3bf4
- c4fa2099b45412fc6d2c230862a6dd94121ceefdc5adaca9ac31417e18ce4ee1
- 6bc73fa7897b2fd0017294293eb3b4b718917f2b2c281d6ac500002c70774ba4
- 2c718b8646ad8b79929df9f49aa520be0884fdcf58ed13f1fcf60bea089cad25
- 58062ec5f74f5157c3fea735e838733cbb4dc2fdeba841eefb1cf01971cfcac6
- 07aae280e3d7a2d5f8a56dc1ec59af454fd3a3e2f67de7620bfedeab2df63747
- 1b873373b1bdaccf670f1ea3fc791dc54b658e334bd4cbf2ddd83ad47366b19a
- 855fac5cd2207307242348c031c52a9c108f11b32bc52d2ae6e7dbdc4f8e4cef
- fcb1a530764c3249cc834402d3ec2c2e34d0f0ff4843f0d25111b66c98b531ce
- 56990cd4e5be208f326833c55c5c7f02b5a417a7659c8dab47242f2ace7f7eb5
- 556ef6257e3273caecf779cc2d2cf2bd5e4fdf7956e1754adf3e71433d08a393
- b5187594fbbf654c944cda8be3f16b179d073e72b66285186ea22fddff5160b9
- f4add1da3f3de9b71acfdf19ac6e7872a78d2dd02161cca9dcefaeedf78234a6
- 788cdc6760bf43898819378597fdafe6715a192cb81ba5b1b011fac9275e9c2c
- f78ccc32a5c154af1e0fe59b9aa501b12b4d0ad8c3013492ffa6e0ce7752ddf5
- 1bb9968d140fbbea0ce0be266255bd6695099aa875412eb9c10bfafc078c68b0
- 3a65e9f5c6d56248fab29a7d512bfe78ff39ffe7869961157f56bf48e8bfe1d1
- 81e749e6cae036fd5b2c93ef826426277294662c6d34e1e5d6245c35c523ba8e
- e437d9e94bf4bceec2be8a50545de83d47825eda8eeb8756743c63734c1bcdbc
- ca9e8a120a8308375ae02b416a0d019f50ae423535e3da7b687ae097b63713be
- 9330f2860e7c11c6189d25197d0fad07da2a06a42c145903196705f2da75db67
- c3230128f9df010390d0ce29e886c7afd8e1e4471e5ffd863c3a3ecb3b7b18e2
- eaa24f8bcab9933e8e51dda52bcbe0c9a186c99ab73c8f0402713c8327a2b0fc
- 4ee297dc895a92378068fd51fb8d2eaa02e0067216549ad28520568635bd0e5c
- 2ac679a8d6e40db227f07b8598e4dc4abede0f7cdfb9a79249832b89e9ada5dc
- 83e5282025df6b591da40f3f20f4c41adaf9bc8d8903c5729d02f2ccb0d49ecd
- f8eaba78a6cb08193e05fb247144a2ce0e9d41c209fa19ebd1995a7ac531a055
- a3afb00ab3a494702ec5396f7d95c342472a93d31f5b406f37f0e75f4d8553e2
- 7655e926b6b82227d1bb8eb41eac3160e43591c6c6adfeb1e967d28bc2c2dcad
- dda55049cfed59a6a12ca986a47390c62ff3c34e82846b6769b7898cc162d95b
- 8d513578c69e9971b4a9ba00d9def9de83c851200d38df791f7ee7f4c42a4bb4
- 968ee7ab12abb69035d97e5481a4daa052debf9097896e775c3e49a52b5c56e0"
+checksum="52a18b0f03c8e32ebe65fd35b35580c052f0a6d664b03ff7158d7092ec9b7ecc
+ d465e0bc4e4435430a0dc46f4b6da3d89671980f5f15a775acd7fb0cbfc72ca5
+ bc4b59a18b6dddf2346dc3035071558385f2531bbfc2ab2ba4c4fce8ff06ee73
+ e69896e629f334c423e9e0a4fb88e32140b2e78edd6f8e80d83a55cc3213ce03
+ 96656c65318bd915ea2bb50c18641f5817a69dfa2858887afceedbdcfcc88273
+ afc068cd1a5ca56f2e5423712b1ffd9dbbd6dca620ebc74cc8d9765fb10c7cf8
+ 28b79b454cc4711799850dc1992489317e744a6d393b177b28a6adeb101f9b5c
+ 3c6b77c4e45b721bf9366c6e6f58bb744ed02803d4485e645ee33e061900276d
+ 46aa1fa5e978ce477d653f0b111b9f633721ec9624ea632f05a17cee25b8fbfb
+ 82ea2890a3e71c59c20920f16875cfc30010bb665cc057b4b637ebdc3707684f
+ bccac87fda10872668bd0516eefc45ea654cd0ea00bf540e9bc716a3672cffcc
+ bffb69a6aa95739dbcc57121f5f7d19e87686d283dc9fa776be6766d47562ec3
+ cffc9925ae05662e0c80d97d665dbe0039979ca3e56c971f5ac85fa4d3f02e76
+ b61fbc2fb817c51656f66d43e95de4f9348f085e1dc2da1f372ce91ece801882
+ a1a3e68500ea4adfccf17438e31dcf895a64b822ca1e5d57b957658cd11dc5f4
+ 9042f2976ac86dda964c4660947bf48610d6323a4b8401783d79c0246d5c59fb
+ 774a70486ff675fba9c168d94788e123e180ecc49bf09d70a8658589b96a6062
+ c9a50baece491a34d3684df5ba7adb36ce290226fdf154cced3ced0600eb2552
+ cc7e83f009146fdfef41ff8ff74c26f99521675a593ac762f612d1767b441233
+ dfcec6dccf25b3198a6291f59b6e59caf753f1515750c75a9370d8a786481bcf
+ a9eda22d8722bf4e5fb3daf2e5f45eed36f217e95b923eb5281f4fe182b12032
+ 83f81d426b6d57b216738701759aac0523599d99ca1001da29452f39c7549a3a
+ 4e7d77567efcab3713556e3db86132c900ba551d74b08195276ce9c36935259a
+ b2909209b20fc86254f3616a5f5093f563c534dec87b402fb779e210a1fe0602
+ c25c76ac63b91f6dfa066071c320e550161ed2a61f7db6c1edbf224af0ebdc03
+ 4a6cb89ed9433852e3f6be678bf74b28bde1445de6e2666c714e3833bec023fa
+ 6a15e0017f80a7ba0a009ad33be65eaec9dc2a325a73b38b5d19df16d7cb8252
+ 11a29f31990ac5f444b3df4a17573ae9f48b2256a971cf83fdf512b4d6075a98
+ f3aa6226f97018a4255253367252bc052b283cbff8c2bd90968baaf94a9ff3f1
+ 1b92d6145a9e2d32437e29cae12632eb2302903a028104c9cb06a45724eef9fc
+ 3488d9160b67794a0ab7bc35d54578bd94097304186d0b31ea5667178d02a99c
+ 55cf76466291a1496d5f830aa0257292271284d6ee044e9bf95465105e29049c
+ 8729900ea584e49ee1a3462f17337a4d4ecc0711e6320d6119dfa9afb7d0f231
+ 39269840ec90a26b3a822a6d78db6aa91ada31da7fafa15611cc20d884d715de
+ 3c93c3dc040a8b8a9330ef0e86ed4c9b4528fb7b1aebad50fa8ea5e188dec3ab
+ d522cec4bfd17cb578749e84737e1bbde5949d39a824f8338708010b67a37677
+ 4fe1dc98e52ce963a1e97b5af821fdbe300b3ffee85500d0017315b1dfdd92d4
+ 179d75e4e64d10d78c5e02e083b627890341e466c7ed543b17c1d1d23ab8c1bb
+ 3cb3453ee615021d7748daff3bd0420e5df6d457be6ef651ea569a9c08baed0f
+ 9fc6c427029e963a82b87cc8ae2581b3c1b540f3347c8af758de959143cd4893
+ 1692f45b2b989f4d4c9b9ce44748026041cba1f98ee99c99cdd2d5e7b1132a15
+ ac4cdf0d291ccb9d80afd527b18bd2c665c70354cb411691d4c7472930ba6471
+ 64b0d17fdbbf71250385bbbeae689728d3789d30696a9055bbbd1a2b990538ee
+ ca3890ec82b71b03dc4b5f4544bf2172cd0934c3b4ba77bccc555bb367b6b5df
+ 04eb3e7efa149b4f56135ba11aba79183511423370fc9637171a3a249591aa8c
+ 9d871c5027cc3621ef6ccd5607a3bf79c8c79ef3b5a9362afc822b6b292a5ab6
+ 3fa67e4c9b91a0036414c57d072826dbbf6ec50ef0e74ebe57c81d19e8d79d4f
+ 4b15970422169f5a03bc4cdd16acf1858d9d3f8ebe743056872abe94a5524973
+ 7aefe8cea46ff5b0db6bc417ca08236ec497fcbffb17815bde527ef2d9e07072
+ 3cf67fd6a632235193b2afc48c77c76000a1da92d568b9bc7747abe44b674ff1
+ c587d086d5dee92a7ebfcba8b53fd9476177816fe18c25686d7620b50087c76f
+ c03af098290c82d18c4a76457e64261cf20095a1a589e2ca0bf826a6d1daf6f8
+ c661f28dfe22a162cbdb54fa18566611c8b6fe67a69efe947214a142cff5b727
+ ae9ebbf068a3f95a3a58cb425fbb5c7027403aa7a9bba1f9a85a7c185f774fae
+ 9db037950c2fee22259f48922ec9b48e6fe245793308616c09dfe1faa41f8265
+ b0705c96af1624042a3dd7f5177c22ce7a5196e35cebb21a8c47182ed01f1626
+ 547da5b3f6d638b00e677379948956f39c4ef4455d8d53e1140c6e5e5cd9c043
+ 2fec28c806f7b67cd2dc8b8dedfd3d6fb94ac1d125c2c9c4d9e5b1865a49d2c4
+ ac9c1cac64843844d527e17e0a122a1eb4879a0a562d74380bce9d84812bdc8a
+ 10de5e643b72ef582acec3abd2301033884b52c6ee085f4740cc6dbe42053ad6
+ 29ee5a0c5d9d2635b9729c67a2628e406d6f138a3015f529af908de57c62f9a8
+ ac8e4a204cd7675c19be0f714a7c66fc61c9b43854e6a4f5c906dd4395b138b8
+ b2949a790c321633d827abff60dec5c8c0b5f4e049daa7f8352b9d2fd79b92e1
+ aafb502de49c5dca19f44134d2c2925d1eb271a5aab458158fb45fe2597e2955
+ f34211872382eca744aad54a980e1214ef5b2fb8cacb0c5524390565ea5352ce
+ d770fe882698b42548f6b11cdfa1f3f7705026c4d8465af2a262658aa3487ebf
+ 612d7721320c8f3263ea0f6a958bfc7ec3a9d4a3a3efccf333a61babd1d7e6c3
+ 56faa0492325e0ed8fd44d7e02127398caf7fa97798ab4295c52b16ac3be4b08
+ b648f6bd110b016786bc4d8bd87cb25fb05e0b1b274c40a1494e399c01c126e6
+ 7390155c8c575ea56bf0f92d4ea97d5bf70735a2345f0b5644d6d5de234fd745
+ feae5d7ff4165bc9b65a9a95455f13319bbe4bfcdce74b3c3119c02683f6e38d
+ 2c6dc858852c9d9ebfeb437a5a6e6eae53e1470bff25b7aea97853df57f74eac
+ ee0ee55a9dc6dce88adca93ccde0115af305a24f31c7d5110dcf47886c4fe44c
+ 1111a78e81d32fb717ac6d57ab661c77dc4d69c007235a66eeeaf85ee1dce7b3
+ c7a17cb9681cd83c577cda30caea294eb95878cbe46323c116523e40d1796a4d
+ 81a3a01fe39ebdaa736e46dfc42043183cb2084821bea5be00f0328ab657fba9
+ dad65dbdc29efde82689bfea94a56f4c9c1a81f490162e420ab7eaef0ccb3f10
+ 4f3a6e62e45b5589c3e72249d8fdda32e741d9d6259b4c184f4068ab14fbe56c
+ 956728a3f34efc88b1651426059808e56f5e0a9f91d435ed89e680c4d588031d
+ 47e5edf1cd2681649799c468d353577b95587f6689197277a5d7f28570b8255c
+ 798fb7cd52ed2d7812e9d6e080088814666ea1f2da5a917ab62430f0c6e07533
+ 40e3f0117c511c0e4df85fa69ec7d56bd4ef7f7e2b218b7c60c3a3c5653cf12f
+ c9da58427e33a0b3d562e922cbbc925fb7253b25772b1a93cfe3dedbd008c25e
+ 2901fde41a204fdc16554e58b0cfe57de70d46225ae89bd7a5a07a2aadc4f0c9
+ 3da1eac5979817f642c08c874a78cb92e83f0039d10df58795119bdfae69c7a8
+ 0c027dc38f08b18d4b3ebd0c6ca7829f6173b8e013836d01e561a1edae1ad8f4
+ b11f676363b18162ad09544e0ad5169d386812764e52af6bf85d0973e41f0ecf
+ 79aa1438995b4e4b306c920eb114440e7adf0e4ddeac3e664dc0af2f294fdf5f
+ 8ccc5f4db495440a27900b16977515d7327aba825816749b1142be8a9eb1a749
+ e61ec2b783a7e5da560a3987f14036bb715ebffd84b2b93ef149e10c1fd52ba5
+ d832133312870f5511905811707986c13619ac6b0aac4145f6f405ac07161869
+ 36ad24b7a2a7ff99ae9407135cb42865d974ba2dc3caa8ff11d1f525879225d8
+ f599a4b43b0f6ba05b832139c89c0a8a544263cdf56d8a07fb8b8e105f3630ee"

From ae464228e4f88345900bd957d3a9c3d85ec92158 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Sat, 24 Apr 2021 18:15:21 +0300
Subject: [PATCH 1794/2024] lmdb++: upate to 1.0.0

Move to an active fork
---
 srcpkgs/lmdb++/template | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/lmdb++/template b/srcpkgs/lmdb++/template
index f1d8add382ef..1b4a6b5b747f 100644
--- a/srcpkgs/lmdb++/template
+++ b/srcpkgs/lmdb++/template
@@ -1,14 +1,15 @@
 # Template file for 'lmdb++'
 pkgname=lmdb++
-version=0.9.14.0+20160229
-revision=3
-_commit=0b43ca87d8cfabba392dfe884eb1edb83874de02
-wrksrc="lmdbxx-${_commit}"
+version=1.0.0
+revision=1
+wrksrc="lmdbxx-${version}"
 build_style=gnu-makefile
 depends="lmdb-devel"
 short_desc="C++11 wrapper for the LMDB database library"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="Unlicense"
-homepage="https://github.com/drycpp/lmdbxx/"
-distfiles="https://github.com/drycpp/lmdbxx/archive/${_commit}.tar.gz"
-checksum=93721132bbf5045d38ad62de2997655e9984c48ea5c9886746d42128f4b26fbd
+homepage="https://github.com/hoytech/lmdbxx/"
+distfiles="https://github.com/hoytech/lmdbxx/archive/${version}.tar.gz"
+checksum=5e12eb3aefe9050068af7df2c663edabc977ef34c9e7ba7b9d2c43e0ad47d8df
+# Check links against libsanitizer, not available on all platforms
+make_check=no

From dcdd8753a0c9cc0bea56f721771a3b9a0cbd2cc3 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Sat, 24 Apr 2021 18:11:40 +0300
Subject: [PATCH 1795/2024] libunwind: enable c++ exception handling

Exclude x86
---
 common/shlibs              | 20 ++++++++++----------
 srcpkgs/libunwind/template |  8 +++++++-
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 4e69b5ccb4ae..140a3893f942 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1318,16 +1318,16 @@ libjsoncpp.so.24 jsoncpp-1.9.4_1
 libesmtp.so.6 libesmtp-1.0.6_21
 libcaca.so.0 libcaca-0.99.beta18_3
 libcaca++.so.0 libcaca-0.99.beta18_3
-libunwind.so.8 libunwind-1.1_1
-libunwind-ptrace.so.0 libunwind-1.1_1
-libunwind-x86_64.so.8 libunwind-1.1_1
-libunwind-x86.so.8 libunwind-1.1_1
-libunwind-arm.so.8 libunwind-1.1_4
-libunwind-mips.so.8 libunwind-1.1_4
-libunwind-aarch64.so.8 libunwind-1.2rc1_1
-libunwind-ppc32.so.8 libunwind-1.2.1_1
-libunwind-ppc64.so.8 libunwind-1.2.1_1
-libunwind-setjmp.so.0 libunwind-1.4_1
+libunwind.so.8 libunwind-1.5.0_3
+libunwind-ptrace.so.0 libunwind-1.5.0_3
+libunwind-x86_64.so.8 libunwind-1.5.0_3
+libunwind-x86.so.8 libunwind-1.5.0_3
+libunwind-arm.so.8 libunwind-1.5.0_3
+libunwind-mips.so.8 libunwind-1.5.0_3
+libunwind-aarch64.so.8 libunwind-1.5.0_3
+libunwind-ppc32.so.8 libunwind-1.5.0_3
+libunwind-ppc64.so.8 libunwind-1.5.0_3
+libunwind-setjmp.so.0 libunwind-1.5.0_3
 libmicrohttpd.so.12 libmicrohttpd-0.9.48_1
 libmicrodns.so.0 libmicrodns-0.1.0_1
 libgit2.so.1.0 libgit2-1.0.1_3
diff --git a/srcpkgs/libunwind/template b/srcpkgs/libunwind/template
index 3ef73d90d5bf..d4819ce54acd 100644
--- a/srcpkgs/libunwind/template
+++ b/srcpkgs/libunwind/template
@@ -1,7 +1,7 @@
 # Template file for 'libunwind'
 pkgname=libunwind
 version=1.5.0
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="libtool automake"
 makedepends="liblzma-devel"
@@ -14,6 +14,12 @@ checksum=90337653d92d4a13de590781371c604f9031cdb50520366aa1e3a91e1efb1017
 
 CFLAGS="-fcommon"
 
+# Enable C++ exception handling (doesn't work too well on x86)
+case "$XBPS_TARGET_MACHINE" in
+	x86_64*|i686*) ;;
+	*) configure_args+=" --enable-cxx-exceptions" ;;
+esac
+
 # LDFLAGS is necessary because libunwind.so itself uses getcontext/setcontext
 case "$XBPS_TARGET_MACHINE" in
 	i686-musl) LDFLAGS=" -lssp_nonshared" ;;

From 8651b8aeeafffcb2ca76a8b4d2c5028a91f7ce42 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Mon, 8 Mar 2021 13:53:11 +0300
Subject: [PATCH 1796/2024] mtxclient: update to 0.5.1

---
 common/shlibs              |  2 +-
 srcpkgs/mtxclient/template | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 140a3893f942..0774539703f9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -416,7 +416,7 @@ libField3D.so.1.7 Field3D-1.7.3_1
 libMAC.so.6 libMAC-5.28_1
 libmad.so.0 libmad-0.15.1b_1
 libmatroska.so.7 libmatroska-1.6.0_1
-libmatrix_client.so.0.3.1 mtxclient-0.3.1_3
+libmatrix_client.so.0.5.1 mtxclient-0.5.1_1
 libebml.so.5 libebml-1.4.0_1
 libdvdread.so.8 libdvdread-6.1.1_1
 libdvdnav.so.4 libdvdnav-4.1.3_1
diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index 5c5806d3cf7d..35f3d4a10f42 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,17 +1,17 @@
 # Template file for 'mtxclient'
 pkgname=mtxclient
-version=0.3.1
-revision=3
+version=0.5.1
+revision=1
 build_style=cmake
-configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF -DBUILD_SHARED_LIBS=ON"
+configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF"
 hostmakedepends="pkg-config"
-makedepends="boost-devel json-c++ olm-devel openssl-devel libsodium-devel"
+makedepends="boost-devel json-c++ olm-devel openssl-devel"
 short_desc="Client API library for the Matrix protocol"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"
 homepage="https://github.com/Nheko-Reborn/mtxclient"
 distfiles="https://github.com/Nheko-Reborn/mtxclient/archive/v${version}.tar.gz"
-checksum=e4899cc4ce87397de2aef865e94ea2cdb8d9cb86253727e7d90532b925ecc770
+checksum=9478d870296ebe7679c90f563cb798eb3cdd3f9c4578ceea5af75b66f456baaa
 
 post_install() {
 	vlicense LICENSE

From 50a5ea52527bef0bb03fb895e011191c0e65f893 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Mon, 8 Mar 2021 14:15:14 +0300
Subject: [PATCH 1797/2024] nheko: update to 0.8.2

---
 common/shlibs          |  1 +
 srcpkgs/nheko/template | 20 ++++++++++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 0774539703f9..3c7a6e7f8f53 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1132,6 +1132,7 @@ libgstbasevideo-1.0.so.0 gst-plugins-bad1-1.18.3_2
 libgstbasecamerabinsrc-1.0.so.0 gst-plugins-bad1-1.18.3_2
 libgstcodecparsers-1.0.so.0 gst-plugins-bad1-1.18.3_2
 libgstplayer-1.0.so.0 gst-plugins-bad1-1.18.3_2
+libgstwebrtc-1.0.so.0 gst-plugins-bad1-1.18.4_2
 libgstgl-1.0.so.0 gst-plugins-base1-1.14.0_1
 libgnome-desktop-3.so.19 gnome-desktop-3.37.90.1_1
 libsecret-1.so.0 libsecret-0.10_1
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index dd635f70f249..a32ac2a6117e 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,18 +1,26 @@
 # Template file for 'nheko'
 pkgname=nheko
-version=0.7.2
-revision=3
+version=0.8.2
+revision=1
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative"
 makedepends="qt5-multimedia-devel qt5-svg-devel qt5-tools-devel fmt-devel
- tweeny spdlog mtxclient-devel boost-devel cmark-devel olm-devel json-c++
- libsodium-devel lmdb++ qt5-declarative-devel qt5-quickcontrols2-devel"
+ spdlog mtxclient-devel boost-devel cmark-devel olm-devel json-c++ lmdb++
+ qt5-declarative-devel qt5-quickcontrols2-devel qtkeychain-qt5-devel
+ gst-plugins-bad1-devel gst-plugins-base1-devel xcb-util-wm-devel"
 depends="hicolor-icon-theme qt5-quickcontrols2 qt5-graphicaleffects
- qt5-multimedia"
+ qt5-multimedia gst-plugins-good1 gst-plugins-good1-qt5"
 short_desc="Desktop client for Matrix using Qt and C++14"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Nheko-Reborn/nheko"
 changelog="https://github.com/Nheko-Reborn/nheko/blob/master/CHANGELOG.md"
 distfiles="https://github.com/Nheko-Reborn/nheko/archive/v${version}.tar.gz"
-checksum=412908fcec0e66a0557db5359556b65e85dd22b8644a6a2ed569a90dea4bde3c
+checksum=df4575c47daab47d418637a4637b599e3848dd749132ca1e92f981d9212eabb2
+
+case "$XBPS_TARGET_MACHINE" in
+	armv*-musl)
+		makedepends+=" libunwind-devel"
+		configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-lunwind" ;;
+	*) ;;
+esac

From 476eea537b674ebd286ee87214ce360f3d33f46b Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Tue, 27 Apr 2021 07:06:56 +0300
Subject: [PATCH 1798/2024] calcurse: update to 4.7.1

---
 srcpkgs/calcurse/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/calcurse/template b/srcpkgs/calcurse/template
index bfc9fe3f606f..aefd36d204da 100644
--- a/srcpkgs/calcurse/template
+++ b/srcpkgs/calcurse/template
@@ -1,16 +1,16 @@
 # Template file for 'calcurse'
 pkgname=calcurse
-version=4.7.0
+version=4.7.1
 revision=1
 build_style=gnu-configure
 makedepends="ncurses-devel"
 depends="python3-httplib2"
-short_desc="Ncurses planner"
+short_desc="Text-based calendar and scheduling application"
 maintainer="silvernode <mollusk@homebutter.com>"
 license="BSD-2-Clause"
 homepage="https://calcurse.org"
 distfiles="https://calcurse.org/files/${pkgname}-${version}.tar.gz"
-checksum=ef6675966a53f41196006ce624ece222fe400da0563f4fed1ae0272ad45c8435
+checksum=0a7c55d07674569d166c0b0e7587b2972d3da8160cdb7d60b1dbd2895803afb0
 
 post_install() {
 	vlicense COPYING

From 396c93d72c15f7c98d5159d60b5de609fe124fc5 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Tue, 27 Apr 2021 07:47:15 +0300
Subject: [PATCH 1799/2024] mate-session-manager: update to 1.24.3.

---
 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 f186ef57c31f..7be98f824528 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.2
+version=1.24.3
 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=6b0b9c0c4fe831e4f000e55a2ebb953cf2a83eed613faaf3e23c8beec42c8bc9
+checksum=90a0aec5b59b6287b4d2c4d452b0b6410f9d12490ca1f890e81ba2801bdab0a2

From 00aaa22b7886a2f4d12010de4cbf29e398c6057c Mon Sep 17 00:00:00 2001
From: Jony <maybe-one-day-ubermensch@protonmail.com>
Date: Sat, 17 Apr 2021 11:25:07 -0700
Subject: [PATCH 1800/2024] lavalauncher: update to 2.1.0.

---
 srcpkgs/lavalauncher/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/lavalauncher/template b/srcpkgs/lavalauncher/template
index b9fd51753b81..554c7d2b6c8b 100644
--- a/srcpkgs/lavalauncher/template
+++ b/srcpkgs/lavalauncher/template
@@ -1,17 +1,17 @@
 # Template file for 'lavalauncher'
 pkgname=lavalauncher
-version=2.0.0
+version=2.1.0
 revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=meson
 hostmakedepends="wayland-devel pkg-config scdoc"
-makedepends="wayland-protocols wayland-devel cairo-devel librsvg-devel"
+makedepends="wayland-protocols wayland-devel cairo-devel librsvg-devel libxkbcommon-devel"
 short_desc="Simple panel launcher for Wayland"
 maintainer="Jony <maybe-one-day-ubermensch@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://git.sr.ht/~leon_plickat/lavalauncher"
 distfiles="https://git.sr.ht/~leon_plickat/lavalauncher/archive/v${version}.tar.gz"
-checksum=6aa9d6fe189f658dabb709c1902454ebaa7dace8259d39c2256397657a411f9b
+checksum=4d51d857ddfc682cf7dbc4dcd60a776b6816610230afead4608fdd7693261274
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 		configure_args="-Dc_args=-D__off64_t=off_t"

From e46b0e4a60e7719aa0d64dc3556b11fa3c66001b Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Tue, 27 Apr 2021 08:11:00 +0300
Subject: [PATCH 1801/2024] osinfo-db: update to 20210426.

---
 srcpkgs/osinfo-db/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/osinfo-db/template b/srcpkgs/osinfo-db/template
index 61623edce241..6f5a598f0abe 100644
--- a/srcpkgs/osinfo-db/template
+++ b/srcpkgs/osinfo-db/template
@@ -1,6 +1,6 @@
 # Template file for 'osinfo-db'
 pkgname=osinfo-db
-version=20210312
+version=20210426
 revision=1
 build_style=fetch
 hostmakedepends="osinfo-db-tools"
@@ -9,7 +9,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://libosinfo.org"
 distfiles="https://releases.pagure.org/libosinfo/${pkgname}-${version}.tar.xz"
-checksum=7548ec09e445ca7378c5ceb99e39edca8857f8293831e0b3cb558f4230870e10
+checksum=66c93b4a5b319b2ff7d40360d9e94486a9a45f2c0dd1c30d4b31de4f223070d0
 skip_extraction="${pkgname}-${version}.tar.xz"
 
 do_install() {

From 7fffbe9936b3090ea0c101eb428edf48c8d34d2d Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Tue, 27 Apr 2021 06:36:39 +0300
Subject: [PATCH 1802/2024] element-desktop: update to 1.7.26

---
 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 2f6c753e247c..556b6504aadb 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.25
+version=1.7.26
 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="33ddceb3538b9bf5ae6104c14d01ea2148e89c689b24d724dd5e60182bf5fe95
- c38fc7e77c82c655457b244b0e7e5802618aa088ddbbaa9bae4db4185236b972"
+checksum="ae3c96f04dbdfc0f69d14399bfcb0a7f4b3dec2b5db62c09da02c427c57d79c2
+ 3a81a2ed8126f4cb286de312f10c84b11f9663658e126ffb1ae2d92b8d3c3a60"
 
 export USE_SYSTEM_APP_BUILDER=true
 

From 61de2a02f28d596956ac77344701a9c72829775f Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 27 Apr 2021 07:51:49 -0500
Subject: [PATCH 1803/2024] yara: update to 4.1.0.

---
 common/shlibs         | 2 +-
 srcpkgs/yara/template | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 3c7a6e7f8f53..bbe55668e47c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2951,7 +2951,7 @@ libbctoolbox.so.1 bctoolbox-0.6.0_1
 libortp.so.15 ortp-4.4.0_1
 libsuperlu.so.5 superlu-5.2.1_1
 libgosu.so.0 gosu-0.12.0_1
-libyara.so.4 libyara-4.0.5_2
+libyara.so.8 libyara-4.1.0_1
 libyaz_icu.so.5 yaz-5.23.1_1
 libyaz.so.5 yaz-5.23.1_1
 libyaz_server.so.5 yaz-5.23.1_1
diff --git a/srcpkgs/yara/template b/srcpkgs/yara/template
index 668ab97b1a7d..9fd7c4eb4b31 100644
--- a/srcpkgs/yara/template
+++ b/srcpkgs/yara/template
@@ -1,7 +1,7 @@
 # Template file for 'yara'
 pkgname=yara
-version=4.0.5
-revision=2
+version=4.1.0
+revision=1
 build_style=gnu-configure
 configure_args="--enable-magic --enable-cuckoo"
 hostmakedepends="automake libtool pkg-config"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://virustotal.github.io/yara/"
 distfiles="https://github.com/VirusTotal/yara/archive/v${version}.tar.gz"
-checksum=ea7ebefad05831faf6f780cab721611b0135803f03a84c27eeba7bfe0afc3aae
+checksum=8bee0e16ce56335d88e33349783dba8957d02da3339fd04df577ff1d2fa811af
 
 pre_configure() {
 	autoreconf -fi

From ca1cfd92d8cb8485d3c3334693f508260f5219ac Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 27 Apr 2021 07:51:59 -0500
Subject: [PATCH 1804/2024] python3-yara: update to 4.1.0.

---
 srcpkgs/python3-yara/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-yara/template b/srcpkgs/python3-yara/template
index 8235913d2774..d3c42f7fa06f 100644
--- a/srcpkgs/python3-yara/template
+++ b/srcpkgs/python3-yara/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-yara'
 pkgname=python3-yara
-version=4.0.5
+version=4.1.0
 revision=1
 wrksrc="yara-python-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="http://virustotal.github.io/yara/"
 distfiles="https://github.com/VirusTotal/yara-python/archive/v${version}.tar.gz"
-checksum=2c99f3858eddfd0efa179b0713df3df95912eb5323c44a1136dd3e17dbc954da
+checksum=4bc1a69bc9c5f70419806e15a05123a7879456b52a9c50832c34c22eecb4de81

From 0d15e3590e41798c5835501299ddaab9d27fcdd2 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Tue, 27 Apr 2021 06:32:03 +0300
Subject: [PATCH 1805/2024] OTPClient: update to 2.4.4

---
 srcpkgs/OTPClient/patches/fix-cflags.patch | 10 +++++-----
 srcpkgs/OTPClient/template                 |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/OTPClient/patches/fix-cflags.patch b/srcpkgs/OTPClient/patches/fix-cflags.patch
index ae70f441538f..5474d055d57f 100644
--- a/srcpkgs/OTPClient/patches/fix-cflags.patch
+++ b/srcpkgs/OTPClient/patches/fix-cflags.patch
@@ -1,17 +1,17 @@
-Index: OTPClient-2.4.2/CMakeLists.txt
+Index: OTPClient-2.4.4/CMakeLists.txt
 ===================================================================
---- OTPClient-2.4.2.orig/CMakeLists.txt
-+++ OTPClient-2.4.2/CMakeLists.txt
+--- OTPClient-2.4.4.orig/CMakeLists.txt
++++ OTPClient-2.4.4/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 "-Wall -Wextra -O2 -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")
+-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2")
  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 f5af76e655a6..bea17c56a1e4 100644
--- a/srcpkgs/OTPClient/template
+++ b/srcpkgs/OTPClient/template
@@ -1,6 +1,6 @@
 # Template file for 'OTPClient'
 pkgname=OTPClient
-version=2.4.2
+version=2.4.4
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -11,5 +11,5 @@ maintainer="Ulf <void@uw.anonaddy.com>"
 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
+checksum=5b976782906f15e2a4e001d73909a05f6146010cea83d78e3ad5c850f4049da4
 patch_args=-Np1

From 73b82430f0059ded307360a9806f4b4b38524558 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 27 Apr 2021 11:34:29 -0400
Subject: [PATCH 1806/2024] python3-pytools: update to 2021.2.6.

---
 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 dcff93248267..079943789034 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.5
+version=2021.2.6
 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=a96eae85aad86fe63cefa06e6cd9f6dcf8e85bd9aab0fd00b7f381a6366c5776
+checksum=02160d723ff481349dae9c733477a34b04661190519cb1c84b985d549eee416d
 
 post_install() {
 	vlicense LICENSE

From 7c4cd25658768a15098e39c75d1481d655794059 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 27 Apr 2021 11:48:21 -0400
Subject: [PATCH 1807/2024] python3-scipy: update to 1.6.3.

---
 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 ca4f93158526..569c1ce07341 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.2
+version=1.6.3
 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=8fadc443044396283c48191d48e4e07a3c3b6e2ae320b1a56e76bb42929e84d2
+checksum=3851fdcb1e6877241c3377aa971c85af0d44f90c57f4dd4e54e1b2bbd742635e
 
 build_options="openblas"
 

From a266cb162ca6997be995e7b11a39d143f4eecb25 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 27 Apr 2021 12:14:12 -0400
Subject: [PATCH 1808/2024] python3-acme: update to 1.14.0.

---
 srcpkgs/python3-acme/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-acme/template b/srcpkgs/python3-acme/template
index 31f97a8d7ea3..ef4b0810aeb6 100644
--- a/srcpkgs/python3-acme/template
+++ b/srcpkgs/python3-acme/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-acme'
 pkgname=python3-acme
-version=1.13.0
+version=1.14.0
 revision=1
 wrksrc="acme-${version}"
 build_style=python3-module
@@ -14,4 +14,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/certbot/certbot"
 distfiles="${PYPI_SITE}/a/acme/acme-${version}.tar.gz"
-checksum=6b4257dfd6a6d5f01e8cd4f0b10422c17836bed7c67e9c5b0a0ad6c7d651c088
+checksum=61daccfb0343628cbbca551a7fc4c82482113952c21db3fe0c585b7c98fa1c35

From cd26b20d17527b5ab3c0780cd933edec31914564 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 27 Apr 2021 12:15:01 -0400
Subject: [PATCH 1809/2024] certbot: update to 1.14.0.

---
 srcpkgs/certbot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/certbot/template b/srcpkgs/certbot/template
index 2642bb26b35e..5390a48b71bb 100644
--- a/srcpkgs/certbot/template
+++ b/srcpkgs/certbot/template
@@ -1,6 +1,6 @@
 # Template file for 'certbot'
 pkgname=certbot
-version=1.13.0
+version=1.14.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -14,4 +14,4 @@ maintainer="Alex Childs <misuchiru03+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://certbot.eff.org/"
 distfiles="${PYPI_SITE}/c/certbot/certbot-${version}.tar.gz"
-checksum=64cf41b57df7667d9d849fcaa9031a4f151788246733d1f4c3f37a5aa5e2f458
+checksum=959ea90c6bb8dca38eab9772722cb940972ef6afcd5f15deef08b3c3636841eb

From e957c1e23038cba6772fb48b69c63cd0a94e7342 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 27 Apr 2021 12:16:01 -0400
Subject: [PATCH 1810/2024] certbot-apache: update to 1.14.0.

---
 srcpkgs/certbot-apache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/certbot-apache/template b/srcpkgs/certbot-apache/template
index f4a4e287c1c1..b67f362c42e5 100644
--- a/srcpkgs/certbot-apache/template
+++ b/srcpkgs/certbot-apache/template
@@ -1,6 +1,6 @@
 # Template file for 'certbot-apache'
 pkgname=certbot-apache
-version=1.13.0
+version=1.14.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,4 +11,4 @@ maintainer="Kartik S. <kartik.ynwa@gmail.com>"
 license="Apache-2.0"
 homepage="https://certbot.eff.org/"
 distfiles="${PYPI_SITE}/c/certbot-apache/certbot-apache-${version}.tar.gz"
-checksum=4b5a16e80c1418e2edc05fc2578f522fb24974b2c13eb747cdfeef69e5bd5ae1
+checksum=887fe4a21af2de1e5c2c9428bacba6eb7c1219257bc70f1a1d8447c8a321adb0

From 2ea79e06ac91f226ec00836f8abf31050625bed2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 27 Apr 2021 12:16:41 -0400
Subject: [PATCH 1811/2024] certbot-nginx: update to 1.14.0.

---
 srcpkgs/certbot-nginx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/certbot-nginx/template b/srcpkgs/certbot-nginx/template
index 189735143579..95c3f7dc013b 100644
--- a/srcpkgs/certbot-nginx/template
+++ b/srcpkgs/certbot-nginx/template
@@ -1,6 +1,6 @@
 # Template file for 'certbot-nginx'
 pkgname=certbot-nginx
-version=1.13.0
+version=1.14.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,4 +11,4 @@ maintainer="Kartik Singh <kartik.ynwa@gmail.com>"
 license="Apache-2.0"
 homepage="https://certbot.eff.org/"
 distfiles="${PYPI_SITE}/c/certbot-nginx/certbot-nginx-${version}.tar.gz"
-checksum=9e972cc19c0fa9e5b7863da0423b156fbfb5623fd30b558fd2fd6d21c24c0b08
+checksum=cc2a8a0de56d9bb6b2efbda6c80c647dad8db2bb90675cac03ade94bd5fc8597

From f4984f814cf6b3e5576edc2a96d4bfed0ab92a8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 27 Apr 2021 15:16:45 -0300
Subject: [PATCH 1812/2024] abiword: use enchant2.

Also remove gtk3 build option, we don't want to use gtk2.
---
 srcpkgs/abiword/patches/enchant-2.patch | 60 +++++++++++++++++++++++++
 srcpkgs/abiword/template                | 17 +++----
 2 files changed, 69 insertions(+), 8 deletions(-)
 create mode 100644 srcpkgs/abiword/patches/enchant-2.patch

diff --git a/srcpkgs/abiword/patches/enchant-2.patch b/srcpkgs/abiword/patches/enchant-2.patch
new file mode 100644
index 000000000000..bb0edcd4bcf3
--- /dev/null
+++ b/srcpkgs/abiword/patches/enchant-2.patch
@@ -0,0 +1,60 @@
+Upstream: https://gitlab.gnome.org/World/AbiWord/-/commit/ae05e92df5a5d6151641622c83d35a6fdba47b1f
+Adapted to change configure directly instead of configure.ac
+
+From ae05e92df5a5d6151641622c83d35a6fdba47b1f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Hubert=20Figui=C3=A8re?= <hub@figuiere.net>
+Date: Fri, 22 Nov 2019 20:02:52 -0500
+Subject: [PATCH] Require enchant 2 now
+
+---
+ configure.ac                      | 2 +-
+ src/af/xap/xp/enchant_checker.cpp | 6 +++---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/configure b/configure
+index fdc3076..308b87b 100755
+--- a/configure
++++ b/configure
+@@ -4200,7 +4200,7 @@ xp_pkgs="
+ "
+ 
+ # optional deps
+-enchant_req='enchant >= 1.2.0'
++enchant_req='enchant-2'
+ gio_req='gio-2.0'
+ goffice_req='libgoffice-0.10 >= 0.10.0'
+ 
+diff --git a/src/af/xap/xp/enchant_checker.cpp b/src/af/xap/xp/enchant_checker.cpp
+index ed97c1fb9f..5f64852412 100644
+--- a/src/af/xap/xp/enchant_checker.cpp
++++ b/src/af/xap/xp/enchant_checker.cpp
+@@ -127,7 +127,7 @@ EnchantChecker::_suggestWord (const UT_UCSChar *ucszWord, size_t len)
+ 				pvSugg->addItem (ucszSugg);
+ 		}
+ 
+-		enchant_dict_free_suggestions (m_dict, suggestions);
++		enchant_dict_free_string_list(m_dict, suggestions);
+ 	}
+ 
+ 	return pvSugg;
+@@ -139,7 +139,7 @@ bool EnchantChecker::addToCustomDict (const UT_UCSChar *word, size_t len)
+ 
+ 	if (word && len) {
+ 		UT_UTF8String utf8 (word, len);
+-		enchant_dict_add_to_personal (m_dict, utf8.utf8_str(), utf8.byteLength());
++		enchant_dict_add(m_dict, utf8.utf8_str(), utf8.byteLength());
+ 		return true;
+ 	}
+ 	return false;
+@@ -150,7 +150,7 @@ bool EnchantChecker::isIgnored (const UT_UCSChar *toCorrect, size_t toCorrectLen
+ 	UT_return_val_if_fail (m_dict, false);
+ 
+ 	UT_UTF8String ignore (toCorrect, toCorrectLen);
+-	return enchant_dict_is_in_session (m_dict, ignore.utf8_str(), ignore.byteLength()) != 0;
++	return enchant_dict_is_added(m_dict, ignore.utf8_str(), ignore.byteLength()) != 0;
+ }
+ 
+ void EnchantChecker::ignoreWord (const UT_UCSChar *toCorrect, size_t toCorrectLen)
+-- 
+GitLab
+
diff --git a/srcpkgs/abiword/template b/srcpkgs/abiword/template
index 459c7eeba20b..0f48222f8180 100644
--- a/srcpkgs/abiword/template
+++ b/srcpkgs/abiword/template
@@ -1,17 +1,16 @@
 # Template file for 'abiword'
 pkgname=abiword
 version=3.0.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-plugins --enable-clipart --enable-templates
- $(vopt_if gtk3 '--with-gtk3' '--with-gtk2')
- $(vopt_enable goffice)"
+ --with-gtk3 $(vopt_enable goffice)"
 hostmakedepends="automake libtool flex pkg-config"
 makedepends="libjpeg-turbo-devel libpng-devel fribidi-devel libgsf-devel
- enchant-devel librsvg-devel wv-devel boost-devel libxslt-devel
+ enchant2-devel librsvg-devel wv-devel boost-devel libxslt-devel
  libwmf-devel libchamplain-devel redland-devel libical-devel
  libgcrypt-devel harfbuzz-devel $(vopt_if goffice goffice-devel)
- $(vopt_if gtk3 'gtk+3-devel' 'gtk+-devel')"
+ gtk+3-devel"
 depends="hicolor-icon-theme desktop-file-utils"
 short_desc="Free word processing program similar to Microsoft(R) Word"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -19,8 +18,10 @@ license="GPL-2.0-or-later"
 homepage="http://www.abisource.com/"
 distfiles="${homepage}/downloads/${pkgname}/${version}/source/${pkgname}-${version}.tar.gz"
 checksum=e93096cb192e5bc19d62e180fc5eda643206465315a710113ae5036bc2a1a5d7
-build_options="gtk3 goffice"
-build_options_default="gtk3 goffice"
+patch_args=-Np1
+
+build_options="goffice"
+build_options_default="goffice"
 
 CXXFLAGS="-std=c++11"
 
@@ -31,7 +32,7 @@ libabiword_package() {
 	}
 }
 abiword-devel_package() {
-	depends="fribidi-devel libgsf-devel wv-devel enchant-devel gtk+3-devel
+	depends="fribidi-devel libgsf-devel wv-devel enchant2-devel gtk+3-devel
 		librsvg-devel libabiword>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {

From ec3dfa98d460ab8983c2790360e4ca4e02c868ec Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Tue, 27 Apr 2021 09:31:44 +0200
Subject: [PATCH 1813/2024] rclone: update to 1.55.1.

Also disable selfupdate
---
 srcpkgs/rclone/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rclone/template b/srcpkgs/rclone/template
index 65240e5cf4b3..da28404b0342 100644
--- a/srcpkgs/rclone/template
+++ b/srcpkgs/rclone/template
@@ -1,10 +1,11 @@
 # Template file for 'rclone'
 pkgname=rclone
-version=1.55.0
+version=1.55.1
 revision=1
 wrksrc="rclone-v${version}"
 build_style=go
 go_import_path=github.com/rclone/rclone
+go_build_tags="noselfupdate"
 go_ldflags="-extldflags=-fuse-ld=bfd -X github.com/rclone/rclone/fs.Version=v${version}"
 short_desc="Rsync for cloud storage"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
@@ -12,7 +13,9 @@ 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=75accdaedad3b82edc185dc8824a19a59c30dc6392de7074b6cd98d1dc2c9040
+checksum=25da7fc5c9269b3897f27b0d946919df595c6dda1b127085fda0fe32aa59d29d
+# tests fail on CI
+make_check=ci-skip
 
 pre_build() {
 	if [ "$CROSS_BUILD" ] && [ "$XBPS_TARGET_LIBC" = musl ]; then

From 254aa774cff5005b85868c5abf61bb7a70b3d6b0 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Tue, 27 Apr 2021 12:17:54 +0200
Subject: [PATCH 1814/2024] libedit: update to 20210419.3.1.

---
 srcpkgs/libedit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libedit/template b/srcpkgs/libedit/template
index 09c69eb90322..43b23196160a 100644
--- a/srcpkgs/libedit/template
+++ b/srcpkgs/libedit/template
@@ -1,6 +1,6 @@
 # Template file for 'libedit'
 pkgname=libedit
-_datever=20210216
+_datever=20210419
 _distver=3.1
 version="${_datever}.${_distver}"
 revision=1
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://www.thrysoee.dk/editline/"
 distfiles="http://www.thrysoee.dk/editline/libedit-${_datever}-${_distver}.tar.gz"
-checksum=2283f741d2aab935c8c52c04b57bf952d02c2c02e651172f8ac811f77b1fc77a
+checksum=571ebe44b74860823e24a08cf04086ff104fd7dfa1020abf26c52543134f5602
 
 post_install() {
 	vlicense COPYING

From abf07f2bd190e1ce4c53c08eedf0824e53b85c77 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 27 Apr 2021 15:03:45 -0400
Subject: [PATCH 1815/2024] sshuttle: update to 1.0.5.

---
 srcpkgs/sshuttle/template | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/sshuttle/template b/srcpkgs/sshuttle/template
index b7e8505d4fa6..eadcff89acce 100644
--- a/srcpkgs/sshuttle/template
+++ b/srcpkgs/sshuttle/template
@@ -1,28 +1,28 @@
 # Template file for 'sshuttle'
 pkgname=sshuttle
-version=1.0.4
-revision=2
+version=1.0.5
+revision=1
 build_style=python3-module
-hostmakedepends="python3-setuptools python3-Sphinx"
-depends="python3-setuptools iptables"
+hostmakedepends="python3-setuptools_scm python3-Sphinx"
+depends="python3-psutil"
+checkdepends="python3-flake8 python3-mock python3-pytest"
 short_desc="Transparent proxy server that forwards TCP packets over ssh"
 maintainer="Daniel Santana <daniel@santana.tech>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/sshuttle/sshuttle"
 changelog="https://github.com/sshuttle/sshuttle/raw/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/s/sshuttle/sshuttle-${version}.tar.gz"
-checksum=21a11f3f0f710de92241d8ffca58bebb969f689f650d59e97ba366d7407e16e5
+checksum=fd8c691aac2cb80933aae7f94d9d9e271a820efc5c48e73408f1a90da426a1bd
 
 post_extract() {
-	sed -i setup.py \
-		-e '/setup_requires=/d' \
-		-e '/use_scm_version/,+3d' \
-		-e "/name=/ a\
-		version='${version}',"
 	# BUG: wrong permissions (https://github.com/sshuttle/sshuttle/issues/217)
 	chmod -R go+rX .
 }
 
+pre_check() {
+	sed -i -e '/addopts/d' setup.cfg
+}
+
 post_install() {
 	make -C docs man
 	vman docs/_build/man/sshuttle.1

From 28f6ec57e1809175f9561917e03d21afb98e0b2e Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Sun, 25 Apr 2021 21:57:41 +0200
Subject: [PATCH 1816/2024] xmlsec1: update to 1.2.32.

---
 srcpkgs/xmlsec1/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xmlsec1/template b/srcpkgs/xmlsec1/template
index d564b5142ca1..5aa19215a75a 100644
--- a/srcpkgs/xmlsec1/template
+++ b/srcpkgs/xmlsec1/template
@@ -1,7 +1,7 @@
 # Template file for 'xmlsec1'
 pkgname=xmlsec1
-version=1.2.31
-revision=2
+version=1.2.32
+revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config gnutls-devel"
 makedepends="libxslt-devel libltdl-devel libgcrypt-devel gnutls-devel
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://www.aleksey.com/xmlsec/"
 distfiles="https://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz"
-checksum=9b10bc52cc31e4f76162e3975e50db26b71ab49c571d810b311ca626be5a0b26
+checksum=e383702853236004e5b08e424b8afe9b53fe9f31aaa7a5382f39d9533eb7c043
 
 pre_configure() {
 	autoreconf -if

From b5ba8008628de1fac8d31780edfbe3b89f1d221c Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 12 Apr 2021 22:12:45 +0200
Subject: [PATCH 1817/2024] gdb: add multiarch build option

---
 srcpkgs/gdb/template | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template
index 64787a9ade34..7b302ad7331b 100644
--- a/srcpkgs/gdb/template
+++ b/srcpkgs/gdb/template
@@ -1,11 +1,12 @@
 # Template file for 'gdb'
 pkgname=gdb
 version=10.1
-revision=3
+revision=4
 build_style=gnu-configure
 pycompile_dirs="/usr/share/gdb/python"
 configure_args="--disable-werror --disable-nls --with-system-readline
- --with-system-gdbinit=/etc/gdb/gdbinit --with-system-zlib $(vopt_enable gdbserver)
+ --with-system-gdbinit=/etc/gdb/gdbinit --with-system-zlib
+ $(vopt_enable gdbserver) $(vopt_if multiarch --enable-targets=all)
  $(vopt_if static 'CFLAGS=-static CXXFLAGS=-static LDFLAGS=-static')
  $(vopt_if python --with-python=/usr/bin/python3)
  $(vopt_with debuginfod)"
@@ -27,16 +28,14 @@ if [ "${CROSS_BUILD}" ]; then
 	CFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}"
 	CXXFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}"
 fi
-CFLAGS+=" -fcommon"
-CXXFLAGS+=" -fcommon"
-# Package build options
-build_options="gdbserver static python debuginfod"
-desc_option_gdbserver="Enable support for building GDB server"
+
+build_options="gdbserver multiarch static python debuginfod"
 desc_option_debuginfod="Enable support for libdebuginfod"
-# Enable gdbserver if !static.
+desc_option_multiarch="Enable support for all architectures"
+desc_option_gdbserver="Enable support for building GDB server"
 build_options_default="gdbserver python debuginfod"
-# Both options cannot be enabled at the same time
 vopt_conflict gdbserver static
+vopt_conflict debuginfod static
 
 post_extract() {
 	vsed -i 's,sgidefs.h,asm/sgidefs.h,' gdb/mips-linux-nat.c

From c5d64b502d568a1a1515da6c4cb391eaa8f7fe99 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 27 Apr 2021 22:58:48 +0200
Subject: [PATCH 1818/2024] webkit2gtk: work out the remaining musl stack size
 problems

---
 srcpkgs/webkit2gtk/patches/musl-fixes.patch   |  80 +++++++++++++
 .../webkit2gtk/patches/musl-stack-fix.patch   |  74 ++++++++++++
 .../patches/musl-thread-stack.patch           | 113 ------------------
 .../webkit2gtk/patches/musl-wordsize.patch    |  59 +++++++++
 srcpkgs/webkit2gtk/template                   |   8 +-
 5 files changed, 214 insertions(+), 120 deletions(-)
 create mode 100644 srcpkgs/webkit2gtk/patches/musl-fixes.patch
 create mode 100644 srcpkgs/webkit2gtk/patches/musl-stack-fix.patch
 delete mode 100644 srcpkgs/webkit2gtk/patches/musl-thread-stack.patch
 create mode 100644 srcpkgs/webkit2gtk/patches/musl-wordsize.patch

diff --git a/srcpkgs/webkit2gtk/patches/musl-fixes.patch b/srcpkgs/webkit2gtk/patches/musl-fixes.patch
new file mode 100644
index 000000000000..b87497c99b36
--- /dev/null
+++ b/srcpkgs/webkit2gtk/patches/musl-fixes.patch
@@ -0,0 +1,80 @@
+Upstream: yes
+
+--- Source/JavaScriptCore/runtime/MachineContext.h
++++ Source/JavaScriptCore/runtime/MachineContext.h
+@@ -196,7 +196,7 @@ static inline void*& stackPointerImpl(mcontext_t& machineContext)
+ #error Unknown Architecture
+ #endif
+ 
+-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
++#elif OS(FUCHSIA) || OS(LINUX)
+ 
+ #if CPU(X86)
+     return reinterpret_cast<void*&>((uintptr_t&) machineContext.gregs[REG_ESP]);
+@@ -347,7 +347,7 @@ static inline void*& framePointerImpl(mcontext_t& machineContext)
+ #error Unknown Architecture
+ #endif
+ 
+-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
++#elif OS(FUCHSIA) || OS(LINUX)
+ 
+ // The following sequence depends on glibc's sys/ucontext.h.
+ #if CPU(X86)
+@@ -498,7 +498,7 @@ static inline void*& instructionPointerImpl(mcontext_t& machineContext)
+ #error Unknown Architecture
+ #endif
+ 
+-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
++#elif OS(FUCHSIA) || OS(LINUX)
+ 
+ // The following sequence depends on glibc's sys/ucontext.h.
+ #if CPU(X86)
+@@ -656,7 +656,7 @@ inline void*& argumentPointer<1>(mcontext_t& machineContext)
+ #error Unknown Architecture
+ #endif
+ 
+-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
++#elif OS(FUCHSIA) || OS(LINUX)
+ 
+ // The following sequence depends on glibc's sys/ucontext.h.
+ #if CPU(X86)
+@@ -773,7 +773,7 @@ inline void*& llintInstructionPointer(mcontext_t& machineContext)
+ #error Unknown Architecture
+ #endif
+ 
+-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
++#elif OS(FUCHSIA) || OS(LINUX)
+ 
+ // The following sequence depends on glibc's sys/ucontext.h.
+ #if CPU(X86)
+--- Source/WebCore/xml/XPathGrammar.cpp
++++ Source/WebCore/xml/XPathGrammar.cpp
+@@ -966,7 +966,7 @@ int yydebug;
+ #if YYERROR_VERBOSE
+ 
+ # ifndef yystrlen
+-#  if defined __GLIBC__ && defined _STRING_H
++#  if defined __linux__ && defined _STRING_H
+ #   define yystrlen strlen
+ #  else
+ /* Return the length of YYSTR.  */
+@@ -989,7 +989,7 @@ yystrlen (yystr)
+ # endif
+ 
+ # ifndef yystpcpy
+-#  if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
++#  if defined __linux__ && defined _STRING_H && defined _GNU_SOURCE
+ #   define yystpcpy stpcpy
+ #  else
+ /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
+--- Source/WTF/wtf/PlatformHave.h
++++ Source/WTF/wtf/PlatformHave.h
+@@ -206,7 +206,7 @@
+ #define HAVE_HOSTED_CORE_ANIMATION 1
+ #endif
+ 
+-#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__GLIBC__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
++#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || OS(LINUX)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
+ #define HAVE_MACHINE_CONTEXT 1
+ #endif
+ 
diff --git a/srcpkgs/webkit2gtk/patches/musl-stack-fix.patch b/srcpkgs/webkit2gtk/patches/musl-stack-fix.patch
new file mode 100644
index 000000000000..0ca82cb50d86
--- /dev/null
+++ b/srcpkgs/webkit2gtk/patches/musl-stack-fix.patch
@@ -0,0 +1,74 @@
+https://bugs.webkit.org/show_bug.cgi?id=225099
+
+From ab7e2bfae280b151ac173d6fc9d8eaa3da2e92a8 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Tue, 27 Apr 2021 22:51:22 +0200
+Subject: [PATCH] fix stack size issues on musl
+
+---
+ Source/WTF/wtf/StackBounds.cpp | 26 +++++++++++++++++++++++++-
+ Source/WTF/wtf/Threading.cpp   |  4 ++++
+ 2 files changed, 29 insertions(+), 1 deletion(-)
+
+diff --git Source/WTF/wtf/StackBounds.cpp Source/WTF/wtf/StackBounds.cpp
+index e6f7095..58bdb18 100644
+--- Source/WTF/wtf/StackBounds.cpp
++++ Source/WTF/wtf/StackBounds.cpp
+@@ -36,6 +36,12 @@
+ #include <pthread_np.h>
+ #endif
+ 
++#if OS(LINUX)
++#include <sys/resource.h>
++#include <sys/syscall.h>
++#include <unistd.h>
++#endif
++
+ #endif
+ 
+ namespace WTF {
+@@ -107,7 +113,25 @@ StackBounds StackBounds::newThreadStackBounds(PlatformThreadHandle thread)
+ 
+ StackBounds StackBounds::currentThreadStackBoundsInternal()
+ {
+-    return newThreadStackBounds(pthread_self());
++    auto ret = newThreadStackBounds(pthread_self());
++#if OS(LINUX)
++    // on glibc, pthread_attr_getstack will generally return the limit size (minus a guard page)
++    // for the main thread; this is however not necessarily always true on every libc - for example
++    // on musl, it will return the currently reserved size - since the stack bounds are expected to
++    // be constant (and they are for every thread except main, which is allowed to grow), check
++    // resource limits and use that as the boundary instead (and prevent stack overflows in JSC)
++    if (getpid() == static_cast<pid_t>(syscall(SYS_gettid))) {
++        void* origin = ret.origin();
++        rlimit limit;
++        getrlimit(RLIMIT_STACK, &limit);
++        rlim_t size = limit.rlim_cur;
++        // account for a guard page
++        size -= static_cast<rlim_t>(sysconf(_SC_PAGESIZE));
++        void* bound = static_cast<char*>(origin) - size;
++        return StackBounds { origin, bound };
++    }
++#endif
++    return ret;
+ }
+ 
+ #elif OS(WINDOWS)
+diff --git Source/WTF/wtf/Threading.cpp Source/WTF/wtf/Threading.cpp
+index 99d09c0..362bf35 100644
+--- Source/WTF/wtf/Threading.cpp
++++ Source/WTF/wtf/Threading.cpp
+@@ -58,6 +58,10 @@ static Optional<size_t> stackSize(ThreadType threadType)
+ 
+ #if defined(DEFAULT_THREAD_STACK_SIZE_IN_KB) && DEFAULT_THREAD_STACK_SIZE_IN_KB > 0
+     return DEFAULT_THREAD_STACK_SIZE_IN_KB * 1024;
++#elif OS(LINUX) && !defined(__BIONIC__) && !defined(__GLIBC__)
++    // on libc's other than glibc and bionic (e.g. musl) we are either unsure how big
++    // the default thread stack is, or we know it's too small - pick a robust default
++    return 1 * MB;
+ #else
+     // Use the platform's default stack size
+     return WTF::nullopt;
+-- 
+2.30.1
+
diff --git a/srcpkgs/webkit2gtk/patches/musl-thread-stack.patch b/srcpkgs/webkit2gtk/patches/musl-thread-stack.patch
deleted file mode 100644
index a0acbde956e5..000000000000
--- a/srcpkgs/webkit2gtk/patches/musl-thread-stack.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-Source: https://github.com/WebKit/WebKit/commit/6884d13 (tweaked values)
-
-diff --git Source/JavaScriptCore/runtime/MachineContext.h Source/JavaScriptCore/runtime/MachineContext.h
-index ead9cdf..86b36ca 100644
---- Source/JavaScriptCore/runtime/MachineContext.h
-+++ Source/JavaScriptCore/runtime/MachineContext.h
-@@ -196,7 +196,7 @@ static inline void*& stackPointerImpl(mcontext_t& machineContext)
- #error Unknown Architecture
- #endif
- 
--#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
-+#elif OS(FUCHSIA) || OS(LINUX)
- 
- #if CPU(X86)
-     return reinterpret_cast<void*&>((uintptr_t&) machineContext.gregs[REG_ESP]);
-@@ -347,7 +347,7 @@ static inline void*& framePointerImpl(mcontext_t& machineContext)
- #error Unknown Architecture
- #endif
- 
--#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
-+#elif OS(FUCHSIA) || OS(LINUX)
- 
- // The following sequence depends on glibc's sys/ucontext.h.
- #if CPU(X86)
-@@ -498,7 +498,7 @@ static inline void*& instructionPointerImpl(mcontext_t& machineContext)
- #error Unknown Architecture
- #endif
- 
--#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
-+#elif OS(FUCHSIA) || OS(LINUX)
- 
- // The following sequence depends on glibc's sys/ucontext.h.
- #if CPU(X86)
-@@ -656,7 +656,7 @@ inline void*& argumentPointer<1>(mcontext_t& machineContext)
- #error Unknown Architecture
- #endif
- 
--#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
-+#elif OS(FUCHSIA) || OS(LINUX)
- 
- // The following sequence depends on glibc's sys/ucontext.h.
- #if CPU(X86)
-@@ -773,7 +773,7 @@ inline void*& llintInstructionPointer(mcontext_t& machineContext)
- #error Unknown Architecture
- #endif
- 
--#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__)
-+#elif OS(FUCHSIA) || OS(LINUX)
- 
- // 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..f4a86a5 100644
---- Source/JavaScriptCore/runtime/OptionsList.h
-+++ Source/JavaScriptCore/runtime/OptionsList.h
-@@ -71,6 +71,18 @@ JS_EXPORT_PRIVATE bool canUseJITCage();
- // On instantiation of the first VM instance, the Options will be write protected
- // and cannot be modified thereafter.
- 
-+#if OS(LINUX) && !defined(__BIONIC__) && !defined(__GLIBC__)
-+// non-glibc/non-android options on linux ( musl )
-+constexpr unsigned jscMaxPerThreadStack = 2 * MB;
-+constexpr unsigned jscSoftReservedZoneSize = 64 * KB;
-+constexpr unsigned jscReservedZoneSize = 32 * KB;
-+#else
-+// default
-+constexpr unsigned jscMaxPerThreadStack = 5 * MB;
-+constexpr unsigned jscSoftReservedZoneSize = 128 * KB;
-+constexpr unsigned jscReservedZoneSize = 64 * KB;
-+#endif
-+
- #define FOR_EACH_JSC_OPTION(v)                                          \
-     v(Bool, useKernTCSM, defaultTCSMValue(), Normal, "Note: this needs to go before other options since they depend on this value.") \
-     v(Bool, validateOptions, false, Normal, "crashes if mis-typed JSC options were passed to the VM") \
-@@ -86,9 +98,9 @@ JS_EXPORT_PRIVATE bool canUseJITCage();
-     \
-     v(Bool, reportMustSucceedExecutableAllocations, false, Normal, nullptr) \
-     \
--    v(Unsigned, maxPerThreadStackUsage, 5 * MB, Normal, "Max allowed stack usage by the VM") \
--    v(Unsigned, softReservedZoneSize, 128 * KB, Normal, "A buffer greater than reservedZoneSize that reserves space for stringifying exceptions.") \
--    v(Unsigned, reservedZoneSize, 64 * KB, Normal, "The amount of stack space we guarantee to our clients (and to interal VM code that does not call out to clients).") \
-+    v(Unsigned, maxPerThreadStackUsage, jscMaxPerThreadStack, Normal, "Max allowed stack usage by the VM") \
-+    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) \
-diff --git Source/WTF/wtf/PlatformHave.h Source/WTF/wtf/PlatformHave.h
-index 41afbb4..ab5263c 100644
---- Source/WTF/wtf/PlatformHave.h
-+++ Source/WTF/wtf/PlatformHave.h
-@@ -206,7 +206,7 @@
- #define HAVE_HOSTED_CORE_ANIMATION 1
- #endif
- 
--#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__GLIBC__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
-+#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || OS(LINUX)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
- #define HAVE_MACHINE_CONTEXT 1
- #endif
- 
-diff --git Source/WTF/wtf/Threading.cpp Source/WTF/wtf/Threading.cpp
-index 99d09c0..723a8f4 100644
---- Source/WTF/wtf/Threading.cpp
-+++ Source/WTF/wtf/Threading.cpp
-@@ -52,6 +52,8 @@ static Optional<size_t> stackSize(ThreadType threadType)
- #elif OS(DARWIN) && ASAN_ENABLED
-     if (threadType == ThreadType::Compiler)
-         return 1 * MB; // ASan needs more stack space (especially on Debug builds).
-+#elif OS(LINUX) && !defined(__BIONIC__) && !defined(__GLIBC__) // MUSL default thread stack size.
-+        return 2 * MB;
- #else
-     UNUSED_PARAM(threadType);
- #endif
diff --git a/srcpkgs/webkit2gtk/patches/musl-wordsize.patch b/srcpkgs/webkit2gtk/patches/musl-wordsize.patch
new file mode 100644
index 000000000000..069abd753da6
--- /dev/null
+++ b/srcpkgs/webkit2gtk/patches/musl-wordsize.patch
@@ -0,0 +1,59 @@
+Upstream: yes
+
+From 1b7144916774dbb4cc4705ba9a4377844e35f47d Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Tue, 27 Apr 2021 22:56:33 +0200
+Subject: [PATCH] remove __WORDSIZE usage
+
+---
+ Source/WebCore/crypto/algorithms/CryptoAlgorithmAES_GCM.cpp | 6 +++---
+ Source/WebCore/rendering/RenderLayerBacking.h               | 2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git Source/WebCore/crypto/algorithms/CryptoAlgorithmAES_GCM.cpp Source/WebCore/crypto/algorithms/CryptoAlgorithmAES_GCM.cpp
+index cfe3698..e5bc870 100644
+--- Source/WebCore/crypto/algorithms/CryptoAlgorithmAES_GCM.cpp
++++ Source/WebCore/crypto/algorithms/CryptoAlgorithmAES_GCM.cpp
+@@ -39,7 +39,7 @@ namespace CryptoAlgorithmAES_GCMInternal {
+ static const char* const ALG128 = "A128GCM";
+ static const char* const ALG192 = "A192GCM";
+ static const char* const ALG256 = "A256GCM";
+-#if __WORDSIZE >= 64
++#if CPU(ADDRESS64)
+ static const uint64_t PlainTextMaxLength = 549755813632ULL; // 2^39 - 256
+ #endif
+ static const uint8_t DefaultTagLength = 128;
+@@ -77,7 +77,7 @@ void CryptoAlgorithmAES_GCM::encrypt(const CryptoAlgorithmParameters& parameters
+ 
+     auto& aesParameters = downcast<CryptoAlgorithmAesGcmParams>(parameters);
+ 
+-#if __WORDSIZE >= 64
++#if CPU(ADDRESS64)
+     if (plainText.size() > PlainTextMaxLength) {
+         exceptionCallback(OperationError);
+         return;
+@@ -120,7 +120,7 @@ void CryptoAlgorithmAES_GCM::decrypt(const CryptoAlgorithmParameters& parameters
+         return;
+     }
+ 
+-#if __WORDSIZE >= 64
++#if CPU(ADDRESS64)
+     if (aesParameters.ivVector().size() > UINT64_MAX) {
+         exceptionCallback(OperationError);
+         return;
+diff --git Source/WebCore/rendering/RenderLayerBacking.h Source/WebCore/rendering/RenderLayerBacking.h
+index 9960724..193c5d1 100644
+--- Source/WebCore/rendering/RenderLayerBacking.h
++++ Source/WebCore/rendering/RenderLayerBacking.h
+@@ -43,7 +43,7 @@ class TiledBacking;
+ class TransformationMatrix;
+ 
+ 
+-#if __WORDSIZE == 64 && PLATFORM(COCOA)
++#if CPU(ADDRESS64) && PLATFORM(COCOA)
+ #define USE_OWNING_LAYER_BEAR_TRAP 1
+ #define BEAR_TRAP_VALUE 0xEEEEEEEEEEEEEEEE
+ #else
+-- 
+2.30.1
+
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 5a2621b6c93a..270d2a4f5f31 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -2,7 +2,7 @@
 # ping q66 before touching this
 pkgname=webkit2gtk
 version=2.32.0
-revision=2
+revision=3
 wrksrc="webkitgtk-${version}"
 build_style=cmake
 build_helper="gir"
@@ -48,12 +48,6 @@ desc_option_sampling_profiler="Sampling profiler support (JIT + glibc only)"
 desc_option_minibrowser="Build the minibrowser"
 
 export CFLAGS="-DNDEBUG"
-
-if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
-	# this is not defined on musl and is occasionally used
-	export CFLAGS+=" -D__WORDSIZE=${XBPS_TARGET_WORDSIZE}"
-fi
-
 export CXXFLAGS="$CFLAGS"
 
 # WebKitCCache.cmake set this variable

From cb9dda0eecd7bb323c75c766fe82f1fca04c6a79 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Tue, 27 Apr 2021 15:18:47 -0700
Subject: [PATCH 1819/2024] cheese: import patch for spinning endlessly

---
 .../patches/infinite-loop-thumbnailer.patch   | 88 +++++++++++++++++++
 srcpkgs/cheese/template                       |  3 +-
 2 files changed, 90 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/cheese/patches/infinite-loop-thumbnailer.patch

diff --git a/srcpkgs/cheese/patches/infinite-loop-thumbnailer.patch b/srcpkgs/cheese/patches/infinite-loop-thumbnailer.patch
new file mode 100644
index 000000000000..a8e96857a59a
--- /dev/null
+++ b/srcpkgs/cheese/patches/infinite-loop-thumbnailer.patch
@@ -0,0 +1,88 @@
+From e7046d564a6f76c1af8f5640ac9c569e07284ec0 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Fri, 18 Sep 2020 12:06:45 +0200
+Subject: [PATCH] Fix infinite loop if thumbnailer is not available
+
+The code in cheese_thumb_view_idle_append_item() in
+src/thumbview/cheese-thumb-view.c didn't pop the list of items to
+thumbnail if thumbnailing failed.
+
+ #0  0x00007f4a60e55314 in open64 () at /lib64/libc.so.6
+ #1  0x00007f4a60de6386 in _IO_file_open () at /lib64/libc.so.6
+ #2  0x00007f4a60de655a in __GI__IO_file_fopen () at /lib64/libc.so.6
+ #3  0x00007f4a60dd9aad in __fopen_internal () at /lib64/libc.so.6
+ #4  0x00007f4a6157a43f in gdk_pixbuf_new_from_file () at /lib64/libgdk_pixbuf-2.0.so.0
+ #5  0x00007f4a61e84b3a in gnome_desktop_thumbnail_factory_lookup () at /lib64/libgnome-desktop-3.so.19
+ #6  0x000055cef476046f in cheese_thumb_view_idle_append_item ()
+ #7  0x00007f4a6124f47b in g_idle_dispatch () at /lib64/libglib-2.0.so.0
+ #8  0x00007f4a612537af in g_main_context_dispatch () at /lib64/libglib-2.0.so.0
+ #9  0x00007f4a61253b38 in g_main_context_iterate.constprop () at /lib64/libglib-2.0.so.0
+ #10 0x00007f4a61253c03 in g_main_context_iteration () at /lib64/libglib-2.0.so.0
+ #11 0x00007f4a6146a7ca in g_application_run () at /lib64/libgio-2.0.so.0
+ #12 0x000055cef4758547 in _vala_main ()
+ #13 0x00007f4a60d8a042 in __libc_start_main () at /lib64/libc.so.6
+ #14 0x000055cef47554be in _start ()
+
+ #0  0x00007f4a60ec562d in __strlen_avx2 () at /lib64/libc.so.6
+ #1  0x00007f4a61275de8 in g_str_has_suffix () at /lib64/libglib-2.0.so.0
+ #2  0x00007f4a618c0072 in icon_name_is_symbolic () at /lib64/libgtk-3.so.0
+ #3  0x00007f4a618c00b1 in theme_dir_get_icon_suffix () at /lib64/libgtk-3.so.0
+ #4  0x00007f4a618c32ed in theme_lookup_icon () at /lib64/libgtk-3.so.0
+ #5  0x00007f4a618c3adf in real_choose_icon () at /lib64/libgtk-3.so.0
+ #6  0x00007f4a618c4762 in gtk_icon_theme_lookup_icon_for_scale () at /lib64/libgtk-3.so.0
+ #7  0x00007f4a618c5105 in gtk_icon_theme_load_icon_for_scale () at /lib64/libgtk-3.so.0
+ #8  0x000055cef47605c9 in cheese_thumb_view_idle_append_item ()
+ #9  0x00007f4a6124f47b in g_idle_dispatch () at /lib64/libglib-2.0.so.0
+ #10 0x00007f4a612537af in g_main_context_dispatch () at /lib64/libglib-2.0.so.0
+ #11 0x00007f4a61253b38 in g_main_context_iterate.constprop () at /lib64/libglib-2.0.so.0
+ #12 0x00007f4a61253c03 in g_main_context_iteration () at /lib64/libglib-2.0.so.0
+ #13 0x00007f4a6146a7d8 in g_application_run () at /lib64/libgio-2.0.so.0
+ #14 0x000055cef4758547 in _vala_main ()
+ #15 0x00007f4a60d8a042 in __libc_start_main () at /lib64/libc.so.6
+ #16 0x000055cef47554be in _start ()
+
+Closes: #81
+---
+ src/thumbview/cheese-thumb-view.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/thumbview/cheese-thumb-view.c b/src/thumbview/cheese-thumb-view.c
+index 1d2d88f5..232fd4b6 100644
+--- a/src/thumbview/cheese-thumb-view.c
++++ b/src/thumbview/cheese-thumb-view.c
+@@ -92,7 +92,7 @@ GtkWidget * cheese_thumb_view_new (void);
+ static gboolean
+ cheese_thumb_view_idle_append_item (gpointer data)
+ {
+-  CheeseThumbViewIdleData *item = g_queue_peek_head (data);
++  CheeseThumbViewIdleData *item = g_queue_pop_head (data);
+   CheeseThumbView         *thumb_view;
+   CheeseThumbViewPrivate  *priv;
+ 
+@@ -119,6 +119,7 @@ cheese_thumb_view_idle_append_item (gpointer data)
+   if (!info)
+   {
+     g_warning ("Invalid filename\n");
++    g_slice_free (CheeseThumbViewIdleData, item);
+     return TRUE;
+   }
+   g_file_info_get_modification_time (info, &mtime);
+@@ -167,6 +168,7 @@ cheese_thumb_view_idle_append_item (gpointer data)
+     if (error)
+     {
+       g_warning ("%s", error->message);
++      g_slice_free (CheeseThumbViewIdleData, item);
+       return TRUE;
+     }
+   }
+@@ -183,7 +185,6 @@ cheese_thumb_view_idle_append_item (gpointer data)
+   g_object_unref (pixbuf);
+   g_object_unref (file);
+   g_slice_free (CheeseThumbViewIdleData, item);
+-  g_queue_pop_head (data);
+ 
+   return TRUE;
+ }
+-- 
+GitLab
+
diff --git a/srcpkgs/cheese/template b/srcpkgs/cheese/template
index faa329ee0e4a..e23855c1ed2b 100644
--- a/srcpkgs/cheese/template
+++ b/srcpkgs/cheese/template
@@ -1,7 +1,7 @@
 # Template file for 'cheese'
 pkgname=cheese
 version=3.38.0
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="$(vopt_bool gtk_doc gtk_doc) $(vopt_bool gtk_doc man)"
@@ -17,6 +17,7 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Cheese"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=88d2732b421b903110a2628db25c0d61e219c42bdfb5971151033fba95a8d16f
+patch_args="-Np1"
 
 build_options="gir gtk_doc"
 build_options_default="gir"

From 46e77848313e18655dac420f77fa1eee4d648c26 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 26 Apr 2021 17:51:40 -0500
Subject: [PATCH 1820/2024] melonDS: update to 0.9.2.

---
 srcpkgs/melonDS/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/melonDS/template b/srcpkgs/melonDS/template
index d5582632f111..e40d8ff1de55 100644
--- a/srcpkgs/melonDS/template
+++ b/srcpkgs/melonDS/template
@@ -1,13 +1,14 @@
 # Template file for 'melonDS'
 pkgname=melonDS
-version=0.9.1
+version=0.9.2
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
-makedepends="qt5-devel libslirp-devel SDL2-devel"
+makedepends="qt5-devel libslirp-devel SDL2-devel libepoxy-devel
+ libarchive-devel"
 short_desc="Fast and accurate Nintendo DS emulator"
 maintainer="Francesco Circhetta <francesco.circhetta@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="http://melonds.kuribo64.net/"
 distfiles="https://github.com/Arisotura/melonDS/archive/${version}.tar.gz"
-checksum=9c7253a8c9bdd1270c142077eaa3a830176eef42123c72dc68cb1d4abd2d43a6
+checksum=e9f408efa996dda4236a17340f024fea11fd98054148d37cf5b17fea8a2f63ad

From f80ff4a3312e8f8f6fc6f46d8d9c6d6d058375cd Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Tue, 16 Mar 2021 22:22:08 +0000
Subject: [PATCH 1821/2024] kodi: enable cross compilation for 32bit arm
 architectures

---
 srcpkgs/kodi/template | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 8bb2a2965731..c64d926eb010 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -42,7 +42,7 @@ fi
 
 lib32disabled=yes
 archs="i686* x86_64* aarch64*
- ppc64*"
+ ppc64* armv6l* armv7l*"
 
 hostmakedepends="
  automake libtool pkg-config gperf cmake gettext zip unzip nasm yasm python3-devel
@@ -60,7 +60,7 @@ makedepends="
  giflib-devel libxslt-devel gnutls-devel libssh-devel libmicrohttpd-devel
  libcec-devel dcadec-devel flatbuffers-devel fmt-devel lcms2-devel
  libfstrcmp-devel rapidjson libcdio-paranoia spdlog libwaylandpp-devel
- libinput-devel libdav1d-devel gtest-devel"
+ libinput-devel libdav1d-devel gtest-devel python3-devel"
 
 # The following dependencies are dlopen(3)ed.
 depends="libbluray libmad libvorbis libcurl libflac libmodplug libass libmpeg2
@@ -81,12 +81,6 @@ _gtest_filter+=":TestWebServer.CanGetRangedFileRangeFirstSecond"
 _gtest_filter+=":TestWebServer.CanGetRangedFileRangeFirstSecondLast"
 
 case "$XBPS_TARGET_MACHINE" in
-	aarch64*)
-		hostmakedepends+=" libmariadbclient-devel SDL2_image-devel lzo-devel"
-		hostmakedepends+=" libwaylandpp-devel"
-		makedepends+=" python3-devel ffmpeg-devel"
-		configure_args+=" -DENABLE_VAAPI=OFF"
-		;;
 	i686)
 		# Additionaly disable these tests on i686 architecutre
 		# https://github.com/void-linux/void-packages/commit/3c0332ab330e30a2c280de2258ed9bf60a9c2e09/checks/2101961301/logs
@@ -98,6 +92,15 @@ esac
 
 if [ -z "$CROSS_BUILD" ]; then
 	make_build_target+=" kodi-test"
+else
+	hostmakedepends+=" libmariadbclient-devel SDL2_image-devel lzo-devel
+	 libwaylandpp-devel"
+fi
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	configure_args+=" -DCMAKE_EXE_LINKER_FLAGS=-latomic"
+	LDFLAGS+=" -latomic"
 fi
 
 pre_configure() {

From 28a42003cc1280477d2b48a19f37b373f1848dce Mon Sep 17 00:00:00 2001
From: Lorem <notloremipsum@protonmail.com>
Date: Wed, 28 Apr 2021 08:22:38 +0530
Subject: [PATCH 1822/2024] New package: budgie-screensaver-4.0

---
 srcpkgs/budgie-screensaver/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/budgie-screensaver/template

diff --git a/srcpkgs/budgie-screensaver/template b/srcpkgs/budgie-screensaver/template
new file mode 100644
index 000000000000..e2b0d44f3b4e
--- /dev/null
+++ b/srcpkgs/budgie-screensaver/template
@@ -0,0 +1,14 @@
+# Template file for 'budgie-screensaver'
+pkgname=budgie-screensaver
+version=4.0
+revision=1
+wrksrc=budgie-screensaver-v${version}
+build_style=gnu-configure
+hostmakedepends="pkg-config intltool glib"
+makedepends="gnome-desktop-devel dbus-glib-devel pam-devel"
+short_desc="Fork of GNOME Screensaver for Budgie 10"
+maintainer="Lorem <notloremipsum@protonmail.com>"
+license="GPL-2.0-only"
+homepage="https://github.com/getsolus/budgie-screensaver"
+distfiles="https://github.com/getsolus/budgie-screensaver/releases/download/v${version}/budgie-screensaver-v${version}.tar.xz"
+checksum=dde83f355e549b5f6290655f33acd910d2febbb8fd974f922b14814054f80f49

From 58e50e3832e4a1fa9eb1182a7cef184fa8d97b6a Mon Sep 17 00:00:00 2001
From: Lorem <notloremipsum@protonmail.com>
Date: Wed, 28 Apr 2021 09:29:27 +0530
Subject: [PATCH 1823/2024] budgie-desktop: update to 10.5.3.

 Now depends on budgie-screensaver
---
 .../fix-budgie-desktop-settings-crash.patch   |    65 -
 srcpkgs/budgie-desktop/patches/mutter-8.patch | 12593 ----------------
 srcpkgs/budgie-desktop/template               |    11 +-
 3 files changed, 6 insertions(+), 12663 deletions(-)
 delete mode 100644 srcpkgs/budgie-desktop/patches/fix-budgie-desktop-settings-crash.patch
 delete mode 100644 srcpkgs/budgie-desktop/patches/mutter-8.patch

diff --git a/srcpkgs/budgie-desktop/patches/fix-budgie-desktop-settings-crash.patch b/srcpkgs/budgie-desktop/patches/fix-budgie-desktop-settings-crash.patch
deleted file mode 100644
index 84fbce6616e0..000000000000
--- a/srcpkgs/budgie-desktop/patches/fix-budgie-desktop-settings-crash.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From: Joshua Strobl <joshua@streambits.io>
-Date: Mon, 12 Apr 2021 06:14:04 +0300
-Subject: [PATCH] Support moved font anti-aliasing and hinting in GSD 40. Fixes
- #2121.
-
----
- src/panel/meson.build                  |  4 ++++
- src/panel/settings/settings_fonts.vala | 11 ++++++++++-
- 2 files changed, 14 insertions(+), 1 deletion(-)
-
-diff --git src/panel/meson.build src/panel/meson.build
-index ee610868..5451c278 100644
---- src/panel/meson.build
-+++ src/panel/meson.build
-@@ -72,6 +72,10 @@ budgie_panel_vala_args = [
-         '--gresources=' + gresource,
- ]
- 
-+if dep_gsd.version().version_compare('>=40.0')
-+    budgie_panel_vala_args += ['-D', 'HAVE_GSD_40']
-+endif
-+
- budgie_panel_c_args = [
-     '-DWNCK_I_KNOW_THIS_IS_UNSTABLE'
- ]
-diff --git src/panel/settings/settings_fonts.vala src/panel/settings/settings_fonts.vala
-index fc17622f..f750b926 100644
---- src/panel/settings/settings_fonts.vala
-+++ src/panel/settings/settings_fonts.vala
-@@ -24,7 +24,10 @@ namespace Budgie {
- 
- 		private Settings ui_settings;
- 		private Settings wm_settings;
-+
-+#if !HAVE_GSD_40
- 		private Settings x_settings;
-+#endif
- 
- 		public FontPage() {
- 			Object(group: SETTINGS_GROUP_APPEARANCE,
-@@ -135,14 +138,20 @@ namespace Budgie {
- 			/* Hook up settings */
- 			ui_settings = new Settings("org.gnome.desktop.interface");
- 			wm_settings = new Settings("org.gnome.desktop.wm.preferences");
--			x_settings = new Settings("org.gnome.settings-daemon.plugins.xsettings");
- 			ui_settings.bind("document-font-name", fontbutton_document, "font-name", SettingsBindFlags.DEFAULT);
- 			ui_settings.bind("font-name", fontbutton_interface, "font-name", SettingsBindFlags.DEFAULT);
- 			ui_settings.bind("monospace-font-name", fontbutton_monospace, "font-name", SettingsBindFlags.DEFAULT);
- 			wm_settings.bind("titlebar-font", fontbutton_title, "font-name", SettingsBindFlags.DEFAULT);
- 			ui_settings.bind("text-scaling-factor", spinbutton_scaling, "value", SettingsBindFlags.DEFAULT);
-+
-+#if HAVE_GSD_40
-+			ui_settings.bind("font-antialiasing", combobox_antialias, "active-id", SettingsBindFlags.DEFAULT);
-+			ui_settings.bind("font-hinting", combobox_hinting, "active-id", SettingsBindFlags.DEFAULT);
-+#else
-+			x_settings = new Settings("org.gnome.settings-daemon.plugins.xsettings");
- 			x_settings.bind("hinting", combobox_hinting, "active-id", SettingsBindFlags.DEFAULT);
- 			x_settings.bind("antialiasing", combobox_antialias, "active-id", SettingsBindFlags.DEFAULT);
-+#endif
- 		}
- 	}
- }
--- 
-2.31.1
-
diff --git a/srcpkgs/budgie-desktop/patches/mutter-8.patch b/srcpkgs/budgie-desktop/patches/mutter-8.patch
deleted file mode 100644
index 8d1754d9067b..000000000000
--- a/srcpkgs/budgie-desktop/patches/mutter-8.patch
+++ /dev/null
@@ -1,12593 +0,0 @@
-From 0383b5ef679d6ad4555c69bfa8a087e2f61b8679 Mon Sep 17 00:00:00 2001
-From: David Mohammed <fossfreedom@users.noreply.github.com>
-Date: Wed, 3 Mar 2021 15:55:03 +0000
-Subject: [PATCH] Compile with mutter-8 (GNOME 40 beta) (#2094)
-
-* Compile with mutter-8 (GNOME 40 alpha)
-
-* Fix vapigen warnings for 6,7 & 8 alpha
-
-* Add get_settings to custom vapi
-
-* Bypass shim compilation failure
-Note the FixMe - this needs resolving otherwise keyboard shortcuts
-and changing keyboard shortcuts will not work
-
-* Resolve shim FIXME
-
-* Regenerate vapi with mutter.40-beta
----
- src/wm/meson.build                |   24 +-
- src/wm/shim.vala                  |    4 +
- vapi/Clutter-7.metadata           |   62 +-
- vapi/Clutter-8.metadata           |  187 +
- vapi/Meta-7.metadata              |    8 +
- vapi/Meta-8.metadata              |   85 +
- vapi/generate-mutter-vapi.sh      |    2 +-
- vapi/libmutter-7-custom.vala      |    7 +
- vapi/libmutter-7.vapi             |   30 +-
- vapi/libmutter-8-custom.vala      |   14 +
- vapi/libmutter-8.deps             |    6 +
- vapi/libmutter-8.vapi             | 1535 ++++++
- vapi/mutter-clutter-7-custom.vala |   42 +
- vapi/mutter-clutter-7.deps        |    1 +
- vapi/mutter-clutter-7.vapi        |  322 +-
- vapi/mutter-clutter-8-custom.vala |   42 +
- vapi/mutter-clutter-8.deps        |    5 +
- vapi/mutter-clutter-8.vapi        | 8279 +++++++++++++++++++++++++++++
- vapi/mutter-cogl-7.vapi           |    6 +
- vapi/mutter-cogl-8-custom.vala    |  119 +
- vapi/mutter-cogl-8.deps           |    1 +
- vapi/mutter-cogl-8.vapi           | 1091 ++++
- 22 files changed, 11691 insertions(+), 181 deletions(-)
- create mode 100644 vapi/Clutter-8.metadata
- create mode 100644 vapi/Meta-8.metadata
- create mode 100644 vapi/libmutter-8-custom.vala
- create mode 100644 vapi/libmutter-8.deps
- create mode 100644 vapi/libmutter-8.vapi
- create mode 100644 vapi/mutter-clutter-7-custom.vala
- create mode 100644 vapi/mutter-clutter-8-custom.vala
- create mode 100644 vapi/mutter-clutter-8.deps
- create mode 100644 vapi/mutter-clutter-8.vapi
- create mode 100644 vapi/mutter-cogl-8-custom.vala
- create mode 100644 vapi/mutter-cogl-8.deps
- create mode 100644 vapi/mutter-cogl-8.vapi
-
-diff --git src/wm/meson.build src/wm/meson.build
-index 583ce790..17e6bc07 100644
---- src/wm/meson.build
-+++ src/wm/meson.build
-@@ -18,17 +18,25 @@ budgie_wm_sources = [
- budgie_wm_status_vala_args = []
- 
- dep_graphene = dependency('graphene-gobject-1.0', version: '>= 1.10')
--dep_mutter = dependency('libmutter-7', version: gnome_minimum_version, required: false)
-+dep_mutter = dependency('libmutter-8', version: gnome_minimum_version, required: false)
- if dep_mutter.found()
--    budgie_wm_status_vala_args += ['-D', 'HAVE_MUTTER_7']
--    message('Using new libmutter-7 ABI from GNOME 3.38')
--    vapi_mutter = 'libmutter-7'
-+    # Assume mutter-7 compilation argument since no additional code changes required
-+    budgie_wm_status_vala_args += ['-D', 'HAVE_MUTTER_8']
-+    message('Using new libmutter-8 ABI from GNOME 40')
-+    vapi_mutter = 'libmutter-8'
- else
--    dep_mutter = dependency('libmutter-6', version: gnome_minimum_version)
--    budgie_wm_status_vala_args += ['-D', 'HAVE_MUTTER_6']
-+    dep_mutter = dependency('libmutter-7', version: gnome_minimum_version, required: false)
-     if dep_mutter.found()
--        message('Using new libmutter-6 ABI from GNOME 3.36')
--        vapi_mutter = 'libmutter-6'
-+        budgie_wm_status_vala_args += ['-D', 'HAVE_MUTTER_7']
-+        message('Using new libmutter-7 ABI from GNOME 3.38')
-+        vapi_mutter = 'libmutter-7'
-+    else
-+        dep_mutter = dependency('libmutter-6', version: gnome_minimum_version)
-+        budgie_wm_status_vala_args += ['-D', 'HAVE_MUTTER_6']
-+        if dep_mutter.found()
-+            message('Using new libmutter-6 ABI from GNOME 3.36')
-+            vapi_mutter = 'libmutter-6'
-+        endif
-     endif
- endif
- 
-diff --git src/wm/shim.vala src/wm/shim.vala
-index 4ba17a8e..5a985aa1 100644
---- src/wm/shim.vala
-+++ src/wm/shim.vala
-@@ -177,7 +177,11 @@ namespace Budgie {
- 			foreach (string accelerator in grabs.get_keys()) {
- 				if (grabs[accelerator] == action) {
- 					var params = new HashTable<string,Variant>(null, null);
-+#if HAVE_MUTTER_8
-+					params.set("device-name", new Variant.string(dev.get_device_name()));
-+#else
- 					params.set("device-id", new Variant.uint32(dev.id));
-+#endif
- 					params.set("action-mode", new Variant.uint32(action));
- 					params.set("device-mode", new Variant.string(dev.get_device_node()));
- 					params.set("timestamp", new Variant.uint32(timestamp));
-diff --git vapi/Clutter-7.metadata vapi/Clutter-7.metadata
-index 1855274d..f7b1d68b 100644
---- vapi/Clutter-7.metadata
-+++ vapi/Clutter-7.metadata
-@@ -2,6 +2,8 @@
- ActorBox struct
- Color struct
- Knot struct
-+Margin struct
-+PaintVolume struct
- PathNode struct
- Perspective struct
- Units struct
-@@ -35,11 +37,13 @@ value_get_color nullable
- // method/virtual-method/signal don't match
- Actor
- 	.event#method name="emit_event"
--	.get_paint_volume#method skip
-+	.get_paint_volume#virtual_method name="get_paint_volume_vfunc"
-+	.get_paint_volume#virtual_method.volume out
- 	.queue_redraw#signal skip
- 	.queue_redraw#virtual_method skip
- Container
- 	.add_actor skip=false
-+	.class_* skip
- Text
- 	.activate#method name="try_activate"
- 	.insert_text#signal skip
-@@ -58,6 +62,12 @@ Container
- Stage.read_pixels
- 	.width default=-1
- 	.height default=-1
-+Stage.get_capture_final_size
-+	.width out
-+	.height out
-+	.scale out
-+Stage.paint_to_buffer
-+    .data type="uint8[]"
- Text
- 	.position_to_coords.line_height default=null
- 
-@@ -70,11 +80,8 @@ LayoutManager
- 	.create_child_meta skip=false
- 
- // Variadic arguments
--Box
--	.pack skip=false
--	.pack_after skip=false
--	.pack_at skip=false
--	.pack_before skip=false
-+Backend
-+	.get_cogl_context skip=false
- Container
- 	.child_get skip=false
- 	.child_set skip=false
-@@ -91,10 +98,6 @@ LayoutManager
- Script
- 	.get_objects skip=false
- 
--// Changing error domains
--Texture
--	.new_from_file throws="Clutter.TextureError"
--
- // Skipped upstream for unknown reasons
- Interval.register_progress_func skip=false
- get_option_group skip=false
-@@ -111,45 +114,46 @@ ActorBox
- Units.from_* skip
- Color
- 	.new skip
-+Margin
-+	.new skip
- 
- // Class methods
- container_class_find_child_property skip
- container_class_list_child_properties skip
- 
- // Move symbols
-+color_from_* skip
- units_from_* skip
- 
--// Classes marked as out but not double ptr
--Actor
--	.get_margin.margin out=false
--DragAction
--	.get_drag_area.drag_area out=false
--InputDevice
--	.get_coords.point out=false
--Rect
--	.get_center.center out=false
--	.intersection.res out=false
--	.union.res out=false
--Timeline
--	.get_cubic_bezier_progress.c_* out=false
--ZoomAction
--	.get_focal_point.point out=false
--	.get_transformed_focal_point.point out=false
--
- // Struct return values
- color_get_static nullable
- 
-+// Upstream
-+Event
-+	.get_position.position out
-+
-+FrameListenerIface skip
-+FrameClock.new skip
-+
- // Remove for clutter-2.0
- /////////////////////////
- 
-+StageView.layout skip
-+
- Stage
-  	.event name="emit_event"
-+	.paint_view.redraw_clip type="Cairo.Region"
-+
-+Capture
-+  .image type="Cairo.ImageSurface"
- 
- // *Event should be compact classes derived from Clutter.Event
- Event.type skip=false
- AnyEvent struct=false base_type="Clutter.Event"
- ButtonEvent struct=false base_type="Clutter.Event"
- CrossingEvent struct=false base_type="Clutter.Event"
-+DeviceEvent struct=false base_type="Clutter.Event"
-+IMEvent struct=false base_type="Clutter.Event"
- KeyEvent struct=false base_type="Clutter.Event"
- MotionEvent struct=false base_type="Clutter.Event"
- ScrollEvent struct=false base_type="Clutter.Event"
-@@ -157,6 +161,10 @@ StageStateEvent struct=false base_type="Clutter.Event"
- TouchEvent struct=false base_type="Clutter.Event"
- TouchpadPinchEvent struct=false base_type="Clutter.Event"
- TouchpadSwipeEvent struct=false base_type="Clutter.Event"
-+ProximityEvent struct=false base_type="Clutter.Event"
-+PadButtonEvent struct=false base_type="Clutter.Event"
-+PadRingEvent struct=false base_type="Clutter.Event"
-+PadStripEvent struct=false base_type="Clutter.Event"
- 
- // Keysyms used to be CLUTTER_X instead of CLUTTER_KEY_X
- *#constant skip
-diff --git vapi/Clutter-8.metadata vapi/Clutter-8.metadata
-new file mode 100644
-index 00000000..fa1210f1
---- /dev/null
-+++ vapi/Clutter-8.metadata
-@@ -0,0 +1,187 @@
-+// Non mini-object
-+ActorBox struct
-+Color struct
-+Knot struct
-+Margin struct
-+PaintVolume struct
-+PathNode struct
-+Perspective struct
-+Units struct
-+
-+*.ref unowned
-+
-+init.argv unowned
-+init_with_args
-+	.argv unowned
-+Actor
-+	.apply_transform.matrix ref
-+	.get_abs_allocation_vertices.verts out=false
-+Canvas
-+	.new symbol_type="constructor"
-+Event.type#method name="get_type"
-+Image
-+	.new symbol_type="constructor"
-+
-+// ???
-+Actor.has_pointer#method name="get_has_pointer"
-+InitError errordomain=false
-+
-+// Not all backing symbols are deprecated
-+Actor.pick deprecated=false
-+
-+// Nullable return values
-+Actor
-+	.get_parent nullable
-+value_get_color nullable
-+
-+// method/virtual-method/signal don't match
-+Actor
-+	.event#method name="emit_event"
-+	.get_paint_volume#virtual_method name="get_paint_volume_vfunc"
-+	.get_paint_volume#virtual_method.volume out
-+Container
-+	.add_actor skip=false
-+	.class_* skip
-+Text
-+	.activate#method name="try_activate"
-+	.insert_text#signal skip
-+TextBuffer.get_text#virtual_method name="get_text_with_length"
-+
-+// virtual/abstract distinction
-+Container
-+	.lower virtual
-+	.raise virtual
-+	.*_child_meta#virtual_method virtual
-+
-+// Default values
-+Container
-+	.lower.sibling nullable default=null
-+	.raise.sibling nullable default=null
-+Stage.read_pixels
-+	.width default=-1
-+	.height default=-1
-+Stage.paint_to_buffer
-+    .data type="uint8[]"
-+Text
-+	.position_to_coords.line_height default=null
-+
-+// Reparented funcs methods can't be instance methods
-+feature_available skip
-+feature_get_all skip
-+
-+// Skipped by g-i for unknown reasons
-+LayoutManager
-+	.create_child_meta skip=false
-+
-+// Variadic arguments
-+Backend
-+	.get_cogl_context skip=false
-+Container
-+	.child_get skip=false
-+	.child_set skip=false
-+	.remove skip=false
-+Interval
-+	.new skip=false
-+	.get_interval skip=false
-+	.set_final skip=false
-+	.set_initial skip=false
-+	.set_interval skip=false
-+LayoutManager
-+	.child_get skip=false
-+	.child_set skip=false
-+Script
-+	.get_objects skip=false
-+
-+// Skipped upstream for unknown reasons
-+Interval.register_progress_func skip=false
-+get_option_group skip=false
-+get_option_group_without_init skip=false
-+threads_add_idle skip=false
-+threads_add_idle_full skip=false
-+threads_add_timeout skip=false
-+threads_add_timeout_full skip=false
-+
-+// struct/class confusion
-+ActorBox
-+	.new skip
-+	.from_vertices skip
-+Units.from_* skip
-+Color
-+	.new skip
-+Margin
-+	.new skip
-+
-+// Class methods
-+container_class_find_child_property skip
-+container_class_list_child_properties skip
-+
-+// Move symbols
-+color_from_* skip
-+units_from_* skip
-+
-+// Struct return values
-+color_get_static nullable
-+
-+// Upstream
-+Event
-+	.get_position.position out
-+
-+FrameListenerIface skip
-+FrameClock.new skip
-+
-+// Remove for clutter-2.0
-+/////////////////////////
-+
-+StageView.layout skip
-+
-+Stage
-+ 	.event name="emit_event"
-+	.paint_view.redraw_clip type="Cairo.Region"
-+
-+Capture
-+  .image type="Cairo.ImageSurface"
-+
-+// *Event should be compact classes derived from Clutter.Event
-+Event.type skip=false
-+AnyEvent struct=false base_type="Clutter.Event"
-+ButtonEvent struct=false base_type="Clutter.Event"
-+CrossingEvent struct=false base_type="Clutter.Event"
-+DeviceEvent struct=false base_type="Clutter.Event"
-+IMEvent struct=false base_type="Clutter.Event"
-+KeyEvent struct=false base_type="Clutter.Event"
-+MotionEvent struct=false base_type="Clutter.Event"
-+ScrollEvent struct=false base_type="Clutter.Event"
-+TouchEvent struct=false base_type="Clutter.Event"
-+TouchpadPinchEvent struct=false base_type="Clutter.Event"
-+TouchpadSwipeEvent struct=false base_type="Clutter.Event"
-+ProximityEvent struct=false base_type="Clutter.Event"
-+PadButtonEvent struct=false base_type="Clutter.Event"
-+PadRingEvent struct=false base_type="Clutter.Event"
-+PadStripEvent struct=false base_type="Clutter.Event"
-+
-+// Keysyms used to be CLUTTER_X instead of CLUTTER_KEY_X
-+*#constant skip
-+COGL skip=false
-+CURRENT_TIME skip=false
-+FLAVOUR skip=false
-+PATH_RELATIVE skip=false
-+PRIORITY_REDRAW skip=false
-+
-+// Clutter devs don't like us creating nested namespaces
-+value_* name="value_(.+)" parent="Clutter.Value"
-+threads_* name="threads_(.+)" parent="Clutter.Threads"
-+threads_add_idle name="add" parent="Clutter.Threads.Idle"
-+threads_add_idle_full name="add_full" parent="Clutter.Threads.Idle"
-+threads_add_timeout name="add" parent="Clutter.Threads.Timeout"
-+threads_add_timeout_full name="add_full" parent="Clutter.Threads.Timeout"
-+
-+// Backwards compatibility
-+Color.alloc symbol_type="function"
-+
-+BinAlignment deprecated=false deprecated_since=null
-+BinAlignment.* deprecated
-+BinAlignment.start deprecated=false
-+BinLayout.new.*_align default=Clutter.BinAlignment.START
-+
-+// Possibly keep
-+KEY_* skip=false name="KEY_(.+)" type="uint" parent="Clutter.Key"
-diff --git vapi/Meta-7.metadata vapi/Meta-7.metadata
-index 72629fba..ababf5d9 100644
---- vapi/Meta-7.metadata
-+++ vapi/Meta-7.metadata
-@@ -9,6 +9,10 @@ Barrier cheader_filename="meta/barrier.h"
- BarrierEvent cheader_filename="meta/barrier.h"
- CloseDialog cheader_filename="meta/meta-close-dialog.h"
- CursorTracker cheader_filename="meta/meta-cursor-tracker.h"
-+CursorTracker.get_for_display parent="Meta.Display" symbol_type="method" instance_idx=0 name="get_cursor_tracker"
-+CursorTracker.get_pointer.x out
-+CursorTracker.get_pointer.y out
-+CursorTracker.get_pointer.mods out
- Display cheader_filename="meta/display.h"
- Dnd cheader_filename="meta/meta-dnd.h"
- IdleMonitor cheader_filename="meta/meta-idle-monitor.h"
-@@ -20,6 +24,10 @@ Preference cheader_filename="meta/prefs.h"
- RemoteAccessController cheader_filename="meta/meta-remote-access-controller.h"
- RemoteAccessHandle cheader_filename="meta/meta-remote-access-controller.h"
- Settings cheader_filename="meta/meta-settings.h"
-+Selection cheader_filename="meta/meta-selection.h"
-+SelectionSource cheader_filename="meta/meta-selection.h"
-+SelectionSourceMemory cheader_filename="meta/meta-selection-source-memory.h"
-+SelectionType cheader_filename="meta/meta-selection-source.h"
- ShadowFactory cheader_filename="meta/meta-shadow-factory.h"
- ShapedTexture cheader_filename="meta/meta-shaped-texture.h"
- SoundPlayer cheader_filename="meta/meta-sound-player.h"
-diff --git vapi/Meta-8.metadata vapi/Meta-8.metadata
-new file mode 100644
-index 00000000..0e00117f
---- /dev/null
-+++ vapi/Meta-8.metadata
-@@ -0,0 +1,85 @@
-+Backend cheader_filename="meta/meta-backend.h"
-+Background cheader_filename="meta/meta-background.h"
-+BackgroundActor cheader_filename="meta/meta-background-actor.h"
-+BackgroundContent cheader_filename="meta/meta-background-content.h"
-+BackgroundGroup cheader_filename="meta/meta-background-group.h"
-+BackgroundImage cheader_filename="meta/meta-background-image.h"
-+BackgroundImageCache cheader_filename="meta/meta-background-image.h"
-+Barrier cheader_filename="meta/barrier.h"
-+BarrierEvent cheader_filename="meta/barrier.h"
-+CloseDialog cheader_filename="meta/meta-close-dialog.h"
-+CursorTracker cheader_filename="meta/meta-cursor-tracker.h"
-+CursorTracker.get_for_display parent="Meta.Display" symbol_type="method" instance_idx=0 name="get_cursor_tracker"
-+CursorTracker.get_pointer.mods out
-+Display cheader_filename="meta/display.h"
-+Dnd cheader_filename="meta/meta-dnd.h"
-+IdleMonitor cheader_filename="meta/meta-idle-monitor.h"
-+InhibitShortcutsDialog cheader_filename="meta/meta-inhibit-shortcuts-dialog.h"
-+LaunchContext cheader_filename="meta/meta-launch-context.h"
-+Meta cheader_filename="meta/main.h"
-+MonitorManager cheader_filename="meta/meta-monitor-manager.h"
-+Preference cheader_filename="meta/prefs.h"
-+RemoteAccessController cheader_filename="meta/meta-remote-access-controller.h"
-+RemoteAccessHandle cheader_filename="meta/meta-remote-access-controller.h"
-+Settings cheader_filename="meta/meta-settings.h"
-+Selection cheader_filename="meta/meta-selection.h"
-+SelectionSource cheader_filename="meta/meta-selection.h"
-+SelectionSourceMemory cheader_filename="meta/meta-selection-source-memory.h"
-+SelectionType cheader_filename="meta/meta-selection-source.h"
-+ShadowFactory cheader_filename="meta/meta-shadow-factory.h"
-+ShapedTexture cheader_filename="meta/meta-shaped-texture.h"
-+SoundPlayer cheader_filename="meta/meta-sound-player.h"
-+Stage cheader_filename="meta/meta-stage.h"
-+StartupNotification cheader_filename="meta/meta-startup-notification.h"
-+Theme cheader_filename="meta/theme.h"
-+WaylandClient cheader_filename="meta/meta-wayland-client.h"
-+Window cheader_filename="meta/window.h"
-+WindowActor cheader_filename="meta/meta-window-actor.h"
-+WindowGroup cheader_filename="meta/meta-window-group.h"
-+WindowShape cheader_filename="meta/meta-window-shape.h"
-+Workspace cheader_filename="meta/workspace.h"
-+WorkspaceManager cheader_filename="meta/meta-workspace-manager.h"
-+X11Display cheader_filename="meta/meta-x11-display.h"
-+Rectangle struct
-+Plugin cheader_filename="meta/meta-plugin.h"
-+PluginInfo cheader_filename="meta/meta-plugin.h"
-+prefs_* cheader_filename="meta/prefs.h" parent="Meta.Prefs"
-+add_verbose_topic parent="Meta.Util" cheader_filename="meta/util.h"
-+x11_error_trap_pop parent="Meta.Util" cheader_filename="meta/util.h"
-+x11_error_trap_push parent="Meta.Util" cheader_filename="meta/util.h"
-+x11_error_trap_pop_with_return parent="Meta.Util" cheader_filename="meta/util.h"
-+external_binding_name_for_action parent="Meta.Util" cheader_filename="meta/util.h"
-+get_locale_direction parent="Meta.Util" cheader_filename="meta/util.h"
-+gravity_to_string parent="Meta.Util" cheader_filename="meta/util.h"
-+is_syncing parent="Meta.Util" cheader_filename="meta/util.h"
-+is_verbose parent="Meta.Util" cheader_filename="meta/util.h"
-+is_wayland_compositor parent="Meta.Util" cheader_filename="meta/util.h"
-+later_add parent="Meta.Util" cheader_filename="meta/util.h"
-+later_remove parent="Meta.Util" cheader_filename="meta/util.h"
-+pop_no_msg_prefix parent="Meta.Util" cheader_filename="meta/util.h"
-+push_no_msg_prefix parent="Meta.Util" cheader_filename="meta/util.h"
-+rect parent="Meta.Util" cheader_filename="meta/util.h"
-+remove_verbose_topic parent="Meta.Util" cheader_filename="meta/util.h"
-+unsigned_long_equal parent="Meta.Util" cheader_filename="meta/util.h"
-+unsigned_long_hash parent="Meta.Util" cheader_filename="meta/util.h"
-+show_dialog parent="Meta.Util" cheader_filename="meta/util.h"
-+get_stage_for_display parent="Meta.Compositor" cheader_filename="meta/compositor-mutter.h"
-+get_window_actors parent="Meta.Compositor" cheader_filename="meta/compositor-mutter.h"
-+get_window_group_for_display parent="Meta.Compositor" cheader_filename="meta/compositor-mutter.h"
-+get_top_window_group_for_display parent="Meta.Compositor" cheader_filename="meta/compositor-mutter.h"
-+get_feedback_group_for_display parent="Meta.Compositor" cheader_filename="meta/compositor-mutter.h"
-+disable_unredirect_for_display parent="Meta.Compositor" cheader_filename="meta/compositor-mutter.h"
-+enable_unredirect_for_display parent="Meta.Compositor" cheader_filename="meta/compositor-mutter.h"
-+focus_stage_window parent="Meta.Compositor" cheader_filename="meta/compositor-mutter.h"
-+keybindings_set_custom_handler parent="Meta.KeyBinding" name="set_custom_handler"
-+KeyHandlerFunc.event type="Clutter.KeyEvent?"
-+get_backend parent="Meta.Backend"
-+Window.focus#signal skip=true
-+Window.get_xwindow skip=false
-+get_option_context skip=false
-+set_gnome_wm_keybindings skip=false
-+set_wm_name skip=false
-+init skip=false
-+run skip=false
-+show_dialog skip=false
-+get_backend cheader_filename="meta/meta-backend.h"
-diff --git vapi/generate-mutter-vapi.sh vapi/generate-mutter-vapi.sh
-index b233e586..11740435 100755
---- vapi/generate-mutter-vapi.sh
-+++ vapi/generate-mutter-vapi.sh
-@@ -1,7 +1,7 @@
- #!/bin/bash
- set -xe
- 
--version=${6-7}
-+version=${6-8}
- girdir=$(pkg-config libmutter-$version --variable=girdir)
- 
- cd $(dirname $0)
-diff --git vapi/libmutter-7-custom.vala vapi/libmutter-7-custom.vala
-index 1e0b917c..73bc5f1b 100644
---- vapi/libmutter-7-custom.vala
-+++ vapi/libmutter-7-custom.vala
-@@ -5,3 +5,10 @@ public struct before_frame {
- [CCode (has_type_id = false)]
- public struct frame {
- }
-+
-+namespace Meta {
-+	[CCode (cheader_filename = "meta/meta-backend.h", type_id = "meta_backend_get_type ()")]
-+	public abstract class Backend : GLib.Object, GLib.Initable {
-+        public unowned Meta.Settings get_settings ();
-+    }
-+}
-\ No newline at end of file
-diff --git vapi/libmutter-7.vapi vapi/libmutter-7.vapi
-index 6bfdc4b7..30f8892c 100644
---- vapi/libmutter-7.vapi
-+++ vapi/libmutter-7.vapi
-@@ -149,7 +149,7 @@ namespace Meta {
- 		public static void x11_error_trap_push (Meta.X11Display x11_display);
- 	}
- 	[CCode (cheader_filename = "meta/meta-backend.h", type_id = "meta_backend_get_type ()")]
--	public abstract class Backend : GLib.Object, GLib.Initable {
-+	public abstract class Backend : GLib.Object, GLib.Initable, GLib.Initable {
- 		[CCode (has_construct_function = false)]
- 		protected Backend ();
- 		[CCode (cheader_filename = "meta/meta-backend.h", cname = "meta_get_backend")]
-@@ -277,9 +277,8 @@ namespace Meta {
- 	public class CursorTracker : GLib.Object {
- 		[CCode (has_construct_function = false)]
- 		protected CursorTracker ();
--		public static unowned Meta.CursorTracker get_for_display (Meta.Display display);
- 		public void get_hot (out int x, out int y);
--		public void get_pointer (int x, int y, Clutter.ModifierType mods);
-+		public void get_pointer (out int x, out int y, out Clutter.ModifierType mods);
- 		public bool get_pointer_visible ();
- 		public unowned Cogl.Texture get_sprite ();
- 		public void set_pointer_visible (bool visible);
-@@ -304,6 +303,8 @@ namespace Meta {
- 		public int get_current_monitor ();
- 		public uint32 get_current_time ();
- 		public uint32 get_current_time_roundtrip ();
-+		[CCode (cname = "meta_cursor_tracker_get_for_display")]
-+		public unowned Meta.CursorTracker get_cursor_tracker ();
- 		public unowned Meta.Window get_focus_window ();
- 		public Meta.GrabOp get_grab_op ();
- 		public uint get_keybinding_action (uint keycode, ulong mask);
-@@ -422,10 +423,12 @@ namespace Meta {
- 		public static int get_display_configuration_timeout ();
- 		public bool get_is_builtin_display_on ();
- 		public int get_monitor_for_connector (string connector);
-+		public bool get_panel_orientation_managed ();
- 		public Meta.MonitorSwitchConfigType get_switch_config ();
- 		public void switch_config (Meta.MonitorSwitchConfigType config_type);
- 		[NoAccessorMethod]
- 		public Meta.Backend backend { owned get; construct; }
-+		public bool panel_orientation_managed { get; }
- 		public signal void confirm_display_change ();
- 		public signal void monitors_changed ();
- 		public signal void monitors_changed_internal ();
-@@ -504,7 +507,7 @@ namespace Meta {
- 		public bool is_recording { get; construct; }
- 		public signal void stopped ();
- 	}
--	[CCode (cheader_filename = "meta/main.h", type_id = "meta_selection_get_type ()")]
-+	[CCode (cheader_filename = "meta/meta-selection.h", type_id = "meta_selection_get_type ()")]
- 	public class Selection : GLib.Object {
- 		[CCode (has_construct_function = false)]
- 		public Selection (Meta.Display display);
-@@ -514,7 +517,7 @@ namespace Meta {
- 		public void unset_owner (Meta.SelectionType selection_type, Meta.SelectionSource owner);
- 		public signal void owner_changed (uint object, Meta.SelectionSource p0);
- 	}
--	[CCode (cheader_filename = "meta/main.h", type_id = "meta_selection_source_get_type ()")]
-+	[CCode (cheader_filename = "meta/meta-selection.h", type_id = "meta_selection_source_get_type ()")]
- 	public class SelectionSource : GLib.Object {
- 		[CCode (has_construct_function = false)]
- 		protected SelectionSource ();
-@@ -524,7 +527,7 @@ namespace Meta {
- 		public virtual signal void activated ();
- 		public virtual signal void deactivated ();
- 	}
--	[CCode (cheader_filename = "meta/main.h", type_id = "meta_selection_source_memory_get_type ()")]
-+	[CCode (cheader_filename = "meta/meta-selection-source-memory.h", type_id = "meta_selection_source_memory_get_type ()")]
- 	public class SelectionSourceMemory : Meta.SelectionSource {
- 		[CCode (has_construct_function = false, type = "MetaSelectionSource*")]
- 		public SelectionSourceMemory (string mimetype, GLib.Bytes content);
-@@ -768,6 +771,7 @@ namespace Meta {
- 		public uint user_time { get; }
- 		public Meta.WindowType window_type { get; }
- 		public string wm_class { get; }
-+		public signal void monitor_changed (int old_monitor);
- 		public signal void position_changed ();
- 		public signal void raised ();
- 		public signal void shown ();
-@@ -1012,6 +1016,12 @@ namespace Meta {
- 		BLANK,
- 		LAST
- 	}
-+	[CCode (cheader_filename = "meta/main.h", cprefix = "META_DEBUG_PAINT_", type_id = "meta_debug_paint_flag_get_type ()")]
-+	[Flags]
-+	public enum DebugPaintFlag {
-+		NONE,
-+		OPAQUE_REGION
-+	}
- 	[CCode (cheader_filename = "meta/main.h", cprefix = "META_DEBUG_", type_id = "meta_debug_topic_get_type ()")]
- 	[Flags]
- 	public enum DebugTopic {
-@@ -1354,7 +1364,7 @@ namespace Meta {
- 		CHECK_ALIVE_TIMEOUT;
- 		public unowned string to_string ();
- 	}
--	[CCode (cheader_filename = "meta/main.h", cprefix = "META_", type_id = "meta_selection_type_get_type ()")]
-+	[CCode (cheader_filename = "meta/meta-selection-source.h", cprefix = "META_", type_id = "meta_selection_type_get_type ()")]
- 	public enum SelectionType {
- 		SELECTION_PRIMARY,
- 		SELECTION_CLIPBOARD,
-@@ -1491,12 +1501,16 @@ namespace Meta {
- 	[CCode (cheader_filename = "meta/main.h")]
- 	public static void add_clutter_debug_flags (Clutter.DebugFlag debug_flags, Clutter.DrawDebugFlag draw_flags, Clutter.PickDebugFlag pick_flags);
- 	[CCode (cheader_filename = "meta/main.h")]
-+	public static void add_debug_paint_flag (Meta.DebugPaintFlag flag);
-+	[CCode (cheader_filename = "meta/main.h")]
- 	public static void clutter_init ();
- 	[CCode (cheader_filename = "meta/main.h")]
- 	public static void exit (Meta.ExitCode code);
- 	[CCode (cheader_filename = "meta/main.h")]
- 	public static string g_utf8_strndup (string src, size_t n);
- 	[CCode (cheader_filename = "meta/main.h")]
-+	public static Meta.DebugPaintFlag get_debug_paint_flags ();
-+	[CCode (cheader_filename = "meta/main.h")]
- 	public static unowned GLib.OptionContext get_option_context ();
- 	[CCode (cheader_filename = "meta/main.h")]
- 	public static bool get_replace_current_wm ();
-@@ -1511,6 +1525,8 @@ namespace Meta {
- 	[CCode (cheader_filename = "meta/main.h")]
- 	public static void remove_clutter_debug_flags (Clutter.DebugFlag debug_flags, Clutter.DrawDebugFlag draw_flags, Clutter.PickDebugFlag pick_flags);
- 	[CCode (cheader_filename = "meta/main.h")]
-+	public static void remove_debug_paint_flag (Meta.DebugPaintFlag flag);
-+	[CCode (cheader_filename = "meta/main.h")]
- 	public static void restart (string? message);
- 	[CCode (cheader_filename = "meta/main.h")]
- 	public static int run ();
-diff --git vapi/libmutter-8-custom.vala vapi/libmutter-8-custom.vala
-new file mode 100644
-index 00000000..73bc5f1b
---- /dev/null
-+++ vapi/libmutter-8-custom.vala
-@@ -0,0 +1,14 @@
-+[CCode (has_type_id = false)]
-+public struct before_frame {
-+}
-+
-+[CCode (has_type_id = false)]
-+public struct frame {
-+}
-+
-+namespace Meta {
-+	[CCode (cheader_filename = "meta/meta-backend.h", type_id = "meta_backend_get_type ()")]
-+	public abstract class Backend : GLib.Object, GLib.Initable {
-+        public unowned Meta.Settings get_settings ();
-+    }
-+}
-\ No newline at end of file
-diff --git vapi/libmutter-8.deps vapi/libmutter-8.deps
-new file mode 100644
-index 00000000..d94a615d
---- /dev/null
-+++ vapi/libmutter-8.deps
-@@ -0,0 +1,6 @@
-+gtk+-3.0
-+json-glib-1.0
-+mutter-clutter-8
-+x11
-+xfixes-4.0
-+graphene-gobject-1.0
-diff --git vapi/libmutter-8.vapi vapi/libmutter-8.vapi
-new file mode 100644
-index 00000000..5cdc794f
---- /dev/null
-+++ vapi/libmutter-8.vapi
-@@ -0,0 +1,1535 @@
-+/* libmutter-8.vapi generated by vapigen, do not modify. */
-+
-+[CCode (cprefix = "Meta", gir_namespace = "Meta", gir_version = "8", lower_case_cprefix = "meta_")]
-+namespace Meta {
-+	namespace Compositor {
-+		[CCode (cheader_filename = "meta/compositor-mutter.h", cname = "meta_disable_unredirect_for_display")]
-+		public static void disable_unredirect_for_display (Meta.Display display);
-+		[CCode (cheader_filename = "meta/compositor-mutter.h", cname = "meta_enable_unredirect_for_display")]
-+		public static void enable_unredirect_for_display (Meta.Display display);
-+		[CCode (cheader_filename = "meta/compositor-mutter.h", cname = "meta_focus_stage_window")]
-+		public static void focus_stage_window (Meta.Display display, uint32 timestamp);
-+		[CCode (cheader_filename = "meta/compositor-mutter.h", cname = "meta_get_feedback_group_for_display")]
-+		public static unowned Clutter.Actor get_feedback_group_for_display (Meta.Display display);
-+		[CCode (cheader_filename = "meta/compositor-mutter.h", cname = "meta_get_stage_for_display")]
-+		public static unowned Clutter.Actor get_stage_for_display (Meta.Display display);
-+		[CCode (cheader_filename = "meta/compositor-mutter.h", cname = "meta_get_top_window_group_for_display")]
-+		public static unowned Clutter.Actor get_top_window_group_for_display (Meta.Display display);
-+		[CCode (cheader_filename = "meta/compositor-mutter.h", cname = "meta_get_window_actors")]
-+		public static unowned GLib.List<Clutter.Actor> get_window_actors (Meta.Display display);
-+		[CCode (cheader_filename = "meta/compositor-mutter.h", cname = "meta_get_window_group_for_display")]
-+		public static unowned Clutter.Actor get_window_group_for_display (Meta.Display display);
-+	}
-+	namespace Prefs {
-+		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_bell_is_audible")]
-+		public static bool prefs_bell_is_audible ();
-+		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_change_workspace_name")]
-+		public static void prefs_change_workspace_name (int i, string name);
-+		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_action_double_click_titlebar")]
-+		public static GDesktop.TitlebarAction prefs_get_action_double_click_titlebar ();
-+		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_action_middle_click_titlebar")]
-+		public static GDesktop.TitlebarAction prefs_get_action_middle_click_titlebar ();
-+		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_action_right_click_titlebar")]
-+		public static GDesktop.TitlebarAction prefs_get_action_right_click_titlebar ();
-+		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_attach_modal_dialogs")]
-+		public static bool prefs_get_attach_modal_dialogs ();
-+		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_auto_maximize")]
-+		public static bool prefs_get_auto_maximize ();
-+		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_auto_raise")]
-+		public static bool prefs_get_auto_raise ();
-+		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_auto_raise_delay")]
-+		public static int prefs_get_auto_raise_delay ();
-+		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_button_layout")]
-+		public static Meta.ButtonLayout prefs_get_button_layout ();
-+		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_center_new_windows")]
-+		public static bool prefs_get_center_new_windows ();
-+		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_check_alive_timeout")]
-+		public static uint prefs_get_check_alive_timeout ();
-+		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_compositing_manager")]
-+		public static bool prefs_get_compositing_manager ();
-+		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_cursor_size")]
-+		public static int prefs_get_cursor_size ();
-+		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_cursor_theme")]
-+		public static unowned string prefs_get_cursor_theme ();
-+		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_disable_workarounds")]
-+		public static bool prefs_get_disable_workarounds ();
-+		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_drag_threshold")]
-+		public static int prefs_get_drag_threshold ();
-+		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_draggable_border_width")]
-+		public static int prefs_get_draggable_border_width ();
-+		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_dynamic_workspaces")]
-+		public static bool prefs_get_dynamic_workspaces ();
-+		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_edge_tiling")]
-+		public static bool prefs_get_edge_tiling ();
-+		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_focus_change_on_pointer_rest")]
-+		public static bool prefs_get_focus_change_on_pointer_rest ();
-+		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_focus_mode")]
-+		public static GDesktop.FocusMode prefs_get_focus_mode ();
-+		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_focus_new_windows")]
-+		public static GDesktop.FocusNewWindows prefs_get_focus_new_windows ();
-+		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_force_fullscreen")]
-+		public static bool prefs_get_force_fullscreen ();
-+		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_gnome_accessibility")]
-+		public static bool prefs_get_gnome_accessibility ();
-+		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_gnome_animations")]
-+		public static bool prefs_get_gnome_animations ();
-+		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_keybinding_action")]
-+		public static Meta.KeyBindingAction prefs_get_keybinding_action (string name);
-+		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_mouse_button_menu")]
-+		public static int prefs_get_mouse_button_menu ();
-+		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_mouse_button_mods")]
-+		public static Meta.VirtualModifier prefs_get_mouse_button_mods ();
-+		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_mouse_button_resize")]
-+		public static int prefs_get_mouse_button_resize ();
-+		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_num_workspaces")]
-+		public static int prefs_get_num_workspaces ();
-+		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_raise_on_click")]
-+		public static bool prefs_get_raise_on_click ();
-+		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_show_fallback_app_menu")]
-+		public static bool prefs_get_show_fallback_app_menu ();
-+		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_titlebar_font")]
-+		public static unowned Pango.FontDescription prefs_get_titlebar_font ();
-+		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_visual_bell")]
-+		public static bool prefs_get_visual_bell ();
-+		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_visual_bell_type")]
-+		public static GDesktop.VisualBellType prefs_get_visual_bell_type ();
-+		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_workspace_name")]
-+		public static unowned string prefs_get_workspace_name (int i);
-+		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_get_workspaces_only_on_primary")]
-+		public static bool prefs_get_workspaces_only_on_primary ();
-+		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_init")]
-+		public static void prefs_init ();
-+		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_set_force_fullscreen")]
-+		public static void prefs_set_force_fullscreen (bool whether);
-+		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_set_num_workspaces")]
-+		public static void prefs_set_num_workspaces (int n_workspaces);
-+		[CCode (cheader_filename = "meta/prefs.h", cname = "meta_prefs_set_show_fallback_app_menu")]
-+		public static void prefs_set_show_fallback_app_menu (bool whether);
-+	}
-+	namespace Util {
-+		[CCode (cheader_filename = "meta/util.h", cname = "meta_add_verbose_topic")]
-+		public static void add_verbose_topic (Meta.DebugTopic topic);
-+		[CCode (cheader_filename = "meta/util.h", cname = "meta_external_binding_name_for_action")]
-+		public static string external_binding_name_for_action (uint keybinding_action);
-+		[CCode (cheader_filename = "meta/util.h", cname = "meta_get_locale_direction")]
-+		public static Meta.LocaleDirection get_locale_direction ();
-+		[CCode (cheader_filename = "meta/util.h", cname = "meta_gravity_to_string")]
-+		public static unowned string gravity_to_string (Meta.Gravity gravity);
-+		[CCode (cheader_filename = "meta/util.h", cname = "meta_is_syncing")]
-+		public static bool is_syncing ();
-+		[CCode (cheader_filename = "meta/util.h", cname = "meta_is_verbose")]
-+		public static bool is_verbose ();
-+		[CCode (cheader_filename = "meta/util.h", cname = "meta_is_wayland_compositor")]
-+		public static bool is_wayland_compositor ();
-+		[CCode (cheader_filename = "meta/util.h", cname = "meta_later_add")]
-+		public static uint later_add (Meta.LaterType when, owned GLib.SourceFunc func);
-+		[CCode (cheader_filename = "meta/util.h", cname = "meta_later_remove")]
-+		public static void later_remove (uint later_id);
-+		[CCode (cheader_filename = "meta/util.h", cname = "meta_pop_no_msg_prefix")]
-+		public static void pop_no_msg_prefix ();
-+		[CCode (cheader_filename = "meta/util.h", cname = "meta_push_no_msg_prefix")]
-+		public static void push_no_msg_prefix ();
-+		[CCode (cheader_filename = "meta/util.h", cname = "meta_rect")]
-+		public static Meta.Rectangle? rect (int x, int y, int width, int height);
-+		[CCode (cheader_filename = "meta/util.h", cname = "meta_remove_verbose_topic")]
-+		public static void remove_verbose_topic (Meta.DebugTopic topic);
-+		[CCode (cheader_filename = "meta/util.h", cname = "meta_show_dialog")]
-+		public static GLib.Pid show_dialog (string type, string message, string timeout, string display, string ok_text, string cancel_text, string icon_name, int transient_for, GLib.SList<void*> columns, GLib.SList<void*> entries);
-+		[CCode (cheader_filename = "meta/util.h", cname = "meta_unsigned_long_equal")]
-+		public static int unsigned_long_equal (void* v1, void* v2);
-+		[CCode (cheader_filename = "meta/util.h", cname = "meta_unsigned_long_hash")]
-+		public static uint unsigned_long_hash (void* v);
-+		[CCode (cheader_filename = "meta/util.h", cname = "meta_x11_error_trap_pop")]
-+		public static void x11_error_trap_pop (Meta.X11Display x11_display);
-+		[CCode (cheader_filename = "meta/util.h", cname = "meta_x11_error_trap_pop_with_return")]
-+		public static int x11_error_trap_pop_with_return (Meta.X11Display x11_display);
-+		[CCode (cheader_filename = "meta/util.h", cname = "meta_x11_error_trap_push")]
-+		public static void x11_error_trap_push (Meta.X11Display x11_display);
-+	}
-+	[CCode (cheader_filename = "meta/meta-backend.h", type_id = "meta_backend_get_type ()")]
-+	public abstract class Backend : GLib.Object, GLib.Initable, GLib.Initable {
-+		[CCode (has_construct_function = false)]
-+		protected Backend ();
-+		[CCode (cheader_filename = "meta/meta-backend.h", cname = "meta_get_backend")]
-+		public static unowned Meta.Backend get_backend ();
-+		public unowned Meta.Dnd get_dnd ();
-+		public unowned Meta.RemoteAccessController get_remote_access_controller ();
-+		public unowned Meta.Settings get_settings ();
-+		public unowned Clutter.Actor get_stage ();
-+		public bool is_rendering_hardware_accelerated ();
-+		public void lock_layout_group (uint idx);
-+		public void set_keymap (string layouts, string variants, string options);
-+		public void set_numlock (bool numlock_state);
-+		public signal void keymap_changed ();
-+		public signal void keymap_layout_group_changed (uint object);
-+		public signal void last_device_changed (Clutter.InputDevice object);
-+		public signal void lid_is_closed_changed (bool object);
-+	}
-+	[CCode (cheader_filename = "meta/meta-background.h", type_id = "meta_background_get_type ()")]
-+	public class Background : GLib.Object {
-+		[CCode (has_construct_function = false)]
-+		public Background (Meta.Display display);
-+		public static void refresh_all ();
-+		public void set_blend (GLib.File file1, GLib.File file2, double blend_factor, GDesktop.BackgroundStyle style);
-+		public void set_color (Clutter.Color color);
-+		public void set_file (GLib.File? file, GDesktop.BackgroundStyle style);
-+		public void set_gradient (GDesktop.BackgroundShading shading_direction, Clutter.Color color, Clutter.Color second_color);
-+		[NoAccessorMethod]
-+		public Meta.Display meta_display { owned get; construct; }
-+		public signal void changed ();
-+	}
-+	[CCode (cheader_filename = "meta/meta-background-actor.h", type_id = "meta_background_actor_get_type ()")]
-+	public class BackgroundActor : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
-+		[CCode (has_construct_function = false, type = "ClutterActor*")]
-+		public BackgroundActor (Meta.Display display, int monitor);
-+		[NoAccessorMethod]
-+		public Meta.Display meta_display { owned get; construct; }
-+		[NoAccessorMethod]
-+		public int monitor { get; construct; }
-+	}
-+	[CCode (cheader_filename = "meta/meta-background-content.h", type_id = "meta_background_content_get_type ()")]
-+	public class BackgroundContent : GLib.Object, Clutter.Content {
-+		[CCode (has_construct_function = false)]
-+		protected BackgroundContent ();
-+		public static Clutter.Content @new (Meta.Display display, int monitor);
-+		public void set_background (Meta.Background background);
-+		public void set_gradient (bool enabled, int height, double tone_start);
-+		public void set_rounded_clip_bounds (Graphene.Rect? bounds);
-+		public void set_rounded_clip_radius (float radius);
-+		public void set_vignette (bool enabled, double brightness, double sharpness);
-+		[NoAccessorMethod]
-+		public Meta.Background background { owned get; set; }
-+		[NoAccessorMethod]
-+		public double brightness { get; set; }
-+		[NoAccessorMethod]
-+		public bool gradient { get; set; }
-+		[NoAccessorMethod]
-+		public int gradient_height { get; set; }
-+		[NoAccessorMethod]
-+		public double gradient_max_darkness { get; set; }
-+		[NoAccessorMethod]
-+		public Meta.Display meta_display { owned get; construct; }
-+		[NoAccessorMethod]
-+		public int monitor { get; construct; }
-+		[NoAccessorMethod]
-+		public float rounded_clip_radius { get; set; }
-+		[NoAccessorMethod]
-+		public bool vignette { get; set; }
-+		[NoAccessorMethod]
-+		public double vignette_sharpness { get; set; }
-+	}
-+	[CCode (cheader_filename = "meta/meta-background-group.h", type_id = "meta_background_group_get_type ()")]
-+	public class BackgroundGroup : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
-+		[CCode (has_construct_function = false, type = "ClutterActor*")]
-+		public BackgroundGroup ();
-+	}
-+	[CCode (cheader_filename = "meta/meta-background-image.h", type_id = "meta_background_image_get_type ()")]
-+	public class BackgroundImage : GLib.Object {
-+		[CCode (has_construct_function = false)]
-+		protected BackgroundImage ();
-+		public bool get_success ();
-+		public unowned Cogl.Texture get_texture ();
-+		public bool is_loaded ();
-+		public signal void loaded ();
-+	}
-+	[CCode (cheader_filename = "meta/meta-background-image.h", type_id = "meta_background_image_cache_get_type ()")]
-+	public class BackgroundImageCache : GLib.Object {
-+		[CCode (has_construct_function = false)]
-+		protected BackgroundImageCache ();
-+		public static unowned Meta.BackgroundImageCache get_default ();
-+		public Meta.BackgroundImage load (GLib.File file);
-+		public void purge (GLib.File file);
-+	}
-+	[CCode (cheader_filename = "meta/barrier.h", type_id = "meta_barrier_get_type ()")]
-+	public class Barrier : GLib.Object {
-+		[CCode (has_construct_function = false)]
-+		protected Barrier ();
-+		public void destroy ();
-+		public bool is_active ();
-+		public void release (Meta.BarrierEvent event);
-+		[NoAccessorMethod]
-+		public Meta.BarrierDirection directions { get; construct; }
-+		[NoAccessorMethod]
-+		public Meta.Display display { owned get; construct; }
-+		[NoAccessorMethod]
-+		public int x1 { get; construct; }
-+		[NoAccessorMethod]
-+		public int x2 { get; construct; }
-+		[NoAccessorMethod]
-+		public int y1 { get; construct; }
-+		[NoAccessorMethod]
-+		public int y2 { get; construct; }
-+		public signal void hit (Meta.BarrierEvent event);
-+		public signal void left (Meta.BarrierEvent event);
-+	}
-+	[CCode (cheader_filename = "meta/barrier.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "meta_barrier_event_get_type ()")]
-+	[Compact]
-+	public class BarrierEvent {
-+		public int dt;
-+		public double dx;
-+		public double dy;
-+		public int event_id;
-+		public bool grabbed;
-+		public bool released;
-+		public uint32 time;
-+		public double x;
-+		public double y;
-+	}
-+	[CCode (cheader_filename = "meta/meta-cursor-tracker.h", type_id = "meta_cursor_tracker_get_type ()")]
-+	public class CursorTracker : GLib.Object {
-+		[CCode (has_construct_function = false)]
-+		protected CursorTracker ();
-+		public void get_hot (out int x, out int y);
-+		public void get_pointer (Graphene.Point coords, out Clutter.ModifierType mods);
-+		public bool get_pointer_visible ();
-+		public unowned Cogl.Texture get_sprite ();
-+		public void set_pointer_visible (bool visible);
-+		[NoAccessorMethod]
-+		public Meta.Backend backend { owned get; construct; }
-+		public signal void cursor_changed ();
-+		public signal void position_invalidated ();
-+		public signal void visibility_changed ();
-+	}
-+	[CCode (cheader_filename = "meta/display.h", type_id = "meta_display_get_type ()")]
-+	public class Display : GLib.Object {
-+		[CCode (has_construct_function = false)]
-+		protected Display ();
-+		public void add_ignored_crossing_serial (ulong serial);
-+		public uint add_keybinding (string name, GLib.Settings settings, Meta.KeyBindingFlags flags, owned Meta.KeyHandlerFunc handler);
-+		public bool begin_grab_op (Meta.Window window, Meta.GrabOp op, bool pointer_already_grabbed, bool frame_action, int button, ulong modmask, uint32 timestamp, int root_x, int root_y);
-+		public void clear_mouse_mode ();
-+		public void close (uint32 timestamp);
-+		public void end_grab_op (uint32 timestamp);
-+		public void focus_default_window (uint32 timestamp);
-+		public void freeze_keyboard (uint32 timestamp);
-+		public Clutter.ModifierType get_compositor_modifiers ();
-+		public int get_current_monitor ();
-+		public uint32 get_current_time ();
-+		public uint32 get_current_time_roundtrip ();
-+		[CCode (cname = "meta_cursor_tracker_get_for_display")]
-+		public unowned Meta.CursorTracker get_cursor_tracker ();
-+		public unowned Meta.Window get_focus_window ();
-+		public Meta.GrabOp get_grab_op ();
-+		public uint get_keybinding_action (uint keycode, ulong mask);
-+		public uint32 get_last_user_time ();
-+		public Meta.Rectangle get_monitor_geometry (int monitor);
-+		public bool get_monitor_in_fullscreen (int monitor);
-+		public int get_monitor_index_for_rect (Meta.Rectangle rect);
-+		public int get_monitor_neighbor_index (int which_monitor, Meta.DisplayDirection dir);
-+		public float get_monitor_scale (int monitor);
-+		public int get_n_monitors ();
-+		public string get_pad_action_label (Clutter.InputDevice pad, Meta.PadActionType action_type, uint action_number);
-+		public int get_primary_monitor ();
-+		public unowned Meta.Selection get_selection ();
-+		public void get_size (out int width, out int height);
-+		public unowned Meta.SoundPlayer get_sound_player ();
-+		public unowned Meta.Window get_tab_current (Meta.TabList type, Meta.Workspace workspace);
-+		public GLib.List<weak Meta.Window> get_tab_list (Meta.TabList type, Meta.Workspace? workspace);
-+		public unowned Meta.Window get_tab_next (Meta.TabList type, Meta.Workspace workspace, Meta.Window? window, bool backward);
-+		public unowned Meta.WorkspaceManager get_workspace_manager ();
-+		public uint grab_accelerator (string accelerator, Meta.KeyBindingFlags flags);
-+		public bool is_pointer_emulating_sequence (Clutter.EventSequence? sequence);
-+		public bool remove_keybinding (string name);
-+		public void request_pad_osd (Clutter.InputDevice pad, bool edition_mode);
-+		public void set_cursor (Meta.Cursor cursor);
-+		public void set_input_focus (Meta.Window window, bool focus_frame, uint32 timestamp);
-+		public GLib.SList<weak Meta.Window> sort_windows_by_stacking (GLib.SList<Meta.Window> windows);
-+		public bool supports_extended_barriers ();
-+		public void unfreeze_keyboard (uint32 timestamp);
-+		public bool ungrab_accelerator (uint action_id);
-+		public void ungrab_keyboard (uint32 timestamp);
-+		public void unset_input_focus (uint32 timestamp);
-+		public bool xserver_time_is_before (uint32 time1, uint32 time2);
-+		public Clutter.ModifierType compositor_modifiers { get; }
-+		public Meta.Window focus_window { get; }
-+		public signal void accelerator_activated (uint object, Clutter.InputDevice p0, uint p1);
-+		public signal void closing ();
-+		public signal void cursor_updated ();
-+		public signal void gl_video_memory_purged ();
-+		public signal void grab_op_begin (Meta.Window object, Meta.GrabOp p0);
-+		public signal void grab_op_end (Meta.Window object, Meta.GrabOp p0);
-+		public signal void in_fullscreen_changed ();
-+		public signal bool init_xserver (GLib.Task object);
-+		public signal bool modifiers_accelerator_activated ();
-+		public signal void overlay_key ();
-+		public signal void pad_mode_switch (Clutter.InputDevice object, uint p0, uint p1);
-+		public signal void restacked ();
-+		public signal bool restart ();
-+		public signal void show_osd (int object, string p0, string p1);
-+		public signal unowned Clutter.Actor? show_pad_osd (Clutter.InputDevice pad, GLib.Settings settings, string layout_path, bool edition_mode, int monitor_idx);
-+		public signal bool show_resize_popup (bool object, Meta.Rectangle p0, int p1, int p2);
-+		public signal bool show_restart_message (string? message);
-+		public signal void showing_desktop_changed ();
-+		public signal void window_created (Meta.Window object);
-+		public signal void window_demands_attention (Meta.Window object);
-+		public signal void window_entered_monitor (int object, Meta.Window p0);
-+		public signal void window_left_monitor (int object, Meta.Window p0);
-+		public signal void window_marked_urgent (Meta.Window object);
-+		public signal void workareas_changed ();
-+		public signal void x11_display_closing ();
-+		public signal void x11_display_opened ();
-+		public signal void x11_display_setup ();
-+	}
-+	[CCode (cheader_filename = "meta/meta-dnd.h", type_id = "meta_dnd_get_type ()")]
-+	public class Dnd : GLib.Object {
-+		[CCode (has_construct_function = false)]
-+		protected Dnd ();
-+		public signal void dnd_enter ();
-+		public signal void dnd_leave ();
-+		public signal void dnd_position_change (int object, int p0);
-+	}
-+	[CCode (cheader_filename = "meta/main.h", has_type_id = false)]
-+	[Compact]
-+	public class Frame {
-+	}
-+	[CCode (cheader_filename = "meta/meta-idle-monitor.h", type_id = "meta_idle_monitor_get_type ()")]
-+	public class IdleMonitor : GLib.Object {
-+		[CCode (has_construct_function = false)]
-+		protected IdleMonitor ();
-+		public uint add_idle_watch (uint64 interval_msec, owned Meta.IdleMonitorWatchFunc? callback);
-+		public uint add_user_active_watch (owned Meta.IdleMonitorWatchFunc? callback);
-+		public static unowned Meta.IdleMonitor get_core ();
-+		public int64 get_idletime ();
-+		public void remove_watch (uint id);
-+		[NoAccessorMethod]
-+		public Clutter.InputDevice device { owned get; construct; }
-+	}
-+	[CCode (cheader_filename = "meta/main.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "meta_key_binding_get_type ()")]
-+	[Compact]
-+	public class KeyBinding {
-+		public uint get_mask ();
-+		public Meta.VirtualModifier get_modifiers ();
-+		public unowned string get_name ();
-+		public bool is_builtin ();
-+		public bool is_reversed ();
-+		[CCode (cname = "meta_keybindings_set_custom_handler")]
-+		public static bool set_custom_handler (string name, owned Meta.KeyHandlerFunc? handler);
-+	}
-+	[CCode (cheader_filename = "meta/meta-launch-context.h", type_id = "meta_launch_context_get_type ()")]
-+	public class LaunchContext : GLib.AppLaunchContext {
-+		[CCode (has_construct_function = false)]
-+		protected LaunchContext ();
-+		public void set_timestamp (uint32 timestamp);
-+		public void set_workspace (Meta.Workspace workspace);
-+		[NoAccessorMethod]
-+		public Meta.Display display { owned get; construct; }
-+		[NoAccessorMethod]
-+		public uint timestamp { get; set; }
-+		[NoAccessorMethod]
-+		public Meta.Workspace workspace { owned get; set; }
-+	}
-+	[CCode (cheader_filename = "meta/meta-monitor-manager.h", type_id = "meta_monitor_manager_get_type ()")]
-+	public class MonitorManager : GLib.Object {
-+		[CCode (has_construct_function = false)]
-+		protected MonitorManager ();
-+		public bool can_switch_config ();
-+		public static unowned Meta.MonitorManager @get ();
-+		public static int get_display_configuration_timeout ();
-+		public bool get_is_builtin_display_on ();
-+		public int get_monitor_for_connector (string connector);
-+		public bool get_panel_orientation_managed ();
-+		public Meta.MonitorSwitchConfigType get_switch_config ();
-+		public void switch_config (Meta.MonitorSwitchConfigType config_type);
-+		[NoAccessorMethod]
-+		public Meta.Backend backend { owned get; construct; }
-+		public bool panel_orientation_managed { get; }
-+		public signal void confirm_display_change ();
-+		public signal void monitors_changed ();
-+		public signal void monitors_changed_internal ();
-+		public signal void power_save_mode_changed ();
-+	}
-+	[CCode (cheader_filename = "meta/meta-plugin.h", type_id = "meta_plugin_get_type ()")]
-+	public abstract class Plugin : GLib.Object {
-+		[CCode (has_construct_function = false)]
-+		protected Plugin ();
-+		public bool begin_modal (Meta.ModalOptions options, uint32 timestamp);
-+		public void complete_display_change (bool ok);
-+		[NoWrapper]
-+		public virtual void confirm_display_change ();
-+		[NoWrapper]
-+		public virtual void destroy (Meta.WindowActor actor);
-+		public void destroy_completed (Meta.WindowActor actor);
-+		public void end_modal (uint32 timestamp);
-+		public unowned Meta.Display get_display ();
-+		public unowned Meta.PluginInfo? get_info ();
-+		[NoWrapper]
-+		public virtual void hide_tile_preview ();
-+		[NoWrapper]
-+		public virtual bool keybinding_filter (Meta.KeyBinding binding);
-+		[NoWrapper]
-+		public virtual void kill_switch_workspace ();
-+		[NoWrapper]
-+		public virtual void kill_window_effects (Meta.WindowActor actor);
-+		[NoWrapper]
-+		public virtual void locate_pointer ();
-+		public static void manager_set_plugin_type (GLib.Type gtype);
-+		[NoWrapper]
-+		public virtual void map (Meta.WindowActor actor);
-+		public void map_completed (Meta.WindowActor actor);
-+		[NoWrapper]
-+		public virtual void minimize (Meta.WindowActor actor);
-+		public void minimize_completed (Meta.WindowActor actor);
-+		[NoWrapper]
-+		public virtual unowned Meta.PluginInfo? plugin_info ();
-+		[NoWrapper]
-+		public virtual void show_tile_preview (Meta.Window window, Meta.Rectangle tile_rect, int tile_monitor_number);
-+		[NoWrapper]
-+		public virtual void show_window_menu (Meta.Window window, Meta.WindowMenuType menu, int x, int y);
-+		[NoWrapper]
-+		public virtual void show_window_menu_for_rect (Meta.Window window, Meta.WindowMenuType menu, Meta.Rectangle rect);
-+		[NoWrapper]
-+		public virtual void size_change (Meta.WindowActor actor, Meta.SizeChange which_change, Meta.Rectangle old_frame_rect, Meta.Rectangle old_buffer_rect);
-+		public void size_change_completed (Meta.WindowActor actor);
-+		[NoWrapper]
-+		public virtual void size_changed (Meta.WindowActor actor);
-+		[NoWrapper]
-+		public virtual void start ();
-+		[NoWrapper]
-+		public virtual void switch_workspace (int from, int to, Meta.MotionDirection direction);
-+		public void switch_workspace_completed ();
-+		[NoWrapper]
-+		public virtual void unminimize (Meta.WindowActor actor);
-+		public void unminimize_completed (Meta.WindowActor actor);
-+		[NoWrapper]
-+		public virtual bool xevent_filter (X.Event event);
-+	}
-+	[CCode (cheader_filename = "meta/meta-remote-access-controller.h", type_id = "meta_remote_access_controller_get_type ()")]
-+	public class RemoteAccessController : GLib.Object {
-+		[CCode (has_construct_function = false)]
-+		protected RemoteAccessController ();
-+		public void inhibit_remote_access ();
-+		public void uninhibit_remote_access ();
-+		public signal void new_handle (Meta.RemoteAccessHandle object);
-+	}
-+	[CCode (cheader_filename = "meta/meta-remote-access-controller.h", type_id = "meta_remote_access_handle_get_type ()")]
-+	public class RemoteAccessHandle : GLib.Object {
-+		[CCode (has_construct_function = false)]
-+		protected RemoteAccessHandle ();
-+		public bool get_disable_animations ();
-+		public virtual void stop ();
-+		[NoAccessorMethod]
-+		public bool is_recording { get; construct; }
-+		public signal void stopped ();
-+	}
-+	[CCode (cheader_filename = "meta/meta-selection.h", type_id = "meta_selection_get_type ()")]
-+	public class Selection : GLib.Object {
-+		[CCode (has_construct_function = false)]
-+		public Selection (Meta.Display display);
-+		public GLib.List<string> get_mimetypes (Meta.SelectionType selection_type);
-+		public void set_owner (Meta.SelectionType selection_type, Meta.SelectionSource owner);
-+		public async bool transfer_async (Meta.SelectionType selection_type, string mimetype, ssize_t size, GLib.OutputStream output, GLib.Cancellable? cancellable) throws GLib.Error;
-+		public void unset_owner (Meta.SelectionType selection_type, Meta.SelectionSource owner);
-+		public signal void owner_changed (uint object, Meta.SelectionSource p0);
-+	}
-+	[CCode (cheader_filename = "meta/meta-selection.h", type_id = "meta_selection_source_get_type ()")]
-+	public class SelectionSource : GLib.Object {
-+		[CCode (has_construct_function = false)]
-+		protected SelectionSource ();
-+		public virtual GLib.List<string> get_mimetypes ();
-+		public bool is_active ();
-+		public virtual async GLib.InputStream read_async (string mimetype, GLib.Cancellable? cancellable) throws GLib.Error;
-+		public virtual signal void activated ();
-+		public virtual signal void deactivated ();
-+	}
-+	[CCode (cheader_filename = "meta/meta-selection-source-memory.h", type_id = "meta_selection_source_memory_get_type ()")]
-+	public class SelectionSourceMemory : Meta.SelectionSource {
-+		[CCode (has_construct_function = false, type = "MetaSelectionSource*")]
-+		public SelectionSourceMemory (string mimetype, GLib.Bytes content);
-+	}
-+	[CCode (cheader_filename = "meta/meta-settings.h", has_type_id = false)]
-+	[Compact]
-+	public class Settings {
-+		public int get_font_dpi ();
-+		public int get_ui_scaling_factor ();
-+	}
-+	[CCode (cheader_filename = "meta/main.h", ref_function = "meta_shadow_ref", type_id = "meta_shadow_get_type ()", unref_function = "meta_shadow_unref")]
-+	[Compact]
-+	public class Shadow {
-+		public void get_bounds (int window_x, int window_y, int window_width, int window_height, Cairo.RectangleInt bounds);
-+		public void paint (Cogl.Framebuffer framebuffer, int window_x, int window_y, int window_width, int window_height, uint8 opacity, Cairo.Region? clip, bool clip_strictly);
-+		public Meta.Shadow @ref ();
-+		public void unref ();
-+	}
-+	[CCode (cheader_filename = "meta/meta-shadow-factory.h", type_id = "meta_shadow_factory_get_type ()")]
-+	public class ShadowFactory : GLib.Object {
-+		[CCode (has_construct_function = false)]
-+		public ShadowFactory ();
-+		public static unowned Meta.ShadowFactory get_default ();
-+		public Meta.ShadowParams get_params (string class_name, bool focused);
-+		public Meta.Shadow get_shadow (Meta.WindowShape shape, int width, int height, string class_name, bool focused);
-+		public void set_params (string class_name, bool focused, Meta.ShadowParams @params);
-+		public signal void changed ();
-+	}
-+	[CCode (cheader_filename = "meta/meta-shaped-texture.h", type_id = "meta_shaped_texture_get_type ()")]
-+	public class ShapedTexture : GLib.Object, Clutter.Content {
-+		[CCode (has_construct_function = false)]
-+		protected ShapedTexture ();
-+		public Cairo.Surface? get_image (Cairo.RectangleInt? clip);
-+		public unowned Cogl.Texture get_texture ();
-+		public void set_create_mipmaps (bool create_mipmaps);
-+		public void set_mask_texture (Cogl.Texture mask_texture);
-+		public signal void size_changed ();
-+	}
-+	[CCode (cheader_filename = "meta/meta-sound-player.h", type_id = "meta_sound_player_get_type ()")]
-+	public class SoundPlayer : GLib.Object {
-+		[CCode (has_construct_function = false)]
-+		protected SoundPlayer ();
-+		public void play_from_file (GLib.File file, string description, GLib.Cancellable? cancellable = null);
-+		public void play_from_theme (string name, string description, GLib.Cancellable? cancellable = null);
-+	}
-+	[CCode (cheader_filename = "meta/meta-stage.h", type_id = "meta_stage_get_type ()")]
-+	public class Stage : Clutter.Stage, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
-+		[CCode (has_construct_function = false)]
-+		protected Stage ();
-+		public static bool is_focused (Meta.Display display);
-+		public signal void actors_painted ();
-+	}
-+	[CCode (cheader_filename = "meta/meta-startup-notification.h", type_id = "meta_startup_notification_get_type ()")]
-+	public class StartupNotification : GLib.Object {
-+		[CCode (has_construct_function = false)]
-+		protected StartupNotification ();
-+		public Meta.LaunchContext create_launcher ();
-+		[NoAccessorMethod]
-+		public Meta.Display display { owned get; construct; }
-+		public signal void changed (void* object);
-+	}
-+	[CCode (cheader_filename = "meta/main.h", type_id = "meta_startup_sequence_get_type ()")]
-+	public class StartupSequence : GLib.Object {
-+		[CCode (has_construct_function = false)]
-+		protected StartupSequence ();
-+		public unowned string get_application_id ();
-+		public bool get_completed ();
-+		public unowned string get_icon_name ();
-+		public unowned string get_id ();
-+		public unowned string get_name ();
-+		public uint64 get_timestamp ();
-+		public unowned string get_wmclass ();
-+		public int get_workspace ();
-+		public string application_id { get; construct; }
-+		public string icon_name { get; construct; }
-+		public string id { get; construct; }
-+		public string name { get; construct; }
-+		public uint64 timestamp { get; construct; }
-+		public string wmclass { get; construct; }
-+		public int workspace { get; construct; }
-+		[HasEmitter]
-+		public signal void complete ();
-+	}
-+	[CCode (cheader_filename = "meta/theme.h", has_type_id = false)]
-+	[Compact]
-+	public class Theme {
-+		public void free ();
-+	}
-+	[CCode (cheader_filename = "meta/meta-wayland-client.h", type_id = "meta_wayland_client_get_type ()")]
-+	public class WaylandClient : GLib.Object {
-+		[CCode (has_construct_function = false)]
-+		public WaylandClient (GLib.SubprocessLauncher launcher) throws GLib.Error;
-+		public void hide_from_window_list (Meta.Window window);
-+		public bool owns_window (Meta.Window window);
-+		public void show_in_window_list (Meta.Window window);
-+		public GLib.Subprocess spawnv (Meta.Display display, [CCode (array_length = false, array_null_terminated = true)] string[] argv) throws GLib.Error;
-+	}
-+	[CCode (cheader_filename = "meta/window.h", type_id = "meta_window_get_type ()")]
-+	public abstract class Window : GLib.Object {
-+		[CCode (has_construct_function = false)]
-+		protected Window ();
-+		public void activate (uint32 current_time);
-+		public void activate_with_workspace (uint32 current_time, Meta.Workspace workspace);
-+		public bool allows_move ();
-+		public bool allows_resize ();
-+		public void begin_grab_op (Meta.GrabOp op, bool frame_action, uint32 timestamp);
-+		public bool can_close ();
-+		public bool can_maximize ();
-+		public bool can_minimize ();
-+		public bool can_shade ();
-+		public void change_workspace (Meta.Workspace workspace);
-+		public void change_workspace_by_index (int space_index, bool append);
-+		public void check_alive (uint32 timestamp);
-+		public Meta.Rectangle client_rect_to_frame_rect (Meta.Rectangle client_rect);
-+		public void compute_group ();
-+		public void @delete (uint32 timestamp);
-+		public unowned Meta.Window find_root_ancestor ();
-+		public void focus (uint32 timestamp);
-+		public void foreach_ancestor (Meta.WindowForeachFunc func);
-+		public void foreach_transient (Meta.WindowForeachFunc func);
-+		public Meta.Rectangle frame_rect_to_client_rect (Meta.Rectangle frame_rect);
-+		public Meta.Rectangle get_buffer_rect ();
-+		public unowned string get_client_machine ();
-+		public Meta.WindowClientType get_client_type ();
-+		public unowned GLib.Object get_compositor_private ();
-+		public unowned string get_description ();
-+		public unowned Meta.Display get_display ();
-+		public unowned Cairo.Region? get_frame_bounds ();
-+		public Meta.Rectangle get_frame_rect ();
-+		public Meta.FrameType get_frame_type ();
-+		public unowned string get_gtk_app_menu_object_path ();
-+		public unowned string get_gtk_application_id ();
-+		public unowned string get_gtk_application_object_path ();
-+		public unowned string get_gtk_menubar_object_path ();
-+		public unowned string get_gtk_theme_variant ();
-+		public unowned string get_gtk_unique_bus_name ();
-+		public unowned string get_gtk_window_object_path ();
-+		public bool get_icon_geometry (out Meta.Rectangle rect);
-+		public uint64 get_id ();
-+		public Meta.StackLayer get_layer ();
-+		public Meta.MaximizeFlags get_maximized ();
-+		public int get_monitor ();
-+		public unowned string get_mutter_hints ();
-+		public int get_pid ();
-+		public unowned string get_role ();
-+		public unowned string get_sandboxed_app_id ();
-+		public uint get_stable_sequence ();
-+		public unowned string get_startup_id ();
-+		public unowned Meta.Window? get_tile_match ();
-+		public unowned string get_title ();
-+		public unowned Meta.Window get_transient_for ();
-+		public uint32 get_user_time ();
-+		public Meta.WindowType get_window_type ();
-+		public unowned string get_wm_class ();
-+		public unowned string get_wm_class_instance ();
-+		public Meta.Rectangle get_work_area_all_monitors ();
-+		public Meta.Rectangle get_work_area_current_monitor ();
-+		public Meta.Rectangle get_work_area_for_monitor (int which_monitor);
-+		public unowned Meta.Workspace get_workspace ();
-+		public X.Window get_xwindow ();
-+		public void group_leader_changed ();
-+		public bool has_focus ();
-+		public bool is_above ();
-+		public bool is_always_on_all_workspaces ();
-+		public bool is_ancestor_of_transient (Meta.Window transient);
-+		public bool is_attached_dialog ();
-+		public bool is_client_decorated ();
-+		public bool is_fullscreen ();
-+		public bool is_hidden ();
-+		public bool is_monitor_sized ();
-+		public bool is_on_all_workspaces ();
-+		public bool is_on_primary_monitor ();
-+		public bool is_override_redirect ();
-+		public bool is_remote ();
-+		public bool is_screen_sized ();
-+		public bool is_shaded ();
-+		public bool is_skip_taskbar ();
-+		public void kill ();
-+		public bool located_on_workspace (Meta.Workspace workspace);
-+		public void lower ();
-+		public void make_above ();
-+		public void make_fullscreen ();
-+		public void maximize (Meta.MaximizeFlags directions);
-+		public void minimize ();
-+		public void move_frame (bool user_op, int root_x_nw, int root_y_nw);
-+		public void move_resize_frame (bool user_op, int root_x_nw, int root_y_nw, int w, int h);
-+		public void move_to_monitor (int monitor);
-+		public void raise ();
-+		public void set_compositor_private (GLib.Object priv);
-+		public void set_demands_attention ();
-+		public void set_icon_geometry (Meta.Rectangle? rect);
-+		public void shade (uint32 timestamp);
-+		public void shove_titlebar_onscreen ();
-+		public bool showing_on_its_workspace ();
-+		public void shutdown_group ();
-+		public void stick ();
-+		public bool titlebar_is_onscreen ();
-+		public void unmake_above ();
-+		public void unmake_fullscreen ();
-+		public void unmaximize (Meta.MaximizeFlags directions);
-+		public void unminimize ();
-+		public void unset_demands_attention ();
-+		public void unshade (uint32 timestamp);
-+		public void unstick ();
-+		[NoAccessorMethod]
-+		public bool above { get; }
-+		[NoAccessorMethod]
-+		public bool appears_focused { get; }
-+		[NoAccessorMethod]
-+		public bool decorated { get; }
-+		[NoAccessorMethod]
-+		public bool demands_attention { get; }
-+		[NoAccessorMethod]
-+		public bool fullscreen { get; }
-+		public string gtk_app_menu_object_path { get; }
-+		public string gtk_application_id { get; }
-+		public string gtk_application_object_path { get; }
-+		public string gtk_menubar_object_path { get; }
-+		public string gtk_unique_bus_name { get; }
-+		public string gtk_window_object_path { get; }
-+		[NoAccessorMethod]
-+		public void* icon { get; }
-+		[NoAccessorMethod]
-+		public bool maximized_horizontally { get; }
-+		[NoAccessorMethod]
-+		public bool maximized_vertically { get; }
-+		[NoAccessorMethod]
-+		public void* mini_icon { get; }
-+		[NoAccessorMethod]
-+		public bool minimized { get; }
-+		public string mutter_hints { get; }
-+		[NoAccessorMethod]
-+		public bool on_all_workspaces { get; }
-+		[NoAccessorMethod]
-+		public bool resizeable { get; }
-+		[NoAccessorMethod]
-+		public bool skip_taskbar { get; }
-+		public string title { get; }
-+		[NoAccessorMethod]
-+		public bool urgent { get; }
-+		public uint user_time { get; }
-+		public Meta.WindowType window_type { get; }
-+		public string wm_class { get; }
-+		public signal void position_changed ();
-+		public signal void raised ();
-+		public signal void shown ();
-+		public signal void size_changed ();
-+		public signal void unmanaged ();
-+		public signal void unmanaging ();
-+		public signal void workspace_changed ();
-+	}
-+	[CCode (cheader_filename = "meta/meta-window-actor.h", type_id = "meta_window_actor_get_type ()")]
-+	public abstract class WindowActor : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
-+		[CCode (has_construct_function = false)]
-+		protected WindowActor ();
-+		public void freeze ();
-+		public Cairo.Surface? get_image (Cairo.RectangleInt? clip);
-+		public unowned Meta.Window get_meta_window ();
-+		public unowned Meta.ShapedTexture get_texture ();
-+		public bool is_destroyed ();
-+		public void sync_visibility ();
-+		public void thaw ();
-+		public Meta.Window meta_window { get; construct; }
-+		public signal void damaged ();
-+		public signal void effects_completed ();
-+		public signal void first_frame ();
-+		public signal void thawed ();
-+	}
-+	[CCode (cheader_filename = "meta/meta-window-group.h", type_id = "meta_window_group_get_type ()")]
-+	public class WindowGroup : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
-+		[CCode (has_construct_function = false)]
-+		protected WindowGroup ();
-+	}
-+	[CCode (cheader_filename = "meta/meta-window-shape.h", ref_function = "meta_window_shape_ref", type_id = "meta_window_shape_get_type ()", unref_function = "meta_window_shape_unref")]
-+	[Compact]
-+	public class WindowShape {
-+		[CCode (has_construct_function = false)]
-+		public WindowShape (Cairo.Region region);
-+		public bool equal (Meta.WindowShape shape_b);
-+		public void get_borders (int border_top, int border_right, int border_bottom, int border_left);
-+		public uint hash ();
-+		public Meta.WindowShape @ref ();
-+		public Cairo.Region to_region (int center_width, int center_height);
-+		public void unref ();
-+	}
-+	[CCode (cheader_filename = "meta/workspace.h", type_id = "meta_workspace_get_type ()")]
-+	public class Workspace : GLib.Object {
-+		[CCode (has_construct_function = false)]
-+		protected Workspace ();
-+		public void activate (uint32 timestamp);
-+		public void activate_with_focus (Meta.Window focus_this, uint32 timestamp);
-+		public unowned Meta.Display get_display ();
-+		public unowned Meta.Workspace get_neighbor (Meta.MotionDirection direction);
-+		public Meta.Rectangle get_work_area_all_monitors ();
-+		public Meta.Rectangle get_work_area_for_monitor (int which_monitor);
-+		public int index ();
-+		public GLib.List<weak Meta.Window> list_windows ();
-+		public void set_builtin_struts (GLib.SList<Meta.Strut?> struts);
-+		[NoAccessorMethod]
-+		public bool active { get; }
-+		[NoAccessorMethod]
-+		public uint n_windows { get; }
-+		[NoAccessorMethod]
-+		public uint workspace_index { get; }
-+		public signal void window_added (Meta.Window object);
-+		public signal void window_removed (Meta.Window object);
-+	}
-+	[CCode (cheader_filename = "meta/meta-workspace-manager.h", type_id = "meta_workspace_manager_get_type ()")]
-+	public class WorkspaceManager : GLib.Object {
-+		[CCode (has_construct_function = false)]
-+		protected WorkspaceManager ();
-+		public unowned Meta.Workspace append_new_workspace (bool activate, uint32 timestamp);
-+		public unowned Meta.Workspace get_active_workspace ();
-+		public int get_active_workspace_index ();
-+		public int get_n_workspaces ();
-+		public unowned Meta.Workspace? get_workspace_by_index (int index);
-+		public void override_workspace_layout (Meta.DisplayCorner starting_corner, bool vertical_layout, int n_rows, int n_columns);
-+		public void remove_workspace (Meta.Workspace workspace, uint32 timestamp);
-+		public void reorder_workspace (Meta.Workspace workspace, int new_index);
-+		[NoAccessorMethod]
-+		public int layout_columns { get; }
-+		[NoAccessorMethod]
-+		public int layout_rows { get; }
-+		public int n_workspaces { get; }
-+		public signal void active_workspace_changed ();
-+		public signal void showing_desktop_changed ();
-+		public signal void workspace_added (int object);
-+		public signal void workspace_removed (int object);
-+		public signal void workspace_switched (int object, int p0, Meta.MotionDirection p1);
-+		public signal void workspaces_reordered ();
-+	}
-+	[CCode (cheader_filename = "meta/meta-x11-display.h", type_id = "meta_x11_display_get_type ()")]
-+	public class X11Display : GLib.Object {
-+		[CCode (has_construct_function = false)]
-+		protected X11Display ();
-+		public void clear_stage_input_region ();
-+		public int get_damage_event_base ();
-+		public int get_screen_number ();
-+		public int get_shape_event_base ();
-+		public bool has_shape ();
-+		public void set_cm_selection ();
-+		public void set_stage_input_region (X.XserverRegion region);
-+		public bool xwindow_is_a_no_focus_window (X.Window xwindow);
-+	}
-+	[CCode (cheader_filename = "meta/meta-close-dialog.h", type_cname = "MetaCloseDialogInterface", type_id = "meta_close_dialog_get_type ()")]
-+	public interface CloseDialog : GLib.Object {
-+		public abstract void focus ();
-+		public abstract void hide ();
-+		public bool is_visible ();
-+		public abstract void show ();
-+		[NoAccessorMethod]
-+		public abstract Meta.Window window { owned get; construct; }
-+		[HasEmitter]
-+		public signal void response (Meta.CloseDialogResponse response);
-+	}
-+	[CCode (cheader_filename = "meta/meta-inhibit-shortcuts-dialog.h", type_cname = "MetaInhibitShortcutsDialogInterface", type_id = "meta_inhibit_shortcuts_dialog_get_type ()")]
-+	public interface InhibitShortcutsDialog : GLib.Object {
-+		public abstract void hide ();
-+		public abstract void show ();
-+		[NoAccessorMethod]
-+		public abstract Meta.Window window { owned get; construct; }
-+		[HasEmitter]
-+		public signal void response (Meta.InhibitShortcutsDialogResponse response);
-+	}
-+	[CCode (cheader_filename = "meta/main.h", has_type_id = false)]
-+	public struct ButtonLayout {
-+		[CCode (array_length = false)]
-+		public weak Meta.ButtonFunction left_buttons[4];
-+		[CCode (array_length = false)]
-+		public weak bool left_buttons_has_spacer[4];
-+		[CCode (array_length = false)]
-+		public weak Meta.ButtonFunction right_buttons[4];
-+		[CCode (array_length = false)]
-+		public weak bool right_buttons_has_spacer[4];
-+	}
-+	[CCode (cheader_filename = "meta/main.h", has_type_id = false)]
-+	public struct Edge {
-+		public Meta.Rectangle rect;
-+		public Meta.Side side_type;
-+		public Meta.EdgeType edge_type;
-+	}
-+	[CCode (cheader_filename = "meta/main.h", has_type_id = false)]
-+	public struct FrameBorders {
-+		public Gtk.Border visible;
-+		public Gtk.Border invisible;
-+		public Gtk.Border total;
-+		public void clear ();
-+	}
-+	[CCode (cheader_filename = "meta/meta-plugin.h", has_type_id = false)]
-+	public struct PluginInfo {
-+		public weak string name;
-+		public weak string version;
-+		public weak string author;
-+		public weak string license;
-+		public weak string description;
-+	}
-+	[CCode (cheader_filename = "meta/main.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "meta_rectangle_get_type ()")]
-+	public struct Rectangle {
-+		public int x;
-+		public int y;
-+		public int width;
-+		public int height;
-+		public int area ();
-+		public bool contains_rect (Meta.Rectangle inner_rect);
-+		public Meta.Rectangle? copy ();
-+		public bool could_fit_rect (Meta.Rectangle inner_rect);
-+		public bool equal (Meta.Rectangle src2);
-+		public void free ();
-+		public bool horiz_overlap (Meta.Rectangle rect2);
-+		public bool intersect (Meta.Rectangle src2, out Meta.Rectangle dest);
-+		public bool overlap (Meta.Rectangle rect2);
-+		public Meta.Rectangle union (Meta.Rectangle rect2);
-+		public bool vert_overlap (Meta.Rectangle rect2);
-+	}
-+	[CCode (cheader_filename = "meta/main.h", has_type_id = false)]
-+	public struct ShadowParams {
-+		public int radius;
-+		public int top_fade;
-+		public int x_offset;
-+		public int y_offset;
-+		public uint8 opacity;
-+	}
-+	[CCode (cheader_filename = "meta/main.h", has_type_id = false)]
-+	public struct Strut {
-+		public Meta.Rectangle rect;
-+		public Meta.Side side;
-+	}
-+	[CCode (cheader_filename = "meta/main.h", cprefix = "META_BARRIER_DIRECTION_", type_id = "meta_barrier_direction_get_type ()")]
-+	[Flags]
-+	public enum BarrierDirection {
-+		POSITIVE_X,
-+		POSITIVE_Y,
-+		NEGATIVE_X,
-+		NEGATIVE_Y
-+	}
-+	[CCode (cheader_filename = "meta/main.h", cprefix = "META_BUTTON_FUNCTION_", type_id = "meta_button_function_get_type ()")]
-+	public enum ButtonFunction {
-+		MENU,
-+		MINIMIZE,
-+		MAXIMIZE,
-+		CLOSE,
-+		LAST
-+	}
-+	[CCode (cheader_filename = "meta/main.h", cprefix = "META_CLOSE_DIALOG_RESPONSE_", type_id = "meta_close_dialog_response_get_type ()")]
-+	public enum CloseDialogResponse {
-+		WAIT,
-+		FORCE_CLOSE
-+	}
-+	[CCode (cheader_filename = "meta/main.h", cprefix = "META_COMP_EFFECT_", type_id = "meta_comp_effect_get_type ()")]
-+	public enum CompEffect {
-+		CREATE,
-+		UNMINIMIZE,
-+		DESTROY,
-+		MINIMIZE,
-+		NONE
-+	}
-+	[CCode (cheader_filename = "meta/main.h", cprefix = "META_CURSOR_", type_id = "meta_cursor_get_type ()")]
-+	public enum Cursor {
-+		NONE,
-+		DEFAULT,
-+		NORTH_RESIZE,
-+		SOUTH_RESIZE,
-+		WEST_RESIZE,
-+		EAST_RESIZE,
-+		SE_RESIZE,
-+		SW_RESIZE,
-+		NE_RESIZE,
-+		NW_RESIZE,
-+		MOVE_OR_RESIZE_WINDOW,
-+		BUSY,
-+		DND_IN_DRAG,
-+		DND_MOVE,
-+		DND_COPY,
-+		DND_UNSUPPORTED_TARGET,
-+		POINTING_HAND,
-+		CROSSHAIR,
-+		IBEAM,
-+		BLANK,
-+		LAST
-+	}
-+	[CCode (cheader_filename = "meta/main.h", cprefix = "META_DEBUG_PAINT_", type_id = "meta_debug_paint_flag_get_type ()")]
-+	[Flags]
-+	public enum DebugPaintFlag {
-+		NONE,
-+		OPAQUE_REGION
-+	}
-+	[CCode (cheader_filename = "meta/main.h", cprefix = "META_DEBUG_", type_id = "meta_debug_topic_get_type ()")]
-+	[Flags]
-+	public enum DebugTopic {
-+		VERBOSE,
-+		FOCUS,
-+		WORKAREA,
-+		STACK,
-+		SM,
-+		EVENTS,
-+		WINDOW_STATE,
-+		WINDOW_OPS,
-+		GEOMETRY,
-+		PLACEMENT,
-+		PING,
-+		KEYBINDINGS,
-+		SYNC,
-+		STARTUP,
-+		PREFS,
-+		GROUPS,
-+		RESIZING,
-+		SHAPES,
-+		EDGE_RESISTANCE,
-+		DBUS,
-+		INPUT,
-+		WAYLAND,
-+		KMS,
-+		SCREEN_CAST,
-+		REMOTE_DESKTOP
-+	}
-+	[CCode (cheader_filename = "meta/main.h", cprefix = "META_DIRECTION_", type_id = "meta_direction_get_type ()")]
-+	[Flags]
-+	public enum Direction {
-+		LEFT,
-+		RIGHT,
-+		TOP,
-+		BOTTOM,
-+		UP,
-+		DOWN,
-+		HORIZONTAL,
-+		VERTICAL
-+	}
-+	[CCode (cheader_filename = "meta/main.h", cprefix = "META_DISPLAY_", type_id = "meta_display_corner_get_type ()")]
-+	public enum DisplayCorner {
-+		TOPLEFT,
-+		TOPRIGHT,
-+		BOTTOMLEFT,
-+		BOTTOMRIGHT
-+	}
-+	[CCode (cheader_filename = "meta/main.h", cprefix = "META_DISPLAY_", type_id = "meta_display_direction_get_type ()")]
-+	public enum DisplayDirection {
-+		UP,
-+		DOWN,
-+		LEFT,
-+		RIGHT
-+	}
-+	[CCode (cheader_filename = "meta/main.h", cprefix = "META_EDGE_", type_id = "meta_edge_type_get_type ()")]
-+	public enum EdgeType {
-+		WINDOW,
-+		MONITOR,
-+		SCREEN
-+	}
-+	[CCode (cheader_filename = "meta/main.h", cprefix = "META_EXIT_", type_id = "meta_exit_code_get_type ()")]
-+	public enum ExitCode {
-+		SUCCESS,
-+		ERROR
-+	}
-+	[CCode (cheader_filename = "meta/main.h", cprefix = "META_FRAME_", type_id = "meta_frame_flags_get_type ()")]
-+	[Flags]
-+	public enum FrameFlags {
-+		ALLOWS_DELETE,
-+		ALLOWS_MENU,
-+		ALLOWS_MINIMIZE,
-+		ALLOWS_MAXIMIZE,
-+		ALLOWS_VERTICAL_RESIZE,
-+		ALLOWS_HORIZONTAL_RESIZE,
-+		HAS_FOCUS,
-+		SHADED,
-+		STUCK,
-+		MAXIMIZED,
-+		ALLOWS_SHADE,
-+		ALLOWS_MOVE,
-+		FULLSCREEN,
-+		ABOVE,
-+		TILED_LEFT,
-+		TILED_RIGHT
-+	}
-+	[CCode (cheader_filename = "meta/main.h", cprefix = "META_FRAME_TYPE_", type_id = "meta_frame_type_get_type ()")]
-+	public enum FrameType {
-+		NORMAL,
-+		DIALOG,
-+		MODAL_DIALOG,
-+		UTILITY,
-+		MENU,
-+		BORDER,
-+		ATTACHED,
-+		LAST;
-+		public unowned string to_string ();
-+	}
-+	[CCode (cheader_filename = "meta/main.h", cprefix = "META_GRAB_OP_", type_id = "meta_grab_op_get_type ()")]
-+	public enum GrabOp {
-+		NONE,
-+		WINDOW_BASE,
-+		COMPOSITOR,
-+		WAYLAND_POPUP,
-+		FRAME_BUTTON,
-+		MOVING,
-+		RESIZING_NW,
-+		RESIZING_N,
-+		RESIZING_NE,
-+		RESIZING_E,
-+		RESIZING_SW,
-+		RESIZING_S,
-+		RESIZING_SE,
-+		RESIZING_W,
-+		KEYBOARD_MOVING,
-+		KEYBOARD_RESIZING_UNKNOWN,
-+		KEYBOARD_RESIZING_NW,
-+		KEYBOARD_RESIZING_N,
-+		KEYBOARD_RESIZING_NE,
-+		KEYBOARD_RESIZING_E,
-+		KEYBOARD_RESIZING_SW,
-+		KEYBOARD_RESIZING_S,
-+		KEYBOARD_RESIZING_SE,
-+		KEYBOARD_RESIZING_W
-+	}
-+	[CCode (cheader_filename = "meta/main.h", cprefix = "META_GRAVITY_", type_id = "meta_gravity_get_type ()")]
-+	public enum Gravity {
-+		NONE,
-+		NORTH_WEST,
-+		NORTH,
-+		NORTH_EAST,
-+		WEST,
-+		CENTER,
-+		EAST,
-+		SOUTH_WEST,
-+		SOUTH,
-+		SOUTH_EAST,
-+		STATIC
-+	}
-+	[CCode (cheader_filename = "meta/main.h", cprefix = "META_INHIBIT_SHORTCUTS_DIALOG_RESPONSE_", type_id = "meta_inhibit_shortcuts_dialog_response_get_type ()")]
-+	public enum InhibitShortcutsDialogResponse {
-+		ALLOW,
-+		DENY
-+	}
-+	[CCode (cheader_filename = "meta/main.h", cprefix = "META_KEYBINDING_ACTION_", type_id = "meta_key_binding_action_get_type ()")]
-+	public enum KeyBindingAction {
-+		NONE,
-+		WORKSPACE_1,
-+		WORKSPACE_2,
-+		WORKSPACE_3,
-+		WORKSPACE_4,
-+		WORKSPACE_5,
-+		WORKSPACE_6,
-+		WORKSPACE_7,
-+		WORKSPACE_8,
-+		WORKSPACE_9,
-+		WORKSPACE_10,
-+		WORKSPACE_11,
-+		WORKSPACE_12,
-+		WORKSPACE_LEFT,
-+		WORKSPACE_RIGHT,
-+		WORKSPACE_UP,
-+		WORKSPACE_DOWN,
-+		WORKSPACE_LAST,
-+		SWITCH_APPLICATIONS,
-+		SWITCH_APPLICATIONS_BACKWARD,
-+		SWITCH_GROUP,
-+		SWITCH_GROUP_BACKWARD,
-+		SWITCH_WINDOWS,
-+		SWITCH_WINDOWS_BACKWARD,
-+		SWITCH_PANELS,
-+		SWITCH_PANELS_BACKWARD,
-+		CYCLE_GROUP,
-+		CYCLE_GROUP_BACKWARD,
-+		CYCLE_WINDOWS,
-+		CYCLE_WINDOWS_BACKWARD,
-+		CYCLE_PANELS,
-+		CYCLE_PANELS_BACKWARD,
-+		SHOW_DESKTOP,
-+		PANEL_MAIN_MENU,
-+		PANEL_RUN_DIALOG,
-+		TOGGLE_RECORDING,
-+		SET_SPEW_MARK,
-+		ACTIVATE_WINDOW_MENU,
-+		TOGGLE_FULLSCREEN,
-+		TOGGLE_MAXIMIZED,
-+		TOGGLE_TILED_LEFT,
-+		TOGGLE_TILED_RIGHT,
-+		TOGGLE_ABOVE,
-+		MAXIMIZE,
-+		UNMAXIMIZE,
-+		TOGGLE_SHADED,
-+		MINIMIZE,
-+		CLOSE,
-+		BEGIN_MOVE,
-+		BEGIN_RESIZE,
-+		TOGGLE_ON_ALL_WORKSPACES,
-+		MOVE_TO_WORKSPACE_1,
-+		MOVE_TO_WORKSPACE_2,
-+		MOVE_TO_WORKSPACE_3,
-+		MOVE_TO_WORKSPACE_4,
-+		MOVE_TO_WORKSPACE_5,
-+		MOVE_TO_WORKSPACE_6,
-+		MOVE_TO_WORKSPACE_7,
-+		MOVE_TO_WORKSPACE_8,
-+		MOVE_TO_WORKSPACE_9,
-+		MOVE_TO_WORKSPACE_10,
-+		MOVE_TO_WORKSPACE_11,
-+		MOVE_TO_WORKSPACE_12,
-+		MOVE_TO_WORKSPACE_LEFT,
-+		MOVE_TO_WORKSPACE_RIGHT,
-+		MOVE_TO_WORKSPACE_UP,
-+		MOVE_TO_WORKSPACE_DOWN,
-+		MOVE_TO_WORKSPACE_LAST,
-+		MOVE_TO_MONITOR_LEFT,
-+		MOVE_TO_MONITOR_RIGHT,
-+		MOVE_TO_MONITOR_UP,
-+		MOVE_TO_MONITOR_DOWN,
-+		RAISE_OR_LOWER,
-+		RAISE,
-+		LOWER,
-+		MAXIMIZE_VERTICALLY,
-+		MAXIMIZE_HORIZONTALLY,
-+		MOVE_TO_CORNER_NW,
-+		MOVE_TO_CORNER_NE,
-+		MOVE_TO_CORNER_SW,
-+		MOVE_TO_CORNER_SE,
-+		MOVE_TO_SIDE_N,
-+		MOVE_TO_SIDE_S,
-+		MOVE_TO_SIDE_E,
-+		MOVE_TO_SIDE_W,
-+		MOVE_TO_CENTER,
-+		OVERLAY_KEY,
-+		LOCATE_POINTER_KEY,
-+		ISO_NEXT_GROUP,
-+		ALWAYS_ON_TOP,
-+		SWITCH_MONITOR,
-+		ROTATE_MONITOR,
-+		LAST
-+	}
-+	[CCode (cheader_filename = "meta/main.h", cprefix = "META_KEY_BINDING_", type_id = "meta_key_binding_flags_get_type ()")]
-+	[Flags]
-+	public enum KeyBindingFlags {
-+		NONE,
-+		PER_WINDOW,
-+		BUILTIN,
-+		IS_REVERSED,
-+		NON_MASKABLE,
-+		IGNORE_AUTOREPEAT,
-+		NO_AUTO_GRAB
-+	}
-+	[CCode (cheader_filename = "meta/main.h", cprefix = "META_LATER_", type_id = "meta_later_type_get_type ()")]
-+	public enum LaterType {
-+		RESIZE,
-+		CALC_SHOWING,
-+		CHECK_FULLSCREEN,
-+		SYNC_STACK,
-+		BEFORE_REDRAW,
-+		IDLE
-+	}
-+	[CCode (cheader_filename = "meta/main.h", cprefix = "META_LOCALE_DIRECTION_", type_id = "meta_locale_direction_get_type ()")]
-+	public enum LocaleDirection {
-+		LTR,
-+		RTL
-+	}
-+	[CCode (cheader_filename = "meta/main.h", cprefix = "META_MAXIMIZE_", type_id = "meta_maximize_flags_get_type ()")]
-+	[Flags]
-+	public enum MaximizeFlags {
-+		HORIZONTAL,
-+		VERTICAL,
-+		BOTH
-+	}
-+	[CCode (cheader_filename = "meta/main.h", cprefix = "META_MODAL_", type_id = "meta_modal_options_get_type ()")]
-+	[Flags]
-+	public enum ModalOptions {
-+		POINTER_ALREADY_GRABBED,
-+		KEYBOARD_ALREADY_GRABBED
-+	}
-+	[CCode (cheader_filename = "meta/main.h", cprefix = "META_MONITOR_SWITCH_CONFIG_", type_id = "meta_monitor_switch_config_type_get_type ()")]
-+	public enum MonitorSwitchConfigType {
-+		ALL_MIRROR,
-+		ALL_LINEAR,
-+		EXTERNAL,
-+		BUILTIN,
-+		UNKNOWN
-+	}
-+	[CCode (cheader_filename = "meta/main.h", cprefix = "META_MOTION_", type_id = "meta_motion_direction_get_type ()")]
-+	public enum MotionDirection {
-+		UP,
-+		DOWN,
-+		LEFT,
-+		RIGHT,
-+		UP_LEFT,
-+		UP_RIGHT,
-+		DOWN_LEFT,
-+		DOWN_RIGHT
-+	}
-+	[CCode (cheader_filename = "meta/main.h", cprefix = "META_PAD_ACTION_", type_id = "meta_pad_action_type_get_type ()")]
-+	public enum PadActionType {
-+		BUTTON,
-+		RING,
-+		STRIP
-+	}
-+	[CCode (cheader_filename = "meta/prefs.h", cprefix = "META_PREF_", type_id = "meta_preference_get_type ()")]
-+	public enum Preference {
-+		MOUSE_BUTTON_MODS,
-+		FOCUS_MODE,
-+		FOCUS_NEW_WINDOWS,
-+		ATTACH_MODAL_DIALOGS,
-+		RAISE_ON_CLICK,
-+		ACTION_DOUBLE_CLICK_TITLEBAR,
-+		ACTION_MIDDLE_CLICK_TITLEBAR,
-+		ACTION_RIGHT_CLICK_TITLEBAR,
-+		AUTO_RAISE,
-+		AUTO_RAISE_DELAY,
-+		FOCUS_CHANGE_ON_POINTER_REST,
-+		TITLEBAR_FONT,
-+		NUM_WORKSPACES,
-+		DYNAMIC_WORKSPACES,
-+		KEYBINDINGS,
-+		DISABLE_WORKAROUNDS,
-+		BUTTON_LAYOUT,
-+		WORKSPACE_NAMES,
-+		VISUAL_BELL,
-+		AUDIBLE_BELL,
-+		VISUAL_BELL_TYPE,
-+		GNOME_ACCESSIBILITY,
-+		GNOME_ANIMATIONS,
-+		CURSOR_THEME,
-+		CURSOR_SIZE,
-+		RESIZE_WITH_RIGHT_BUTTON,
-+		EDGE_TILING,
-+		FORCE_FULLSCREEN,
-+		WORKSPACES_ONLY_ON_PRIMARY,
-+		DRAGGABLE_BORDER_WIDTH,
-+		AUTO_MAXIMIZE,
-+		CENTER_NEW_WINDOWS,
-+		DRAG_THRESHOLD,
-+		LOCATE_POINTER,
-+		CHECK_ALIVE_TIMEOUT;
-+		public unowned string to_string ();
-+	}
-+	[CCode (cheader_filename = "meta/meta-selection-source.h", cprefix = "META_", type_id = "meta_selection_type_get_type ()")]
-+	public enum SelectionType {
-+		SELECTION_PRIMARY,
-+		SELECTION_CLIPBOARD,
-+		SELECTION_DND,
-+		N_SELECTION_TYPES
-+	}
-+	[CCode (cheader_filename = "meta/main.h", cprefix = "META_SHADOW_MODE_", type_id = "meta_shadow_mode_get_type ()")]
-+	public enum ShadowMode {
-+		AUTO,
-+		FORCED_OFF,
-+		FORCED_ON
-+	}
-+	[CCode (cheader_filename = "meta/main.h", cprefix = "META_SIDE_", type_id = "meta_side_get_type ()")]
-+	public enum Side {
-+		LEFT,
-+		RIGHT,
-+		TOP,
-+		BOTTOM
-+	}
-+	[CCode (cheader_filename = "meta/main.h", cprefix = "META_SIZE_CHANGE_", type_id = "meta_size_change_get_type ()")]
-+	public enum SizeChange {
-+		MAXIMIZE,
-+		UNMAXIMIZE,
-+		FULLSCREEN,
-+		UNFULLSCREEN
-+	}
-+	[CCode (cheader_filename = "meta/main.h", cprefix = "META_LAYER_", type_id = "meta_stack_layer_get_type ()")]
-+	public enum StackLayer {
-+		DESKTOP,
-+		BOTTOM,
-+		NORMAL,
-+		TOP,
-+		DOCK,
-+		OVERRIDE_REDIRECT,
-+		LAST
-+	}
-+	[CCode (cheader_filename = "meta/main.h", cprefix = "META_TAB_LIST_", type_id = "meta_tab_list_get_type ()")]
-+	public enum TabList {
-+		NORMAL,
-+		DOCKS,
-+		GROUP,
-+		NORMAL_ALL
-+	}
-+	[CCode (cheader_filename = "meta/main.h", cprefix = "META_TAB_SHOW_", type_id = "meta_tab_show_type_get_type ()")]
-+	public enum TabShowType {
-+		ICON,
-+		INSTANTLY
-+	}
-+	[CCode (cheader_filename = "meta/main.h", cprefix = "META_VIRTUAL_", type_id = "meta_virtual_modifier_get_type ()")]
-+	[Flags]
-+	public enum VirtualModifier {
-+		SHIFT_MASK,
-+		CONTROL_MASK,
-+		ALT_MASK,
-+		META_MASK,
-+		SUPER_MASK,
-+		HYPER_MASK,
-+		MOD2_MASK,
-+		MOD3_MASK,
-+		MOD4_MASK,
-+		MOD5_MASK
-+	}
-+	[CCode (cheader_filename = "meta/main.h", cprefix = "META_WINDOW_CLIENT_TYPE_", type_id = "meta_window_client_type_get_type ()")]
-+	public enum WindowClientType {
-+		WAYLAND,
-+		X11
-+	}
-+	[CCode (cheader_filename = "meta/main.h", cprefix = "META_WINDOW_MENU_", type_id = "meta_window_menu_type_get_type ()")]
-+	public enum WindowMenuType {
-+		WM,
-+		APP
-+	}
-+	[CCode (cheader_filename = "meta/main.h", cprefix = "META_WINDOW_", type_id = "meta_window_type_get_type ()")]
-+	public enum WindowType {
-+		NORMAL,
-+		DESKTOP,
-+		DOCK,
-+		DIALOG,
-+		MODAL_DIALOG,
-+		TOOLBAR,
-+		MENU,
-+		UTILITY,
-+		SPLASHSCREEN,
-+		DROPDOWN_MENU,
-+		POPUP_MENU,
-+		TOOLTIP,
-+		NOTIFICATION,
-+		COMBO,
-+		DND,
-+		OVERRIDE_OTHER
-+	}
-+	[CCode (cheader_filename = "meta/main.h", instance_pos = 2.9)]
-+	public delegate void IdleMonitorWatchFunc (Meta.IdleMonitor monitor, uint watch_id);
-+	[CCode (cheader_filename = "meta/main.h", instance_pos = 4.9)]
-+	public delegate void KeyHandlerFunc (Meta.Display display, Meta.Window window, [CCode (type = "ClutterKeyEvent*")] Clutter.KeyEvent? event, Meta.KeyBinding binding);
-+	[CCode (cheader_filename = "meta/main.h", instance_pos = 1.9)]
-+	public delegate void PrefsChangedFunc (Meta.Preference pref);
-+	[CCode (cheader_filename = "meta/main.h", instance_pos = 1.9)]
-+	public delegate bool WindowForeachFunc (Meta.Window window);
-+	[CCode (cheader_filename = "meta/main.h", cname = "META_CURRENT_TIME")]
-+	public const int CURRENT_TIME;
-+	[CCode (cheader_filename = "meta/main.h", cname = "META_DEFAULT_ICON_NAME")]
-+	public const string DEFAULT_ICON_NAME;
-+	[CCode (cheader_filename = "meta/main.h", cname = "META_ICON_HEIGHT")]
-+	public const int ICON_HEIGHT;
-+	[CCode (cheader_filename = "meta/main.h", cname = "META_ICON_WIDTH")]
-+	public const int ICON_WIDTH;
-+	[CCode (cheader_filename = "meta/main.h", cname = "META_MINI_ICON_HEIGHT")]
-+	public const int MINI_ICON_HEIGHT;
-+	[CCode (cheader_filename = "meta/main.h", cname = "META_MINI_ICON_WIDTH")]
-+	public const int MINI_ICON_WIDTH;
-+	[CCode (cheader_filename = "meta/main.h", cname = "META_PRIORITY_BEFORE_REDRAW")]
-+	public const int PRIORITY_BEFORE_REDRAW;
-+	[CCode (cheader_filename = "meta/main.h", cname = "META_PRIORITY_PREFS_NOTIFY")]
-+	public const int PRIORITY_PREFS_NOTIFY;
-+	[CCode (cheader_filename = "meta/main.h", cname = "META_PRIORITY_REDRAW")]
-+	public const int PRIORITY_REDRAW;
-+	[CCode (cheader_filename = "meta/main.h", cname = "META_PRIORITY_RESIZE")]
-+	public const int PRIORITY_RESIZE;
-+	[CCode (cheader_filename = "meta/main.h", cname = "META_VIRTUAL_CORE_KEYBOARD_ID")]
-+	public const int VIRTUAL_CORE_KEYBOARD_ID;
-+	[CCode (cheader_filename = "meta/main.h", cname = "META_VIRTUAL_CORE_POINTER_ID")]
-+	public const int VIRTUAL_CORE_POINTER_ID;
-+	[CCode (cheader_filename = "meta/main.h")]
-+	public static void add_clutter_debug_flags (Clutter.DebugFlag debug_flags, Clutter.DrawDebugFlag draw_flags, Clutter.PickDebugFlag pick_flags);
-+	[CCode (cheader_filename = "meta/main.h")]
-+	public static void add_debug_paint_flag (Meta.DebugPaintFlag flag);
-+	[CCode (cheader_filename = "meta/main.h")]
-+	public static void clutter_init ();
-+	[CCode (cheader_filename = "meta/main.h")]
-+	public static void exit (Meta.ExitCode code);
-+	[CCode (cheader_filename = "meta/main.h")]
-+	public static string g_utf8_strndup (string src, size_t n);
-+	[CCode (cheader_filename = "meta/main.h")]
-+	public static Meta.DebugPaintFlag get_debug_paint_flags ();
-+	[CCode (cheader_filename = "meta/main.h")]
-+	public static unowned GLib.OptionContext get_option_context ();
-+	[CCode (cheader_filename = "meta/main.h")]
-+	public static bool get_replace_current_wm ();
-+	[CCode (cheader_filename = "meta/main.h")]
-+	public static void init ();
-+	[CCode (cheader_filename = "meta/main.h")]
-+	public static bool is_restart ();
-+	[CCode (cheader_filename = "meta/main.h")]
-+	public static bool is_topic_enabled (Meta.DebugTopic topic);
-+	[CCode (cheader_filename = "meta/main.h")]
-+	public static void quit (Meta.ExitCode code);
-+	[CCode (cheader_filename = "meta/main.h")]
-+	public static void register_with_session ();
-+	[CCode (cheader_filename = "meta/main.h")]
-+	public static void remove_clutter_debug_flags (Clutter.DebugFlag debug_flags, Clutter.DrawDebugFlag draw_flags, Clutter.PickDebugFlag pick_flags);
-+	[CCode (cheader_filename = "meta/main.h")]
-+	public static void remove_debug_paint_flag (Meta.DebugPaintFlag flag);
-+	[CCode (cheader_filename = "meta/main.h")]
-+	public static void restart (string? message);
-+	[CCode (cheader_filename = "meta/main.h")]
-+	public static int run ();
-+	[CCode (cheader_filename = "meta/main.h")]
-+	public static void set_gnome_wm_keybindings (string wm_keybindings);
-+	[CCode (cheader_filename = "meta/main.h")]
-+	public static void set_wm_name (string wm_name);
-+	[CCode (cheader_filename = "meta/main.h")]
-+	public static void test_init ();
-+	[CCode (cheader_filename = "meta/main.h")]
-+	public static bool x11_init_gdk_display () throws GLib.Error;
-+}
-+[CCode (cheader_filename = "libmutter-8-custom.h", has_type_id = false)]
-+public struct before_frame {
-+}
-+[CCode (cheader_filename = "libmutter-8-custom.h", has_type_id = false)]
-+public struct frame {
-+}
-diff --git vapi/mutter-clutter-7-custom.vala vapi/mutter-clutter-7-custom.vala
-new file mode 100644
-index 00000000..60c9f611
---- /dev/null
-+++ vapi/mutter-clutter-7-custom.vala
-@@ -0,0 +1,42 @@
-+namespace Clutter {
-+
-+	public struct Color {
-+		[CCode (cname = "clutter_color_from_hls")]
-+		public Color.from_hls (float hue, float luminance, float saturation);
-+		[CCode (cname = "clutter_color_from_pixel")]
-+		public Color.from_pixel (uint32 pixel);
-+		[CCode (cname = "clutter_color_from_string")]
-+		public static bool from_string (out Clutter.Color color, string str);
-+		public bool parse_string (string str);
-+		public static unowned Clutter.Color? get_static (Clutter.StaticColor color);
-+	}
-+
-+	public interface Container : GLib.Object {
-+		public void add (params Clutter.Actor[] actors);
-+		[CCode (cname = "clutter_container_class_find_child_property")]
-+		public class unowned GLib.ParamSpec find_child_property (string property_name);
-+		[CCode (cname = "clutter_container_class_list_child_properties")]
-+		public class unowned GLib.ParamSpec[] list_child_properties ();
-+	}
-+
-+	public struct Units {
-+		[CCode (cname = "clutter_units_from_cm")]
-+		public Units.from_cm (float cm);
-+		[CCode (cname = "clutter_units_from_em")]
-+		public Units.from_em (float em);
-+		[CCode (cname = "clutter_units_from_em_for_font")]
-+		public Units.from_em_for_font (string font_name, float em);
-+		[CCode (cname = "clutter_units_from_mm")]
-+		public Units.from_mm (float mm);
-+		[CCode (cname = "clutter_units_from_pixels")]
-+		public Units.from_pixels (int px);
-+		[CCode (cname = "clutter_units_from_pt")]
-+		public Units.from_pt (float pt);
-+		[CCode (cname = "clutter_units_from_string")]
-+		public Units.from_string (string str);
-+	}
-+
-+	[CCode (cheader_filename = "clutter/clutter.h", has_copy_function = false, has_destroy_function = false, has_type_id = false)]
-+	public struct Capture {
-+	}
-+}
-diff --git vapi/mutter-clutter-7.deps vapi/mutter-clutter-7.deps
-index 6bd1ccf7..2f4cf3e8 100644
---- vapi/mutter-clutter-7.deps
-+++ vapi/mutter-clutter-7.deps
-@@ -2,3 +2,4 @@ atk
- cairo
- json-glib-1.0
- mutter-cogl-7
-+graphene-gobject-1.0
-diff --git vapi/mutter-clutter-7.vapi vapi/mutter-clutter-7.vapi
-index d7e133df..b1cdd185 100644
---- vapi/mutter-clutter-7.vapi
-+++ vapi/mutter-clutter-7.vapi
-@@ -4659,11 +4659,11 @@ namespace Clutter {
- 		[Version (since = "0.8")]
- 		public void allocate_preferred_size (float x, float y);
- 		[Version (since = "0.6")]
--		public void apply_relative_transform_to_point (Clutter.Actor? ancestor, Graphene.Point3D point, out unowned Graphene.Point3D vertex);
-+		public Graphene.Point3D apply_relative_transform_to_point (Clutter.Actor? ancestor, Graphene.Point3D point);
- 		[NoWrapper]
- 		public virtual void apply_transform (ref Clutter.Matrix matrix);
- 		[Version (since = "0.4")]
--		public void apply_transform_to_point (Graphene.Point3D point, out unowned Graphene.Point3D vertex);
-+		public Graphene.Point3D apply_transform_to_point (Graphene.Point3D point);
- 		[Version (since = "1.24")]
- 		public void bind_model (GLib.ListModel? model, owned Clutter.ActorCreateChildFunc create_child_func);
- 		[NoWrapper]
-@@ -4724,7 +4724,7 @@ namespace Clutter {
- 		[Version (since = "1.10")]
- 		public void get_content_scaling_filters (out Clutter.ScalingFilter min_filter, out Clutter.ScalingFilter mag_filter);
- 		[Version (since = "1.10")]
--		public unowned Clutter.PaintVolume get_default_paint_volume ();
-+		public unowned Clutter.PaintVolume? get_default_paint_volume ();
- 		[Version (since = "1.10")]
- 		public uint get_easing_delay ();
- 		[Version (since = "1.10")]
-@@ -4751,7 +4751,7 @@ namespace Clutter {
- 		[Version (since = "1.10")]
- 		public unowned Clutter.LayoutManager get_layout_manager ();
- 		[Version (since = "1.10")]
--		public void get_margin (Clutter.Margin margin);
-+		public Clutter.Margin get_margin ();
- 		[Version (since = "1.10")]
- 		public float get_margin_bottom ();
- 		[Version (since = "1.10")]
-@@ -4776,8 +4776,11 @@ namespace Clutter {
- 		public uint8 get_paint_opacity ();
- 		[Version (since = "0.8")]
- 		public bool get_paint_visibility ();
-+		[Version (since = "1.6")]
-+		public unowned Clutter.PaintVolume? get_paint_volume ();
-+		[CCode (vfunc_name = "get_paint_volume")]
- 		[NoWrapper]
--		public virtual bool get_paint_volume (Clutter.PaintVolume volume);
-+		public virtual bool get_paint_volume_vfunc (out Clutter.PaintVolume volume);
- 		[Version (since = "1.0")]
- 		public unowned Pango.Context get_pango_context ();
- 		public unowned Clutter.Actor? get_parent ();
-@@ -4814,9 +4817,9 @@ namespace Clutter {
- 		public Clutter.TextDirection get_text_direction ();
- 		[Version (since = "1.12")]
- 		public Clutter.Matrix get_transform ();
--		public void get_transformed_extents (out unowned Graphene.Rect rect);
-+		public Graphene.Rect get_transformed_extents ();
- 		[Version (since = "1.6")]
--		public unowned Clutter.PaintVolume get_transformed_paint_volume (Clutter.Actor relative_to_ancestor);
-+		public unowned Clutter.PaintVolume? get_transformed_paint_volume (Clutter.Actor relative_to_ancestor);
- 		[Version (since = "0.8")]
- 		public void get_transformed_position (out float x, out float y);
- 		[Version (since = "0.8")]
-@@ -5275,7 +5278,7 @@ namespace Clutter {
- 		public AlignConstraint (Clutter.Actor? source, Clutter.AlignAxis axis, float factor);
- 		public Clutter.AlignAxis get_align_axis ();
- 		public float get_factor ();
--		public void get_pivot_point (out unowned Graphene.Point pivot_point);
-+		public Graphene.Point get_pivot_point ();
- 		public unowned Clutter.Actor get_source ();
- 		public void set_align_axis (Clutter.AlignAxis axis);
- 		public void set_factor (float factor);
-@@ -5283,8 +5286,7 @@ namespace Clutter {
- 		public void set_source (Clutter.Actor? source);
- 		public Clutter.AlignAxis align_axis { get; set construct; }
- 		public float factor { get; set construct; }
--		[NoAccessorMethod]
--		public Graphene.Point pivot_point { owned get; set; }
-+		public Graphene.Point pivot_point { get; set; }
- 		public Clutter.Actor source { get; set construct; }
- 	}
- 	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
-@@ -5302,6 +5304,8 @@ namespace Clutter {
- 	public abstract class Backend : GLib.Object {
- 		[CCode (has_construct_function = false)]
- 		protected Backend ();
-+		[Version (since = "1.8")]
-+		public unowned Cogl.Context get_cogl_context ();
- 		public unowned Clutter.Seat get_default_seat ();
- 		[Version (since = "0.8")]
- 		public unowned Cairo.FontOptions get_font_options ();
-@@ -5561,6 +5565,16 @@ namespace Clutter {
- 		public void set_factor (double factor);
- 		public double factor { get; set; }
- 	}
-+	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
-+	[Compact]
-+	public class DeviceEvent : Clutter.Event {
-+		public weak Clutter.InputDevice device;
-+		public Clutter.EventFlags flags;
-+		public weak Clutter.Actor source;
-+		public weak Clutter.Stage stage;
-+		public uint32 time;
-+		public Clutter.EventType type;
-+	}
- 	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_effect_get_type ()")]
- 	[Version (since = "1.4")]
- 	public abstract class Effect : Clutter.ActorMeta {
-@@ -5630,7 +5644,7 @@ namespace Clutter {
- 		public uint get_mode_group ();
- 		public bool get_pad_event_details (out uint number, out uint mode, out double value);
- 		[Version (since = "1.12")]
--		public void get_position (Graphene.Point position);
-+		public Graphene.Point get_position ();
- 		[Version (since = "1.0")]
- 		public unowned Clutter.Actor get_related ();
- 		[Version (since = "1.10")]
-@@ -5752,7 +5766,7 @@ namespace Clutter {
- 	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_frame_clock_get_type ()")]
- 	public class FrameClock : GLib.Object {
- 		[CCode (has_construct_function = false)]
--		public FrameClock (float refresh_rate, Clutter.FrameListenerIface iface, void* user_data);
-+		protected FrameClock ();
- 		public void add_timeline (Clutter.Timeline timeline);
- 		public float get_refresh_rate ();
- 		public void inhibit ();
-@@ -5850,6 +5864,18 @@ namespace Clutter {
- 		public bool row_homogeneous { get; set; }
- 		public uint row_spacing { get; set; }
- 	}
-+	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
-+	[Compact]
-+	public class IMEvent : Clutter.Event {
-+		public Clutter.EventFlags flags;
-+		public uint32 len;
-+		public int32 offset;
-+		public weak Clutter.Actor source;
-+		public weak Clutter.Stage stage;
-+		public weak string text;
-+		public uint32 time;
-+		public Clutter.EventType type;
-+	}
- 	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_image_get_type ()")]
- 	[Version (since = "1.10")]
- 	public class Image : GLib.Object, Clutter.Content {
-@@ -5874,7 +5900,7 @@ namespace Clutter {
- 		[Version (since = "1.6")]
- 		public bool get_axis_value ([CCode (array_length = false)] double[] axes, Clutter.InputAxis axis, out double value);
- 		[Version (since = "1.12")]
--		public bool get_coords (Clutter.EventSequence? sequence, Graphene.Point point);
-+		public bool get_coords (Clutter.EventSequence? sequence, out Graphene.Point point);
- 		[Version (since = "1.0")]
- 		public int get_device_id ();
- 		[Version (since = "1.6")]
-@@ -5904,13 +5930,13 @@ namespace Clutter {
- 		public int get_n_mode_groups ();
- 		public int get_n_rings ();
- 		public int get_n_strips ();
-+		[Version (since = "1.6")]
-+		public GLib.List<weak Clutter.InputDevice> get_physical_devices ();
- 		[Version (since = "1.2")]
- 		public unowned Clutter.Stage get_pointer_stage ();
- 		[Version (since = "1.22")]
- 		public unowned string get_product_id ();
- 		public unowned Clutter.Seat get_seat ();
--		[Version (since = "1.6")]
--		public GLib.List<weak Clutter.InputDevice> get_slave_devices ();
- 		[Version (since = "1.22")]
- 		public unowned string get_vendor_id ();
- 		[Version (since = "1.10")]
-@@ -5987,7 +6013,7 @@ namespace Clutter {
- 		public virtual void commit_text (string text);
- 		[NoWrapper]
- 		public virtual void delete_surrounding (int offset, uint len);
--		public bool filter_key_event (Clutter.KeyEvent key);
-+		public bool filter_event (Clutter.Event event);
- 		[NoWrapper]
- 		public virtual void focus_in (Clutter.InputMethod input_method);
- 		[NoWrapper]
-@@ -6153,19 +6179,6 @@ namespace Clutter {
- 		public unowned Clutter.LayoutManager get_manager ();
- 		public Clutter.LayoutManager manager { get; construct; }
- 	}
--	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_margin_get_type ()")]
--	[Compact]
--	[Version (since = "1.10")]
--	public class Margin {
--		public float bottom;
--		public float left;
--		public float right;
--		public float top;
--		[CCode (has_construct_function = false)]
--		public Margin ();
--		public Clutter.Margin copy ();
--		public void free ();
--	}
- 	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
- 	[Compact]
- 	[Version (since = "0.2")]
-@@ -6188,13 +6201,56 @@ namespace Clutter {
- 		protected OffscreenEffect ();
- 		public virtual Cogl.Handle create_texture (float width, float height);
- 		[Version (since = "1.14")]
--		public bool get_target_rect (out unowned Graphene.Rect rect);
-+		public bool get_target_rect (out Graphene.Rect rect);
- 		[Version (deprecated = true, deprecated_since = "1.14", since = "1.8")]
- 		public bool get_target_size (out float width, out float height);
- 		[Version (since = "1.10")]
- 		public unowned Cogl.Handle get_texture ();
- 		public virtual void paint_target (Clutter.PaintContext paint_context);
- 	}
-+	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
-+	[Compact]
-+	public class PadButtonEvent : Clutter.Event {
-+		public uint32 button;
-+		public weak Clutter.InputDevice device;
-+		public Clutter.EventFlags flags;
-+		public uint32 group;
-+		public uint32 mode;
-+		public weak Clutter.Actor source;
-+		public weak Clutter.Stage stage;
-+		public uint32 time;
-+		public Clutter.EventType type;
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
-+	[Compact]
-+	public class PadRingEvent : Clutter.Event {
-+		public double angle;
-+		public weak Clutter.InputDevice device;
-+		public Clutter.EventFlags flags;
-+		public uint32 group;
-+		public uint32 mode;
-+		public uint32 ring_number;
-+		public Clutter.InputDevicePadSource ring_source;
-+		public weak Clutter.Actor source;
-+		public weak Clutter.Stage stage;
-+		public uint32 time;
-+		public Clutter.EventType type;
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
-+	[Compact]
-+	public class PadStripEvent : Clutter.Event {
-+		public weak Clutter.InputDevice device;
-+		public Clutter.EventFlags flags;
-+		public uint32 group;
-+		public uint32 mode;
-+		public weak Clutter.Actor source;
-+		public weak Clutter.Stage stage;
-+		public uint32 strip_number;
-+		public Clutter.InputDevicePadSource strip_source;
-+		public uint32 time;
-+		public Clutter.EventType type;
-+		public double value;
-+	}
- 	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_page_turn_effect_get_type ()")]
- 	[Version (since = "1.4")]
- 	public class PageTurnEffect : Clutter.DeformEffect {
-@@ -6236,37 +6292,6 @@ namespace Clutter {
- 		public void set_name (string name);
- 		public void unref ();
- 	}
--	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_paint_volume_get_type ()")]
--	[Compact]
--	[Version (since = "1.4")]
--	public class PaintVolume {
--		[Version (since = "1.6")]
--		public Clutter.PaintVolume copy ();
--		[Version (since = "1.6")]
--		public void free ();
--		[Version (since = "1.6")]
--		public float get_depth ();
--		[Version (since = "1.6")]
--		public float get_height ();
--		[Version (since = "1.6")]
--		public void get_origin (out unowned Graphene.Point3D vertex);
--		[Version (since = "1.6")]
--		public float get_width ();
--		[Version (since = "1.6")]
--		public void set_depth (float depth);
--		[Version (since = "1.6")]
--		public bool set_from_allocation (Clutter.Actor actor);
--		[Version (since = "1.6")]
--		public void set_height (float height);
--		[Version (since = "1.6")]
--		public void set_origin (Graphene.Point3D origin);
--		[Version (since = "1.6")]
--		public void set_width (float width);
--		[Version (since = "1.6")]
--		public void union (Clutter.PaintVolume another_pv);
--		[Version (since = "1.10")]
--		public void union_box (Clutter.ActorBox box);
--	}
- 	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_pan_action_get_type ()")]
- 	[Version (since = "1.12")]
- 	public class PanAction : Clutter.GestureAction {
-@@ -6370,6 +6395,17 @@ namespace Clutter {
- 		public void set_property_name (string? property_name);
- 		public string property_name { get; set; }
- 	}
-+	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
-+	[Compact]
-+	[Version (since = "1.28")]
-+	public class ProximityEvent : Clutter.Event {
-+		public weak Clutter.InputDevice device;
-+		public Clutter.EventFlags flags;
-+		public weak Clutter.Actor source;
-+		public weak Clutter.Stage stage;
-+		public uint32 time;
-+		public Clutter.EventType type;
-+	}
- 	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_root_node_get_type ()")]
- 	public class RootNode : Clutter.PaintNode {
- 		[CCode (has_construct_function = false, type = "ClutterPaintNode*")]
-@@ -6464,6 +6500,7 @@ namespace Clutter {
- 		public virtual unowned Clutter.InputDevice get_pointer ();
- 		public void get_pointer_a11y_settings (Clutter.PointerA11ySettings settings);
- 		public bool get_touch_mode ();
-+		public virtual bool handle_device_event (Clutter.Event event);
- 		public void inhibit_unfocus ();
- 		public bool is_unfocus_inhibited ();
- 		public GLib.List<weak Clutter.InputDevice> list_devices ();
-@@ -6588,7 +6625,7 @@ namespace Clutter {
- 		[Version (since = "1.0")]
- 		public void ensure_viewport ();
- 		public unowned Clutter.Actor get_actor_at_pos (Clutter.PickMode pick_mode, float x, float y);
--		public bool get_capture_final_size (Cairo.RectangleInt rect, int width, int height, float scale);
-+		public bool get_capture_final_size (Cairo.RectangleInt rect, out int width, out int height, out float scale);
- 		public int64 get_frame_counter ();
- 		[Version (since = "0.6")]
- 		public unowned Clutter.Actor get_key_focus ();
-@@ -6602,7 +6639,7 @@ namespace Clutter {
- 		[Version (since = "0.4")]
- 		public unowned string get_title ();
- 		public bool get_use_alpha ();
--		public bool paint_to_buffer (Cairo.RectangleInt rect, float scale, uint8 data, int stride, Cogl.PixelFormat format, Clutter.PaintFlag paint_flags) throws GLib.Error;
-+		public bool paint_to_buffer (Cairo.RectangleInt rect, float scale, [CCode (array_length = false, type = "uint8_t*")] uint8[] data, int stride, Cogl.PixelFormat format, Clutter.PaintFlag paint_flags) throws GLib.Error;
- 		public void paint_to_framebuffer (Cogl.Framebuffer framebuffer, Cairo.RectangleInt rect, float scale, Clutter.PaintFlag paint_flags);
- 		[CCode (array_length = false)]
- 		public uint8[] read_pixels (int x, int y, int width = -1, int height = -1);
-@@ -6629,7 +6666,7 @@ namespace Clutter {
- 		[Version (since = "1.20")]
- 		public signal void after_paint (Clutter.StageView view);
- 		public signal void after_update (Clutter.StageView view);
--		public signal void before_paint (Clutter.StageView view);
-+		public virtual signal void before_paint (Clutter.StageView view);
- 		public signal void before_update (Clutter.StageView view);
- 		[Version (since = "0.6")]
- 		public virtual signal void deactivate ();
-@@ -6676,6 +6713,7 @@ namespace Clutter {
- 		public void get_layout (Cairo.RectangleInt rect);
- 		public virtual void get_offscreen_transformation_matrix (Cogl.Matrix matrix);
- 		public unowned Cogl.Framebuffer get_onscreen ();
-+		public float get_refresh_rate ();
- 		public float get_scale ();
- 		public void invalidate_offscreen_blit_pipeline ();
- 		[NoWrapper]
-@@ -6683,8 +6721,6 @@ namespace Clutter {
- 		[NoWrapper]
- 		public virtual void transform_rect_to_onscreen (Cairo.RectangleInt src_rect, int dst_width, int dst_height, Cairo.RectangleInt dst_rect);
- 		[NoAccessorMethod]
--		public Cairo.RectangleInt layout { owned get; set construct; }
--		[NoAccessorMethod]
- 		public string name { owned get; construct; }
- 		[NoAccessorMethod]
- 		public float refresh_rate { get; set construct; }
-@@ -6732,7 +6768,7 @@ namespace Clutter {
- 		public Clutter.Color get_cursor_color ();
- 		public int get_cursor_position ();
- 		[Version (since = "1.16")]
--		public void get_cursor_rect (out unowned Graphene.Rect rect);
-+		public Graphene.Rect get_cursor_rect ();
- 		public uint get_cursor_size ();
- 		public bool get_cursor_visible ();
- 		public bool get_editable ();
-@@ -6916,7 +6952,7 @@ namespace Clutter {
- 		[Version (since = "1.6")]
- 		public bool get_auto_reverse ();
- 		[Version (since = "1.12")]
--		public bool get_cubic_bezier_progress (Graphene.Point c_1, Graphene.Point c_2);
-+		public bool get_cubic_bezier_progress (out Graphene.Point c_1, out Graphene.Point c_2);
- 		[Version (since = "1.10")]
- 		public int get_current_repeat ();
- 		[Version (since = "0.4")]
-@@ -7108,8 +7144,8 @@ namespace Clutter {
- 	public class ZoomAction : Clutter.GestureAction {
- 		[CCode (has_construct_function = false, type = "ClutterAction*")]
- 		public ZoomAction ();
--		public void get_focal_point (Graphene.Point point);
--		public void get_transformed_focal_point (Graphene.Point point);
-+		public Graphene.Point get_focal_point ();
-+		public Graphene.Point get_transformed_focal_point ();
- 		public Clutter.ZoomAxis get_zoom_axis ();
- 		public void set_zoom_axis (Clutter.ZoomAxis axis);
- 		public Clutter.ZoomAxis zoom_axis { get; set; }
-@@ -7130,6 +7166,7 @@ namespace Clutter {
- 	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_container_get_type ()")]
- 	[Version (since = "0.4")]
- 	public interface Container : GLib.Object {
-+		public void add (params Clutter.Actor[] actors);
- 		[CCode (vfunc_name = "add")]
- 		[Version (deprecated = true, deprecated_since = "1.10", since = "0.4")]
- 		public abstract void add_actor (Clutter.Actor actor);
-@@ -7141,21 +7178,20 @@ namespace Clutter {
- 		public void child_set (Clutter.Actor actor, ...);
- 		[Version (since = "0.8")]
- 		public void child_set_property (Clutter.Actor child, string property, GLib.Value value);
--		[Version (since = "0.8")]
--		public static unowned GLib.ParamSpec class_find_child_property (GLib.ObjectClass klass, string property_name);
--		[CCode (array_length_pos = 1.1, array_length_type = "guint")]
--		[Version (since = "0.8")]
--		public static GLib.ParamSpec[] class_list_child_properties (GLib.ObjectClass klass);
- 		[Version (since = "1.2")]
- 		public virtual void create_child_meta (Clutter.Actor actor);
- 		[Version (since = "1.2")]
- 		public virtual void destroy_child_meta (Clutter.Actor actor);
- 		[Version (since = "0.6")]
- 		public unowned Clutter.Actor find_child_by_name (string child_name);
-+		[CCode (cname = "clutter_container_class_find_child_property")]
-+		public class unowned GLib.ParamSpec find_child_property (string property_name);
- 		[Version (since = "0.8")]
- 		public virtual unowned Clutter.ChildMeta get_child_meta (Clutter.Actor actor);
- 		[Version (deprecated = true, deprecated_since = "1.10", since = "0.4")]
- 		public GLib.List<weak Clutter.Actor> get_children ();
-+		[CCode (cname = "clutter_container_class_list_child_properties")]
-+		public class unowned GLib.ParamSpec[] list_child_properties ();
- 		[CCode (vfunc_name = "lower")]
- 		[Version (deprecated = true, deprecated_since = "1.10", since = "0.6")]
- 		public virtual void lower_child (Clutter.Actor actor, Clutter.Actor? sibling = null);
-@@ -7256,9 +7292,9 @@ namespace Clutter {
- 		public bool prev (out unowned Clutter.Actor child);
- 		public void remove ();
- 	}
--	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
-+	[CCode (cheader_filename = "clutter/clutter.h", has_copy_function = false, has_destroy_function = false, has_type_id = false)]
- 	public struct Capture {
--		public weak Cairo.Surface image;
-+		public Cairo.ImageSurface image;
- 		public Cairo.RectangleInt rect;
- 	}
- 	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_color_get_type ()")]
-@@ -7277,11 +7313,12 @@ namespace Clutter {
- 		public bool equal (Clutter.Color v2);
- 		[Version (since = "0.2")]
- 		public void free ();
--		public static void from_hls (out Clutter.Color color, float hue, float luminance, float saturation);
--		public static void from_pixel (out Clutter.Color color, uint32 pixel);
--		[Version (since = "1.0")]
-+		[CCode (cname = "clutter_color_from_hls")]
-+		public Color.from_hls (float hue, float luminance, float saturation);
-+		[CCode (cname = "clutter_color_from_pixel")]
-+		public Color.from_pixel (uint32 pixel);
-+		[CCode (cname = "clutter_color_from_string")]
- 		public static bool from_string (out Clutter.Color color, string str);
--		[Version (since = "1.6")]
- 		public static unowned Clutter.Color? get_static (Clutter.StaticColor color);
- 		[Version (since = "1.0")]
- 		public uint hash ();
-@@ -7290,6 +7327,7 @@ namespace Clutter {
- 		[Version (since = "1.6")]
- 		public Clutter.Color interpolate (Clutter.Color final, double progress);
- 		public Clutter.Color lighten ();
-+		public bool parse_string (string str);
- 		public Clutter.Color shade (double factor);
- 		public Clutter.Color subtract (Clutter.Color b);
- 		public void to_hls (out float hue, out float luminance, out float saturation);
-@@ -7298,11 +7336,6 @@ namespace Clutter {
- 		public string to_string ();
- 	}
- 	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
--	public struct FrameListenerIface {
--		public weak global::before_frame before_frame;
--		public weak global::frame frame;
--	}
--	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
- 	public struct KbdA11ySettings {
- 		public Clutter.KeyboardA11yFlags controls;
- 		public int slowkeys_delay;
-@@ -7321,6 +7354,16 @@ namespace Clutter {
- 		public bool equal (Clutter.Knot knot_b);
- 		public void free ();
- 	}
-+	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_margin_get_type ()")]
-+	[Version (since = "1.10")]
-+	public struct Margin {
-+		public float left;
-+		public float right;
-+		public float top;
-+		public float bottom;
-+		public Clutter.Margin? copy ();
-+		public void free ();
-+	}
- 	[CCode (cheader_filename = "clutter/clutter.h", type_id = "COGL_TYPE_MATRIX")]
- 	public struct Matrix : Cogl.Matrix {
- 		[Version (since = "1.12")]
-@@ -7335,45 +7378,35 @@ namespace Clutter {
- 		[Version (since = "1.12")]
- 		public unowned Clutter.Matrix? init_identity ();
- 	}
--	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
--	public struct PadButtonEvent {
--		public Clutter.EventType type;
--		public uint32 time;
--		public Clutter.EventFlags flags;
--		public weak Clutter.Stage stage;
--		public weak Clutter.Actor source;
--		public uint32 button;
--		public uint32 group;
--		public weak Clutter.InputDevice device;
--		public uint32 mode;
--	}
--	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
--	public struct PadRingEvent {
--		public Clutter.EventType type;
--		public uint32 time;
--		public Clutter.EventFlags flags;
--		public weak Clutter.Stage stage;
--		public weak Clutter.Actor source;
--		public weak Clutter.InputDevice device;
--		public Clutter.InputDevicePadSource ring_source;
--		public uint32 ring_number;
--		public uint32 group;
--		public double angle;
--		public uint32 mode;
--	}
--	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
--	public struct PadStripEvent {
--		public Clutter.EventType type;
--		public uint32 time;
--		public Clutter.EventFlags flags;
--		public weak Clutter.Stage stage;
--		public weak Clutter.Actor source;
--		public weak Clutter.InputDevice device;
--		public Clutter.InputDevicePadSource strip_source;
--		public uint32 strip_number;
--		public uint32 group;
--		public double value;
--		public uint32 mode;
-+	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_paint_volume_get_type ()")]
-+	[Version (since = "1.4")]
-+	public struct PaintVolume {
-+		[Version (since = "1.6")]
-+		public Clutter.PaintVolume? copy ();
-+		[Version (since = "1.6")]
-+		public void free ();
-+		[Version (since = "1.6")]
-+		public float get_depth ();
-+		[Version (since = "1.6")]
-+		public float get_height ();
-+		[Version (since = "1.6")]
-+		public Graphene.Point3D get_origin ();
-+		[Version (since = "1.6")]
-+		public float get_width ();
-+		[Version (since = "1.6")]
-+		public void set_depth (float depth);
-+		[Version (since = "1.6")]
-+		public bool set_from_allocation (Clutter.Actor actor);
-+		[Version (since = "1.6")]
-+		public void set_height (float height);
-+		[Version (since = "1.6")]
-+		public void set_origin (Graphene.Point3D origin);
-+		[Version (since = "1.6")]
-+		public void set_width (float width);
-+		[Version (since = "1.6")]
-+		public void union (Clutter.PaintVolume another_pv);
-+		[Version (since = "1.10")]
-+		public void union_box (Clutter.ActorBox box);
- 	}
- 	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_path_node_get_type ()")]
- 	[Version (since = "1.0")]
-@@ -7406,21 +7439,25 @@ namespace Clutter {
- 		public int dwell_delay;
- 		public int dwell_threshold;
- 	}
--	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
--	[Version (since = "1.28")]
--	public struct ProximityEvent {
--		public Clutter.EventType type;
--		public uint32 time;
--		public Clutter.EventFlags flags;
--		public weak Clutter.Stage stage;
--		public weak Clutter.Actor source;
--		public weak Clutter.InputDevice device;
--	}
- 	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_units_get_type ()")]
- 	[Version (since = "1.0")]
- 	public struct Units {
- 		public Clutter.Units? copy ();
- 		public void free ();
-+		[CCode (cname = "clutter_units_from_cm")]
-+		public Units.from_cm (float cm);
-+		[CCode (cname = "clutter_units_from_em")]
-+		public Units.from_em (float em);
-+		[CCode (cname = "clutter_units_from_em_for_font")]
-+		public Units.from_em_for_font (string font_name, float em);
-+		[CCode (cname = "clutter_units_from_mm")]
-+		public Units.from_mm (float mm);
-+		[CCode (cname = "clutter_units_from_pixels")]
-+		public Units.from_pixels (int px);
-+		[CCode (cname = "clutter_units_from_pt")]
-+		public Units.from_pt (float pt);
-+		[CCode (cname = "clutter_units_from_string")]
-+		public Units.from_string (string str);
- 		public Clutter.UnitType get_unit_type ();
- 		public float get_unit_value ();
- 		public float to_pixels ();
-@@ -7638,6 +7675,11 @@ namespace Clutter {
- 		PAD_BUTTON_RELEASE,
- 		PAD_STRIP,
- 		PAD_RING,
-+		DEVICE_ADDED,
-+		DEVICE_REMOVED,
-+		IM_COMMIT,
-+		IM_DELETE,
-+		IM_PREEDIT,
- 		EVENT_LAST
- 	}
- 	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_FEATURE_", type_id = "clutter_feature_flags_get_type ()")]
-@@ -7787,8 +7829,8 @@ namespace Clutter {
- 	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_INPUT_MODE_", type_id = "clutter_input_mode_get_type ()")]
- 	[Version (since = "1.6")]
- 	public enum InputMode {
--		MASTER,
--		SLAVE,
-+		LOGICAL,
-+		PHYSICAL,
- 		FLOATING
- 	}
- 	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_INPUT_PANEL_STATE_", type_id = "clutter_input_panel_state_get_type ()")]
-@@ -7889,7 +7931,8 @@ namespace Clutter {
- 	public enum PaintFlag {
- 		NONE,
- 		NO_CURSORS,
--		FORCE_CURSORS
-+		FORCE_CURSORS,
-+		CLEAR
- 	}
- 	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_PAN_", type_id = "clutter_pan_axis_get_type ()")]
- 	[Version (since = "1.12")]
-@@ -8231,6 +8274,9 @@ namespace Clutter {
- 	[Version (since = "1.0")]
- 	public static void cairo_set_source_color (Cairo.Context cr, Clutter.Color color);
- 	[CCode (cheader_filename = "clutter/clutter.h")]
-+	[Version (since = "1.6")]
-+	public static unowned Clutter.Color? color_get_static (Clutter.StaticColor color);
-+	[CCode (cheader_filename = "clutter/clutter.h")]
- 	[Version (since = "1.14")]
- 	public static void disable_accessibility ();
- 	[CCode (cheader_filename = "clutter/clutter.h")]
-diff --git vapi/mutter-clutter-8-custom.vala vapi/mutter-clutter-8-custom.vala
-new file mode 100644
-index 00000000..60c9f611
---- /dev/null
-+++ vapi/mutter-clutter-8-custom.vala
-@@ -0,0 +1,42 @@
-+namespace Clutter {
-+
-+	public struct Color {
-+		[CCode (cname = "clutter_color_from_hls")]
-+		public Color.from_hls (float hue, float luminance, float saturation);
-+		[CCode (cname = "clutter_color_from_pixel")]
-+		public Color.from_pixel (uint32 pixel);
-+		[CCode (cname = "clutter_color_from_string")]
-+		public static bool from_string (out Clutter.Color color, string str);
-+		public bool parse_string (string str);
-+		public static unowned Clutter.Color? get_static (Clutter.StaticColor color);
-+	}
-+
-+	public interface Container : GLib.Object {
-+		public void add (params Clutter.Actor[] actors);
-+		[CCode (cname = "clutter_container_class_find_child_property")]
-+		public class unowned GLib.ParamSpec find_child_property (string property_name);
-+		[CCode (cname = "clutter_container_class_list_child_properties")]
-+		public class unowned GLib.ParamSpec[] list_child_properties ();
-+	}
-+
-+	public struct Units {
-+		[CCode (cname = "clutter_units_from_cm")]
-+		public Units.from_cm (float cm);
-+		[CCode (cname = "clutter_units_from_em")]
-+		public Units.from_em (float em);
-+		[CCode (cname = "clutter_units_from_em_for_font")]
-+		public Units.from_em_for_font (string font_name, float em);
-+		[CCode (cname = "clutter_units_from_mm")]
-+		public Units.from_mm (float mm);
-+		[CCode (cname = "clutter_units_from_pixels")]
-+		public Units.from_pixels (int px);
-+		[CCode (cname = "clutter_units_from_pt")]
-+		public Units.from_pt (float pt);
-+		[CCode (cname = "clutter_units_from_string")]
-+		public Units.from_string (string str);
-+	}
-+
-+	[CCode (cheader_filename = "clutter/clutter.h", has_copy_function = false, has_destroy_function = false, has_type_id = false)]
-+	public struct Capture {
-+	}
-+}
-diff --git vapi/mutter-clutter-8.deps vapi/mutter-clutter-8.deps
-new file mode 100644
-index 00000000..a03b108b
---- /dev/null
-+++ vapi/mutter-clutter-8.deps
-@@ -0,0 +1,5 @@
-+atk
-+cairo
-+json-glib-1.0
-+mutter-cogl-8
-+graphene-gobject-1.0
-diff --git vapi/mutter-clutter-8.vapi vapi/mutter-clutter-8.vapi
-new file mode 100644
-index 00000000..e2fe5989
---- /dev/null
-+++ vapi/mutter-clutter-8.vapi
-@@ -0,0 +1,8279 @@
-+/* mutter-clutter-8.vapi generated by vapigen, do not modify. */
-+
-+[CCode (cprefix = "Clutter", gir_namespace = "Clutter", gir_version = "8", lower_case_cprefix = "clutter_")]
-+namespace Clutter {
-+	namespace Key {
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_0")]
-+		public const uint @0;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_1")]
-+		public const uint @1;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_2")]
-+		public const uint @2;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3")]
-+		public const uint @3;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_AltCursor")]
-+		public const uint @3270_AltCursor;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_Attn")]
-+		public const uint @3270_Attn;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_BackTab")]
-+		public const uint @3270_BackTab;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_ChangeScreen")]
-+		public const uint @3270_ChangeScreen;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_Copy")]
-+		public const uint @3270_Copy;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_CursorBlink")]
-+		public const uint @3270_CursorBlink;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_CursorSelect")]
-+		public const uint @3270_CursorSelect;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_DeleteWord")]
-+		public const uint @3270_DeleteWord;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_Duplicate")]
-+		public const uint @3270_Duplicate;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_Enter")]
-+		public const uint @3270_Enter;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_EraseEOF")]
-+		public const uint @3270_EraseEOF;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_EraseInput")]
-+		public const uint @3270_EraseInput;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_ExSelect")]
-+		public const uint @3270_ExSelect;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_FieldMark")]
-+		public const uint @3270_FieldMark;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_Ident")]
-+		public const uint @3270_Ident;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_Jump")]
-+		public const uint @3270_Jump;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_KeyClick")]
-+		public const uint @3270_KeyClick;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_Left2")]
-+		public const uint @3270_Left2;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_PA1")]
-+		public const uint @3270_PA1;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_PA2")]
-+		public const uint @3270_PA2;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_PA3")]
-+		public const uint @3270_PA3;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_Play")]
-+		public const uint @3270_Play;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_PrintScreen")]
-+		public const uint @3270_PrintScreen;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_Quit")]
-+		public const uint @3270_Quit;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_Record")]
-+		public const uint @3270_Record;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_Reset")]
-+		public const uint @3270_Reset;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_Right2")]
-+		public const uint @3270_Right2;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_Rule")]
-+		public const uint @3270_Rule;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_Setup")]
-+		public const uint @3270_Setup;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_3270_Test")]
-+		public const uint @3270_Test;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_4")]
-+		public const uint @4;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_5")]
-+		public const uint @5;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_6")]
-+		public const uint @6;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_7")]
-+		public const uint @7;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_8")]
-+		public const uint @8;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_9")]
-+		public const uint @9;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_A")]
-+		public const uint A;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AE")]
-+		public const uint AE;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Aacute")]
-+		public const uint Aacute;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Abelowdot")]
-+		public const uint Abelowdot;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Abreve")]
-+		public const uint Abreve;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Abreveacute")]
-+		public const uint Abreveacute;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Abrevebelowdot")]
-+		public const uint Abrevebelowdot;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Abrevegrave")]
-+		public const uint Abrevegrave;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Abrevehook")]
-+		public const uint Abrevehook;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Abrevetilde")]
-+		public const uint Abrevetilde;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AccessX_Enable")]
-+		public const uint AccessX_Enable;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AccessX_Feedback_Enable")]
-+		public const uint AccessX_Feedback_Enable;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Acircumflex")]
-+		public const uint Acircumflex;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Acircumflexacute")]
-+		public const uint Acircumflexacute;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Acircumflexbelowdot")]
-+		public const uint Acircumflexbelowdot;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Acircumflexgrave")]
-+		public const uint Acircumflexgrave;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Acircumflexhook")]
-+		public const uint Acircumflexhook;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Acircumflextilde")]
-+		public const uint Acircumflextilde;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AddFavorite")]
-+		public const uint AddFavorite;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Adiaeresis")]
-+		public const uint Adiaeresis;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Agrave")]
-+		public const uint Agrave;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ahook")]
-+		public const uint Ahook;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Alt_L")]
-+		public const uint Alt_L;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Alt_R")]
-+		public const uint Alt_R;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Amacron")]
-+		public const uint Amacron;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Aogonek")]
-+		public const uint Aogonek;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ApplicationLeft")]
-+		public const uint ApplicationLeft;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ApplicationRight")]
-+		public const uint ApplicationRight;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_0")]
-+		public const uint Arabic_0;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_1")]
-+		public const uint Arabic_1;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_2")]
-+		public const uint Arabic_2;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_3")]
-+		public const uint Arabic_3;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_4")]
-+		public const uint Arabic_4;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_5")]
-+		public const uint Arabic_5;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_6")]
-+		public const uint Arabic_6;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_7")]
-+		public const uint Arabic_7;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_8")]
-+		public const uint Arabic_8;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_9")]
-+		public const uint Arabic_9;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_ain")]
-+		public const uint Arabic_ain;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_alef")]
-+		public const uint Arabic_alef;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_alefmaksura")]
-+		public const uint Arabic_alefmaksura;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_beh")]
-+		public const uint Arabic_beh;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_comma")]
-+		public const uint Arabic_comma;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_dad")]
-+		public const uint Arabic_dad;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_dal")]
-+		public const uint Arabic_dal;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_damma")]
-+		public const uint Arabic_damma;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_dammatan")]
-+		public const uint Arabic_dammatan;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_ddal")]
-+		public const uint Arabic_ddal;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_farsi_yeh")]
-+		public const uint Arabic_farsi_yeh;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_fatha")]
-+		public const uint Arabic_fatha;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_fathatan")]
-+		public const uint Arabic_fathatan;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_feh")]
-+		public const uint Arabic_feh;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_fullstop")]
-+		public const uint Arabic_fullstop;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_gaf")]
-+		public const uint Arabic_gaf;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_ghain")]
-+		public const uint Arabic_ghain;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_ha")]
-+		public const uint Arabic_ha;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_hah")]
-+		public const uint Arabic_hah;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_hamza")]
-+		public const uint Arabic_hamza;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_hamza_above")]
-+		public const uint Arabic_hamza_above;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_hamza_below")]
-+		public const uint Arabic_hamza_below;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_hamzaonalef")]
-+		public const uint Arabic_hamzaonalef;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_hamzaonwaw")]
-+		public const uint Arabic_hamzaonwaw;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_hamzaonyeh")]
-+		public const uint Arabic_hamzaonyeh;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_hamzaunderalef")]
-+		public const uint Arabic_hamzaunderalef;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_heh")]
-+		public const uint Arabic_heh;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_heh_doachashmee")]
-+		public const uint Arabic_heh_doachashmee;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_heh_goal")]
-+		public const uint Arabic_heh_goal;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_jeem")]
-+		public const uint Arabic_jeem;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_jeh")]
-+		public const uint Arabic_jeh;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_kaf")]
-+		public const uint Arabic_kaf;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_kasra")]
-+		public const uint Arabic_kasra;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_kasratan")]
-+		public const uint Arabic_kasratan;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_keheh")]
-+		public const uint Arabic_keheh;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_khah")]
-+		public const uint Arabic_khah;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_lam")]
-+		public const uint Arabic_lam;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_madda_above")]
-+		public const uint Arabic_madda_above;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_maddaonalef")]
-+		public const uint Arabic_maddaonalef;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_meem")]
-+		public const uint Arabic_meem;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_noon")]
-+		public const uint Arabic_noon;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_noon_ghunna")]
-+		public const uint Arabic_noon_ghunna;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_peh")]
-+		public const uint Arabic_peh;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_percent")]
-+		public const uint Arabic_percent;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_qaf")]
-+		public const uint Arabic_qaf;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_question_mark")]
-+		public const uint Arabic_question_mark;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_ra")]
-+		public const uint Arabic_ra;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_rreh")]
-+		public const uint Arabic_rreh;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_sad")]
-+		public const uint Arabic_sad;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_seen")]
-+		public const uint Arabic_seen;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_semicolon")]
-+		public const uint Arabic_semicolon;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_shadda")]
-+		public const uint Arabic_shadda;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_sheen")]
-+		public const uint Arabic_sheen;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_sukun")]
-+		public const uint Arabic_sukun;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_superscript_alef")]
-+		public const uint Arabic_superscript_alef;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_switch")]
-+		public const uint Arabic_switch;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_tah")]
-+		public const uint Arabic_tah;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_tatweel")]
-+		public const uint Arabic_tatweel;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_tcheh")]
-+		public const uint Arabic_tcheh;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_teh")]
-+		public const uint Arabic_teh;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_tehmarbuta")]
-+		public const uint Arabic_tehmarbuta;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_thal")]
-+		public const uint Arabic_thal;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_theh")]
-+		public const uint Arabic_theh;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_tteh")]
-+		public const uint Arabic_tteh;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_veh")]
-+		public const uint Arabic_veh;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_waw")]
-+		public const uint Arabic_waw;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_yeh")]
-+		public const uint Arabic_yeh;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_yeh_baree")]
-+		public const uint Arabic_yeh_baree;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_zah")]
-+		public const uint Arabic_zah;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Arabic_zain")]
-+		public const uint Arabic_zain;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Aring")]
-+		public const uint Aring;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_AT")]
-+		public const uint Armenian_AT;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_AYB")]
-+		public const uint Armenian_AYB;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_BEN")]
-+		public const uint Armenian_BEN;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_CHA")]
-+		public const uint Armenian_CHA;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_DA")]
-+		public const uint Armenian_DA;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_DZA")]
-+		public const uint Armenian_DZA;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_E")]
-+		public const uint Armenian_E;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_FE")]
-+		public const uint Armenian_FE;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_GHAT")]
-+		public const uint Armenian_GHAT;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_GIM")]
-+		public const uint Armenian_GIM;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_HI")]
-+		public const uint Armenian_HI;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_HO")]
-+		public const uint Armenian_HO;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_INI")]
-+		public const uint Armenian_INI;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_JE")]
-+		public const uint Armenian_JE;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_KE")]
-+		public const uint Armenian_KE;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_KEN")]
-+		public const uint Armenian_KEN;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_KHE")]
-+		public const uint Armenian_KHE;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_LYUN")]
-+		public const uint Armenian_LYUN;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_MEN")]
-+		public const uint Armenian_MEN;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_NU")]
-+		public const uint Armenian_NU;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_O")]
-+		public const uint Armenian_O;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_PE")]
-+		public const uint Armenian_PE;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_PYUR")]
-+		public const uint Armenian_PYUR;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_RA")]
-+		public const uint Armenian_RA;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_RE")]
-+		public const uint Armenian_RE;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_SE")]
-+		public const uint Armenian_SE;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_SHA")]
-+		public const uint Armenian_SHA;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_TCHE")]
-+		public const uint Armenian_TCHE;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_TO")]
-+		public const uint Armenian_TO;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_TSA")]
-+		public const uint Armenian_TSA;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_TSO")]
-+		public const uint Armenian_TSO;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_TYUN")]
-+		public const uint Armenian_TYUN;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_VEV")]
-+		public const uint Armenian_VEV;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_VO")]
-+		public const uint Armenian_VO;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_VYUN")]
-+		public const uint Armenian_VYUN;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_YECH")]
-+		public const uint Armenian_YECH;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_ZA")]
-+		public const uint Armenian_ZA;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_ZHE")]
-+		public const uint Armenian_ZHE;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_accent")]
-+		public const uint Armenian_accent;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_amanak")]
-+		public const uint Armenian_amanak;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_apostrophe")]
-+		public const uint Armenian_apostrophe;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_at")]
-+		public const uint Armenian_at;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_ayb")]
-+		public const uint Armenian_ayb;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_ben")]
-+		public const uint Armenian_ben;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_but")]
-+		public const uint Armenian_but;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_cha")]
-+		public const uint Armenian_cha;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_da")]
-+		public const uint Armenian_da;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_dza")]
-+		public const uint Armenian_dza;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_e")]
-+		public const uint Armenian_e;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_exclam")]
-+		public const uint Armenian_exclam;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_fe")]
-+		public const uint Armenian_fe;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_full_stop")]
-+		public const uint Armenian_full_stop;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_ghat")]
-+		public const uint Armenian_ghat;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_gim")]
-+		public const uint Armenian_gim;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_hi")]
-+		public const uint Armenian_hi;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_ho")]
-+		public const uint Armenian_ho;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_hyphen")]
-+		public const uint Armenian_hyphen;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_ini")]
-+		public const uint Armenian_ini;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_je")]
-+		public const uint Armenian_je;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_ke")]
-+		public const uint Armenian_ke;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_ken")]
-+		public const uint Armenian_ken;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_khe")]
-+		public const uint Armenian_khe;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_ligature_ew")]
-+		public const uint Armenian_ligature_ew;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_lyun")]
-+		public const uint Armenian_lyun;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_men")]
-+		public const uint Armenian_men;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_nu")]
-+		public const uint Armenian_nu;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_o")]
-+		public const uint Armenian_o;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_paruyk")]
-+		public const uint Armenian_paruyk;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_pe")]
-+		public const uint Armenian_pe;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_pyur")]
-+		public const uint Armenian_pyur;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_question")]
-+		public const uint Armenian_question;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_ra")]
-+		public const uint Armenian_ra;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_re")]
-+		public const uint Armenian_re;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_se")]
-+		public const uint Armenian_se;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_separation_mark")]
-+		public const uint Armenian_separation_mark;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_sha")]
-+		public const uint Armenian_sha;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_shesht")]
-+		public const uint Armenian_shesht;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_tche")]
-+		public const uint Armenian_tche;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_to")]
-+		public const uint Armenian_to;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_tsa")]
-+		public const uint Armenian_tsa;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_tso")]
-+		public const uint Armenian_tso;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_tyun")]
-+		public const uint Armenian_tyun;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_verjaket")]
-+		public const uint Armenian_verjaket;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_vev")]
-+		public const uint Armenian_vev;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_vo")]
-+		public const uint Armenian_vo;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_vyun")]
-+		public const uint Armenian_vyun;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_yech")]
-+		public const uint Armenian_yech;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_yentamna")]
-+		public const uint Armenian_yentamna;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_za")]
-+		public const uint Armenian_za;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Armenian_zhe")]
-+		public const uint Armenian_zhe;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Atilde")]
-+		public const uint Atilde;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudibleBell_Enable")]
-+		public const uint AudibleBell_Enable;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioCycleTrack")]
-+		public const uint AudioCycleTrack;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioForward")]
-+		public const uint AudioForward;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioLowerVolume")]
-+		public const uint AudioLowerVolume;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioMedia")]
-+		public const uint AudioMedia;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioMicMute")]
-+		public const uint AudioMicMute;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioMute")]
-+		public const uint AudioMute;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioNext")]
-+		public const uint AudioNext;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioPause")]
-+		public const uint AudioPause;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioPlay")]
-+		public const uint AudioPlay;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioPrev")]
-+		public const uint AudioPrev;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioRaiseVolume")]
-+		public const uint AudioRaiseVolume;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioRandomPlay")]
-+		public const uint AudioRandomPlay;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioRecord")]
-+		public const uint AudioRecord;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioRepeat")]
-+		public const uint AudioRepeat;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioRewind")]
-+		public const uint AudioRewind;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_AudioStop")]
-+		public const uint AudioStop;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Away")]
-+		public const uint Away;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_B")]
-+		public const uint B;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Babovedot")]
-+		public const uint Babovedot;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Back")]
-+		public const uint Back;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_BackForward")]
-+		public const uint BackForward;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_BackSpace")]
-+		public const uint BackSpace;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Battery")]
-+		public const uint Battery;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Begin")]
-+		public const uint Begin;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Blue")]
-+		public const uint Blue;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Bluetooth")]
-+		public const uint Bluetooth;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Book")]
-+		public const uint Book;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_BounceKeys_Enable")]
-+		public const uint BounceKeys_Enable;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Break")]
-+		public const uint Break;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_BrightnessAdjust")]
-+		public const uint BrightnessAdjust;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Byelorussian_SHORTU")]
-+		public const uint Byelorussian_SHORTU;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Byelorussian_shortu")]
-+		public const uint Byelorussian_shortu;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_C")]
-+		public const uint C;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_CD")]
-+		public const uint CD;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_CH")]
-+		public const uint CH;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_C_H")]
-+		public const uint C_H;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_C_h")]
-+		public const uint C_h;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cabovedot")]
-+		public const uint Cabovedot;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cacute")]
-+		public const uint Cacute;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Calculator")]
-+		public const uint Calculator;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Calendar")]
-+		public const uint Calendar;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cancel")]
-+		public const uint Cancel;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Caps_Lock")]
-+		public const uint Caps_Lock;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ccaron")]
-+		public const uint Ccaron;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ccedilla")]
-+		public const uint Ccedilla;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ccircumflex")]
-+		public const uint Ccircumflex;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ch")]
-+		public const uint Ch;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Clear")]
-+		public const uint Clear;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ClearGrab")]
-+		public const uint ClearGrab;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Close")]
-+		public const uint Close;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Codeinput")]
-+		public const uint Codeinput;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ColonSign")]
-+		public const uint ColonSign;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Community")]
-+		public const uint Community;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ContrastAdjust")]
-+		public const uint ContrastAdjust;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Control_L")]
-+		public const uint Control_L;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Control_R")]
-+		public const uint Control_R;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Copy")]
-+		public const uint Copy;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_CruzeiroSign")]
-+		public const uint CruzeiroSign;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cut")]
-+		public const uint Cut;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_CycleAngle")]
-+		public const uint CycleAngle;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_A")]
-+		public const uint Cyrillic_A;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_BE")]
-+		public const uint Cyrillic_BE;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_CHE")]
-+		public const uint Cyrillic_CHE;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_CHE_descender")]
-+		public const uint Cyrillic_CHE_descender;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_CHE_vertstroke")]
-+		public const uint Cyrillic_CHE_vertstroke;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_DE")]
-+		public const uint Cyrillic_DE;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_DZHE")]
-+		public const uint Cyrillic_DZHE;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_E")]
-+		public const uint Cyrillic_E;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_EF")]
-+		public const uint Cyrillic_EF;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_EL")]
-+		public const uint Cyrillic_EL;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_EM")]
-+		public const uint Cyrillic_EM;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_EN")]
-+		public const uint Cyrillic_EN;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_EN_descender")]
-+		public const uint Cyrillic_EN_descender;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ER")]
-+		public const uint Cyrillic_ER;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ES")]
-+		public const uint Cyrillic_ES;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_GHE")]
-+		public const uint Cyrillic_GHE;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_GHE_bar")]
-+		public const uint Cyrillic_GHE_bar;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_HA")]
-+		public const uint Cyrillic_HA;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_HARDSIGN")]
-+		public const uint Cyrillic_HARDSIGN;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_HA_descender")]
-+		public const uint Cyrillic_HA_descender;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_I")]
-+		public const uint Cyrillic_I;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_IE")]
-+		public const uint Cyrillic_IE;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_IO")]
-+		public const uint Cyrillic_IO;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_I_macron")]
-+		public const uint Cyrillic_I_macron;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_JE")]
-+		public const uint Cyrillic_JE;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_KA")]
-+		public const uint Cyrillic_KA;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_KA_descender")]
-+		public const uint Cyrillic_KA_descender;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_KA_vertstroke")]
-+		public const uint Cyrillic_KA_vertstroke;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_LJE")]
-+		public const uint Cyrillic_LJE;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_NJE")]
-+		public const uint Cyrillic_NJE;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_O")]
-+		public const uint Cyrillic_O;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_O_bar")]
-+		public const uint Cyrillic_O_bar;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_PE")]
-+		public const uint Cyrillic_PE;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_SCHWA")]
-+		public const uint Cyrillic_SCHWA;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_SHA")]
-+		public const uint Cyrillic_SHA;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_SHCHA")]
-+		public const uint Cyrillic_SHCHA;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_SHHA")]
-+		public const uint Cyrillic_SHHA;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_SHORTI")]
-+		public const uint Cyrillic_SHORTI;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_SOFTSIGN")]
-+		public const uint Cyrillic_SOFTSIGN;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_TE")]
-+		public const uint Cyrillic_TE;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_TSE")]
-+		public const uint Cyrillic_TSE;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_U")]
-+		public const uint Cyrillic_U;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_U_macron")]
-+		public const uint Cyrillic_U_macron;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_U_straight")]
-+		public const uint Cyrillic_U_straight;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_U_straight_bar")]
-+		public const uint Cyrillic_U_straight_bar;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_VE")]
-+		public const uint Cyrillic_VE;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_YA")]
-+		public const uint Cyrillic_YA;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_YERU")]
-+		public const uint Cyrillic_YERU;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_YU")]
-+		public const uint Cyrillic_YU;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ZE")]
-+		public const uint Cyrillic_ZE;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ZHE")]
-+		public const uint Cyrillic_ZHE;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ZHE_descender")]
-+		public const uint Cyrillic_ZHE_descender;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_a")]
-+		public const uint Cyrillic_a;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_be")]
-+		public const uint Cyrillic_be;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_che")]
-+		public const uint Cyrillic_che;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_che_descender")]
-+		public const uint Cyrillic_che_descender;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_che_vertstroke")]
-+		public const uint Cyrillic_che_vertstroke;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_de")]
-+		public const uint Cyrillic_de;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_dzhe")]
-+		public const uint Cyrillic_dzhe;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_e")]
-+		public const uint Cyrillic_e;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ef")]
-+		public const uint Cyrillic_ef;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_el")]
-+		public const uint Cyrillic_el;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_em")]
-+		public const uint Cyrillic_em;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_en")]
-+		public const uint Cyrillic_en;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_en_descender")]
-+		public const uint Cyrillic_en_descender;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_er")]
-+		public const uint Cyrillic_er;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_es")]
-+		public const uint Cyrillic_es;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ghe")]
-+		public const uint Cyrillic_ghe;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ghe_bar")]
-+		public const uint Cyrillic_ghe_bar;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ha")]
-+		public const uint Cyrillic_ha;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ha_descender")]
-+		public const uint Cyrillic_ha_descender;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_hardsign")]
-+		public const uint Cyrillic_hardsign;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_i")]
-+		public const uint Cyrillic_i;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_i_macron")]
-+		public const uint Cyrillic_i_macron;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ie")]
-+		public const uint Cyrillic_ie;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_io")]
-+		public const uint Cyrillic_io;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_je")]
-+		public const uint Cyrillic_je;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ka")]
-+		public const uint Cyrillic_ka;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ka_descender")]
-+		public const uint Cyrillic_ka_descender;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ka_vertstroke")]
-+		public const uint Cyrillic_ka_vertstroke;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_lje")]
-+		public const uint Cyrillic_lje;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_nje")]
-+		public const uint Cyrillic_nje;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_o")]
-+		public const uint Cyrillic_o;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_o_bar")]
-+		public const uint Cyrillic_o_bar;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_pe")]
-+		public const uint Cyrillic_pe;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_schwa")]
-+		public const uint Cyrillic_schwa;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_sha")]
-+		public const uint Cyrillic_sha;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_shcha")]
-+		public const uint Cyrillic_shcha;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_shha")]
-+		public const uint Cyrillic_shha;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_shorti")]
-+		public const uint Cyrillic_shorti;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_softsign")]
-+		public const uint Cyrillic_softsign;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_te")]
-+		public const uint Cyrillic_te;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_tse")]
-+		public const uint Cyrillic_tse;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_u")]
-+		public const uint Cyrillic_u;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_u_macron")]
-+		public const uint Cyrillic_u_macron;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_u_straight")]
-+		public const uint Cyrillic_u_straight;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_u_straight_bar")]
-+		public const uint Cyrillic_u_straight_bar;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ve")]
-+		public const uint Cyrillic_ve;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ya")]
-+		public const uint Cyrillic_ya;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_yeru")]
-+		public const uint Cyrillic_yeru;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_yu")]
-+		public const uint Cyrillic_yu;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_ze")]
-+		public const uint Cyrillic_ze;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_zhe")]
-+		public const uint Cyrillic_zhe;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Cyrillic_zhe_descender")]
-+		public const uint Cyrillic_zhe_descender;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_D")]
-+		public const uint D;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_DOS")]
-+		public const uint DOS;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Dabovedot")]
-+		public const uint Dabovedot;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Dcaron")]
-+		public const uint Dcaron;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Delete")]
-+		public const uint Delete;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Display")]
-+		public const uint Display;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Documents")]
-+		public const uint Documents;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_DongSign")]
-+		public const uint DongSign;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Down")]
-+		public const uint Down;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Dstroke")]
-+		public const uint Dstroke;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_E")]
-+		public const uint E;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ENG")]
-+		public const uint ENG;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ETH")]
-+		public const uint ETH;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_EZH")]
-+		public const uint EZH;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Eabovedot")]
-+		public const uint Eabovedot;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Eacute")]
-+		public const uint Eacute;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ebelowdot")]
-+		public const uint Ebelowdot;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ecaron")]
-+		public const uint Ecaron;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ecircumflex")]
-+		public const uint Ecircumflex;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ecircumflexacute")]
-+		public const uint Ecircumflexacute;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ecircumflexbelowdot")]
-+		public const uint Ecircumflexbelowdot;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ecircumflexgrave")]
-+		public const uint Ecircumflexgrave;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ecircumflexhook")]
-+		public const uint Ecircumflexhook;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ecircumflextilde")]
-+		public const uint Ecircumflextilde;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_EcuSign")]
-+		public const uint EcuSign;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ediaeresis")]
-+		public const uint Ediaeresis;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Egrave")]
-+		public const uint Egrave;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ehook")]
-+		public const uint Ehook;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Eisu_Shift")]
-+		public const uint Eisu_Shift;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Eisu_toggle")]
-+		public const uint Eisu_toggle;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Eject")]
-+		public const uint Eject;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Emacron")]
-+		public const uint Emacron;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_End")]
-+		public const uint End;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Eogonek")]
-+		public const uint Eogonek;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Escape")]
-+		public const uint Escape;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Eth")]
-+		public const uint Eth;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Etilde")]
-+		public const uint Etilde;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_EuroSign")]
-+		public const uint EuroSign;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Excel")]
-+		public const uint Excel;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Execute")]
-+		public const uint Execute;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Explorer")]
-+		public const uint Explorer;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F")]
-+		public const uint F;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F1")]
-+		public const uint F1;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F10")]
-+		public const uint F10;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F11")]
-+		public const uint F11;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F12")]
-+		public const uint F12;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F13")]
-+		public const uint F13;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F14")]
-+		public const uint F14;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F15")]
-+		public const uint F15;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F16")]
-+		public const uint F16;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F17")]
-+		public const uint F17;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F18")]
-+		public const uint F18;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F19")]
-+		public const uint F19;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F2")]
-+		public const uint F2;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F20")]
-+		public const uint F20;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F21")]
-+		public const uint F21;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F22")]
-+		public const uint F22;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F23")]
-+		public const uint F23;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F24")]
-+		public const uint F24;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F25")]
-+		public const uint F25;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F26")]
-+		public const uint F26;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F27")]
-+		public const uint F27;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F28")]
-+		public const uint F28;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F29")]
-+		public const uint F29;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F3")]
-+		public const uint F3;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F30")]
-+		public const uint F30;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F31")]
-+		public const uint F31;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F32")]
-+		public const uint F32;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F33")]
-+		public const uint F33;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F34")]
-+		public const uint F34;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F35")]
-+		public const uint F35;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F4")]
-+		public const uint F4;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F5")]
-+		public const uint F5;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F6")]
-+		public const uint F6;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F7")]
-+		public const uint F7;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F8")]
-+		public const uint F8;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_F9")]
-+		public const uint F9;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_FFrancSign")]
-+		public const uint FFrancSign;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Fabovedot")]
-+		public const uint Fabovedot;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Farsi_0")]
-+		public const uint Farsi_0;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Farsi_1")]
-+		public const uint Farsi_1;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Farsi_2")]
-+		public const uint Farsi_2;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Farsi_3")]
-+		public const uint Farsi_3;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Farsi_4")]
-+		public const uint Farsi_4;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Farsi_5")]
-+		public const uint Farsi_5;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Farsi_6")]
-+		public const uint Farsi_6;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Farsi_7")]
-+		public const uint Farsi_7;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Farsi_8")]
-+		public const uint Farsi_8;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Farsi_9")]
-+		public const uint Farsi_9;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Farsi_yeh")]
-+		public const uint Farsi_yeh;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Favorites")]
-+		public const uint Favorites;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Finance")]
-+		public const uint Finance;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Find")]
-+		public const uint Find;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_First_Virtual_Screen")]
-+		public const uint First_Virtual_Screen;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Forward")]
-+		public const uint Forward;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_FrameBack")]
-+		public const uint FrameBack;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_FrameForward")]
-+		public const uint FrameForward;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_G")]
-+		public const uint G;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Gabovedot")]
-+		public const uint Gabovedot;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Game")]
-+		public const uint Game;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Gbreve")]
-+		public const uint Gbreve;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Gcaron")]
-+		public const uint Gcaron;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Gcedilla")]
-+		public const uint Gcedilla;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Gcircumflex")]
-+		public const uint Gcircumflex;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_an")]
-+		public const uint Georgian_an;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_ban")]
-+		public const uint Georgian_ban;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_can")]
-+		public const uint Georgian_can;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_char")]
-+		public const uint Georgian_char;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_chin")]
-+		public const uint Georgian_chin;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_cil")]
-+		public const uint Georgian_cil;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_don")]
-+		public const uint Georgian_don;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_en")]
-+		public const uint Georgian_en;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_fi")]
-+		public const uint Georgian_fi;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_gan")]
-+		public const uint Georgian_gan;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_ghan")]
-+		public const uint Georgian_ghan;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_hae")]
-+		public const uint Georgian_hae;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_har")]
-+		public const uint Georgian_har;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_he")]
-+		public const uint Georgian_he;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_hie")]
-+		public const uint Georgian_hie;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_hoe")]
-+		public const uint Georgian_hoe;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_in")]
-+		public const uint Georgian_in;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_jhan")]
-+		public const uint Georgian_jhan;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_jil")]
-+		public const uint Georgian_jil;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_kan")]
-+		public const uint Georgian_kan;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_khar")]
-+		public const uint Georgian_khar;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_las")]
-+		public const uint Georgian_las;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_man")]
-+		public const uint Georgian_man;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_nar")]
-+		public const uint Georgian_nar;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_on")]
-+		public const uint Georgian_on;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_par")]
-+		public const uint Georgian_par;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_phar")]
-+		public const uint Georgian_phar;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_qar")]
-+		public const uint Georgian_qar;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_rae")]
-+		public const uint Georgian_rae;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_san")]
-+		public const uint Georgian_san;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_shin")]
-+		public const uint Georgian_shin;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_tan")]
-+		public const uint Georgian_tan;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_tar")]
-+		public const uint Georgian_tar;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_un")]
-+		public const uint Georgian_un;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_vin")]
-+		public const uint Georgian_vin;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_we")]
-+		public const uint Georgian_we;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_xan")]
-+		public const uint Georgian_xan;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_zen")]
-+		public const uint Georgian_zen;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Georgian_zhar")]
-+		public const uint Georgian_zhar;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Go")]
-+		public const uint Go;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_ALPHA")]
-+		public const uint Greek_ALPHA;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_ALPHAaccent")]
-+		public const uint Greek_ALPHAaccent;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_BETA")]
-+		public const uint Greek_BETA;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_CHI")]
-+		public const uint Greek_CHI;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_DELTA")]
-+		public const uint Greek_DELTA;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_EPSILON")]
-+		public const uint Greek_EPSILON;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_EPSILONaccent")]
-+		public const uint Greek_EPSILONaccent;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_ETA")]
-+		public const uint Greek_ETA;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_ETAaccent")]
-+		public const uint Greek_ETAaccent;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_GAMMA")]
-+		public const uint Greek_GAMMA;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_IOTA")]
-+		public const uint Greek_IOTA;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_IOTAaccent")]
-+		public const uint Greek_IOTAaccent;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_IOTAdiaeresis")]
-+		public const uint Greek_IOTAdiaeresis;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_IOTAdieresis")]
-+		public const uint Greek_IOTAdieresis;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_KAPPA")]
-+		public const uint Greek_KAPPA;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_LAMBDA")]
-+		public const uint Greek_LAMBDA;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_LAMDA")]
-+		public const uint Greek_LAMDA;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_MU")]
-+		public const uint Greek_MU;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_NU")]
-+		public const uint Greek_NU;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_OMEGA")]
-+		public const uint Greek_OMEGA;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_OMEGAaccent")]
-+		public const uint Greek_OMEGAaccent;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_OMICRON")]
-+		public const uint Greek_OMICRON;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_OMICRONaccent")]
-+		public const uint Greek_OMICRONaccent;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_PHI")]
-+		public const uint Greek_PHI;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_PI")]
-+		public const uint Greek_PI;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_PSI")]
-+		public const uint Greek_PSI;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_RHO")]
-+		public const uint Greek_RHO;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_SIGMA")]
-+		public const uint Greek_SIGMA;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_TAU")]
-+		public const uint Greek_TAU;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_THETA")]
-+		public const uint Greek_THETA;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_UPSILON")]
-+		public const uint Greek_UPSILON;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_UPSILONaccent")]
-+		public const uint Greek_UPSILONaccent;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_UPSILONdieresis")]
-+		public const uint Greek_UPSILONdieresis;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_XI")]
-+		public const uint Greek_XI;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_ZETA")]
-+		public const uint Greek_ZETA;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_accentdieresis")]
-+		public const uint Greek_accentdieresis;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_alpha")]
-+		public const uint Greek_alpha;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_alphaaccent")]
-+		public const uint Greek_alphaaccent;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_beta")]
-+		public const uint Greek_beta;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_chi")]
-+		public const uint Greek_chi;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_delta")]
-+		public const uint Greek_delta;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_epsilon")]
-+		public const uint Greek_epsilon;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_epsilonaccent")]
-+		public const uint Greek_epsilonaccent;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_eta")]
-+		public const uint Greek_eta;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_etaaccent")]
-+		public const uint Greek_etaaccent;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_finalsmallsigma")]
-+		public const uint Greek_finalsmallsigma;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_gamma")]
-+		public const uint Greek_gamma;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_horizbar")]
-+		public const uint Greek_horizbar;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_iota")]
-+		public const uint Greek_iota;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_iotaaccent")]
-+		public const uint Greek_iotaaccent;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_iotaaccentdieresis")]
-+		public const uint Greek_iotaaccentdieresis;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_iotadieresis")]
-+		public const uint Greek_iotadieresis;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_kappa")]
-+		public const uint Greek_kappa;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_lambda")]
-+		public const uint Greek_lambda;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_lamda")]
-+		public const uint Greek_lamda;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_mu")]
-+		public const uint Greek_mu;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_nu")]
-+		public const uint Greek_nu;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_omega")]
-+		public const uint Greek_omega;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_omegaaccent")]
-+		public const uint Greek_omegaaccent;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_omicron")]
-+		public const uint Greek_omicron;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_omicronaccent")]
-+		public const uint Greek_omicronaccent;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_phi")]
-+		public const uint Greek_phi;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_pi")]
-+		public const uint Greek_pi;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_psi")]
-+		public const uint Greek_psi;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_rho")]
-+		public const uint Greek_rho;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_sigma")]
-+		public const uint Greek_sigma;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_switch")]
-+		public const uint Greek_switch;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_tau")]
-+		public const uint Greek_tau;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_theta")]
-+		public const uint Greek_theta;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_upsilon")]
-+		public const uint Greek_upsilon;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_upsilonaccent")]
-+		public const uint Greek_upsilonaccent;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_upsilonaccentdieresis")]
-+		public const uint Greek_upsilonaccentdieresis;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_upsilondieresis")]
-+		public const uint Greek_upsilondieresis;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_xi")]
-+		public const uint Greek_xi;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Greek_zeta")]
-+		public const uint Greek_zeta;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Green")]
-+		public const uint Green;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_H")]
-+		public const uint H;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul")]
-+		public const uint Hangul;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_A")]
-+		public const uint Hangul_A;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_AE")]
-+		public const uint Hangul_AE;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_AraeA")]
-+		public const uint Hangul_AraeA;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_AraeAE")]
-+		public const uint Hangul_AraeAE;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Banja")]
-+		public const uint Hangul_Banja;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Cieuc")]
-+		public const uint Hangul_Cieuc;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Codeinput")]
-+		public const uint Hangul_Codeinput;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Dikeud")]
-+		public const uint Hangul_Dikeud;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_E")]
-+		public const uint Hangul_E;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_EO")]
-+		public const uint Hangul_EO;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_EU")]
-+		public const uint Hangul_EU;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_End")]
-+		public const uint Hangul_End;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Hanja")]
-+		public const uint Hangul_Hanja;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Hieuh")]
-+		public const uint Hangul_Hieuh;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_I")]
-+		public const uint Hangul_I;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Ieung")]
-+		public const uint Hangul_Ieung;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_Cieuc")]
-+		public const uint Hangul_J_Cieuc;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_Dikeud")]
-+		public const uint Hangul_J_Dikeud;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_Hieuh")]
-+		public const uint Hangul_J_Hieuh;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_Ieung")]
-+		public const uint Hangul_J_Ieung;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_Jieuj")]
-+		public const uint Hangul_J_Jieuj;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_Khieuq")]
-+		public const uint Hangul_J_Khieuq;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_Kiyeog")]
-+		public const uint Hangul_J_Kiyeog;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_KiyeogSios")]
-+		public const uint Hangul_J_KiyeogSios;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_KkogjiDalrinIeung")]
-+		public const uint Hangul_J_KkogjiDalrinIeung;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_Mieum")]
-+		public const uint Hangul_J_Mieum;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_Nieun")]
-+		public const uint Hangul_J_Nieun;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_NieunHieuh")]
-+		public const uint Hangul_J_NieunHieuh;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_NieunJieuj")]
-+		public const uint Hangul_J_NieunJieuj;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_PanSios")]
-+		public const uint Hangul_J_PanSios;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_Phieuf")]
-+		public const uint Hangul_J_Phieuf;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_Pieub")]
-+		public const uint Hangul_J_Pieub;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_PieubSios")]
-+		public const uint Hangul_J_PieubSios;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_Rieul")]
-+		public const uint Hangul_J_Rieul;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_RieulHieuh")]
-+		public const uint Hangul_J_RieulHieuh;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_RieulKiyeog")]
-+		public const uint Hangul_J_RieulKiyeog;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_RieulMieum")]
-+		public const uint Hangul_J_RieulMieum;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_RieulPhieuf")]
-+		public const uint Hangul_J_RieulPhieuf;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_RieulPieub")]
-+		public const uint Hangul_J_RieulPieub;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_RieulSios")]
-+		public const uint Hangul_J_RieulSios;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_RieulTieut")]
-+		public const uint Hangul_J_RieulTieut;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_Sios")]
-+		public const uint Hangul_J_Sios;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_SsangKiyeog")]
-+		public const uint Hangul_J_SsangKiyeog;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_SsangSios")]
-+		public const uint Hangul_J_SsangSios;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_Tieut")]
-+		public const uint Hangul_J_Tieut;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_J_YeorinHieuh")]
-+		public const uint Hangul_J_YeorinHieuh;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Jamo")]
-+		public const uint Hangul_Jamo;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Jeonja")]
-+		public const uint Hangul_Jeonja;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Jieuj")]
-+		public const uint Hangul_Jieuj;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Khieuq")]
-+		public const uint Hangul_Khieuq;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Kiyeog")]
-+		public const uint Hangul_Kiyeog;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_KiyeogSios")]
-+		public const uint Hangul_KiyeogSios;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_KkogjiDalrinIeung")]
-+		public const uint Hangul_KkogjiDalrinIeung;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Mieum")]
-+		public const uint Hangul_Mieum;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_MultipleCandidate")]
-+		public const uint Hangul_MultipleCandidate;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Nieun")]
-+		public const uint Hangul_Nieun;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_NieunHieuh")]
-+		public const uint Hangul_NieunHieuh;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_NieunJieuj")]
-+		public const uint Hangul_NieunJieuj;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_O")]
-+		public const uint Hangul_O;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_OE")]
-+		public const uint Hangul_OE;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_PanSios")]
-+		public const uint Hangul_PanSios;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Phieuf")]
-+		public const uint Hangul_Phieuf;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Pieub")]
-+		public const uint Hangul_Pieub;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_PieubSios")]
-+		public const uint Hangul_PieubSios;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_PostHanja")]
-+		public const uint Hangul_PostHanja;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_PreHanja")]
-+		public const uint Hangul_PreHanja;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_PreviousCandidate")]
-+		public const uint Hangul_PreviousCandidate;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Rieul")]
-+		public const uint Hangul_Rieul;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_RieulHieuh")]
-+		public const uint Hangul_RieulHieuh;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_RieulKiyeog")]
-+		public const uint Hangul_RieulKiyeog;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_RieulMieum")]
-+		public const uint Hangul_RieulMieum;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_RieulPhieuf")]
-+		public const uint Hangul_RieulPhieuf;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_RieulPieub")]
-+		public const uint Hangul_RieulPieub;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_RieulSios")]
-+		public const uint Hangul_RieulSios;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_RieulTieut")]
-+		public const uint Hangul_RieulTieut;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_RieulYeorinHieuh")]
-+		public const uint Hangul_RieulYeorinHieuh;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Romaja")]
-+		public const uint Hangul_Romaja;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_SingleCandidate")]
-+		public const uint Hangul_SingleCandidate;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Sios")]
-+		public const uint Hangul_Sios;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Special")]
-+		public const uint Hangul_Special;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_SsangDikeud")]
-+		public const uint Hangul_SsangDikeud;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_SsangJieuj")]
-+		public const uint Hangul_SsangJieuj;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_SsangKiyeog")]
-+		public const uint Hangul_SsangKiyeog;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_SsangPieub")]
-+		public const uint Hangul_SsangPieub;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_SsangSios")]
-+		public const uint Hangul_SsangSios;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Start")]
-+		public const uint Hangul_Start;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_SunkyeongeumMieum")]
-+		public const uint Hangul_SunkyeongeumMieum;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_SunkyeongeumPhieuf")]
-+		public const uint Hangul_SunkyeongeumPhieuf;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_SunkyeongeumPieub")]
-+		public const uint Hangul_SunkyeongeumPieub;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_Tieut")]
-+		public const uint Hangul_Tieut;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_U")]
-+		public const uint Hangul_U;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_WA")]
-+		public const uint Hangul_WA;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_WAE")]
-+		public const uint Hangul_WAE;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_WE")]
-+		public const uint Hangul_WE;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_WEO")]
-+		public const uint Hangul_WEO;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_WI")]
-+		public const uint Hangul_WI;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_YA")]
-+		public const uint Hangul_YA;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_YAE")]
-+		public const uint Hangul_YAE;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_YE")]
-+		public const uint Hangul_YE;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_YEO")]
-+		public const uint Hangul_YEO;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_YI")]
-+		public const uint Hangul_YI;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_YO")]
-+		public const uint Hangul_YO;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_YU")]
-+		public const uint Hangul_YU;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_YeorinHieuh")]
-+		public const uint Hangul_YeorinHieuh;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hangul_switch")]
-+		public const uint Hangul_switch;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hankaku")]
-+		public const uint Hankaku;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hcircumflex")]
-+		public const uint Hcircumflex;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hebrew_switch")]
-+		public const uint Hebrew_switch;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Help")]
-+		public const uint Help;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Henkan")]
-+		public const uint Henkan;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Henkan_Mode")]
-+		public const uint Henkan_Mode;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hibernate")]
-+		public const uint Hibernate;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hiragana")]
-+		public const uint Hiragana;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hiragana_Katakana")]
-+		public const uint Hiragana_Katakana;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_History")]
-+		public const uint History;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Home")]
-+		public const uint Home;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_HomePage")]
-+		public const uint HomePage;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_HotLinks")]
-+		public const uint HotLinks;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hstroke")]
-+		public const uint Hstroke;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hyper_L")]
-+		public const uint Hyper_L;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Hyper_R")]
-+		public const uint Hyper_R;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_I")]
-+		public const uint I;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Center_Object")]
-+		public const uint ISO_Center_Object;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Continuous_Underline")]
-+		public const uint ISO_Continuous_Underline;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Discontinuous_Underline")]
-+		public const uint ISO_Discontinuous_Underline;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Emphasize")]
-+		public const uint ISO_Emphasize;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Enter")]
-+		public const uint ISO_Enter;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Fast_Cursor_Down")]
-+		public const uint ISO_Fast_Cursor_Down;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Fast_Cursor_Left")]
-+		public const uint ISO_Fast_Cursor_Left;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Fast_Cursor_Right")]
-+		public const uint ISO_Fast_Cursor_Right;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Fast_Cursor_Up")]
-+		public const uint ISO_Fast_Cursor_Up;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_First_Group")]
-+		public const uint ISO_First_Group;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_First_Group_Lock")]
-+		public const uint ISO_First_Group_Lock;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Group_Latch")]
-+		public const uint ISO_Group_Latch;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Group_Lock")]
-+		public const uint ISO_Group_Lock;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Group_Shift")]
-+		public const uint ISO_Group_Shift;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Last_Group")]
-+		public const uint ISO_Last_Group;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Last_Group_Lock")]
-+		public const uint ISO_Last_Group_Lock;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Left_Tab")]
-+		public const uint ISO_Left_Tab;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Level2_Latch")]
-+		public const uint ISO_Level2_Latch;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Level3_Latch")]
-+		public const uint ISO_Level3_Latch;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Level3_Lock")]
-+		public const uint ISO_Level3_Lock;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Level3_Shift")]
-+		public const uint ISO_Level3_Shift;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Level5_Latch")]
-+		public const uint ISO_Level5_Latch;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Level5_Lock")]
-+		public const uint ISO_Level5_Lock;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Level5_Shift")]
-+		public const uint ISO_Level5_Shift;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Lock")]
-+		public const uint ISO_Lock;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Move_Line_Down")]
-+		public const uint ISO_Move_Line_Down;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Move_Line_Up")]
-+		public const uint ISO_Move_Line_Up;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Next_Group")]
-+		public const uint ISO_Next_Group;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Next_Group_Lock")]
-+		public const uint ISO_Next_Group_Lock;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Partial_Line_Down")]
-+		public const uint ISO_Partial_Line_Down;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Partial_Line_Up")]
-+		public const uint ISO_Partial_Line_Up;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Partial_Space_Left")]
-+		public const uint ISO_Partial_Space_Left;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Partial_Space_Right")]
-+		public const uint ISO_Partial_Space_Right;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Prev_Group")]
-+		public const uint ISO_Prev_Group;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Prev_Group_Lock")]
-+		public const uint ISO_Prev_Group_Lock;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Release_Both_Margins")]
-+		public const uint ISO_Release_Both_Margins;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Release_Margin_Left")]
-+		public const uint ISO_Release_Margin_Left;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Release_Margin_Right")]
-+		public const uint ISO_Release_Margin_Right;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Set_Margin_Left")]
-+		public const uint ISO_Set_Margin_Left;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ISO_Set_Margin_Right")]
-+		public const uint ISO_Set_Margin_Right;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Iabovedot")]
-+		public const uint Iabovedot;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Iacute")]
-+		public const uint Iacute;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ibelowdot")]
-+		public const uint Ibelowdot;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ibreve")]
-+		public const uint Ibreve;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Icircumflex")]
-+		public const uint Icircumflex;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Idiaeresis")]
-+		public const uint Idiaeresis;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Igrave")]
-+		public const uint Igrave;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ihook")]
-+		public const uint Ihook;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Imacron")]
-+		public const uint Imacron;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Insert")]
-+		public const uint Insert;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Iogonek")]
-+		public const uint Iogonek;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Itilde")]
-+		public const uint Itilde;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_J")]
-+		public const uint J;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Jcircumflex")]
-+		public const uint Jcircumflex;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_K")]
-+		public const uint K;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_0")]
-+		public const uint KP_0;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_1")]
-+		public const uint KP_1;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_2")]
-+		public const uint KP_2;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_3")]
-+		public const uint KP_3;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_4")]
-+		public const uint KP_4;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_5")]
-+		public const uint KP_5;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_6")]
-+		public const uint KP_6;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_7")]
-+		public const uint KP_7;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_8")]
-+		public const uint KP_8;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_9")]
-+		public const uint KP_9;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Add")]
-+		public const uint KP_Add;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Begin")]
-+		public const uint KP_Begin;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Decimal")]
-+		public const uint KP_Decimal;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Delete")]
-+		public const uint KP_Delete;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Divide")]
-+		public const uint KP_Divide;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Down")]
-+		public const uint KP_Down;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_End")]
-+		public const uint KP_End;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Enter")]
-+		public const uint KP_Enter;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Equal")]
-+		public const uint KP_Equal;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_F1")]
-+		public const uint KP_F1;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_F2")]
-+		public const uint KP_F2;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_F3")]
-+		public const uint KP_F3;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_F4")]
-+		public const uint KP_F4;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Home")]
-+		public const uint KP_Home;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Insert")]
-+		public const uint KP_Insert;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Left")]
-+		public const uint KP_Left;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Multiply")]
-+		public const uint KP_Multiply;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Next")]
-+		public const uint KP_Next;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Page_Down")]
-+		public const uint KP_Page_Down;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Page_Up")]
-+		public const uint KP_Page_Up;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Prior")]
-+		public const uint KP_Prior;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Right")]
-+		public const uint KP_Right;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Separator")]
-+		public const uint KP_Separator;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Space")]
-+		public const uint KP_Space;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Subtract")]
-+		public const uint KP_Subtract;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Tab")]
-+		public const uint KP_Tab;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KP_Up")]
-+		public const uint KP_Up;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Kana_Lock")]
-+		public const uint Kana_Lock;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Kana_Shift")]
-+		public const uint Kana_Shift;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Kanji")]
-+		public const uint Kanji;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Kanji_Bangou")]
-+		public const uint Kanji_Bangou;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Katakana")]
-+		public const uint Katakana;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KbdBrightnessDown")]
-+		public const uint KbdBrightnessDown;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KbdBrightnessUp")]
-+		public const uint KbdBrightnessUp;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_KbdLightOnOff")]
-+		public const uint KbdLightOnOff;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Kcedilla")]
-+		public const uint Kcedilla;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Korean_Won")]
-+		public const uint Korean_Won;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_L")]
-+		public const uint L;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_L1")]
-+		public const uint L1;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_L10")]
-+		public const uint L10;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_L2")]
-+		public const uint L2;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_L3")]
-+		public const uint L3;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_L4")]
-+		public const uint L4;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_L5")]
-+		public const uint L5;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_L6")]
-+		public const uint L6;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_L7")]
-+		public const uint L7;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_L8")]
-+		public const uint L8;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_L9")]
-+		public const uint L9;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Lacute")]
-+		public const uint Lacute;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Last_Virtual_Screen")]
-+		public const uint Last_Virtual_Screen;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Launch0")]
-+		public const uint Launch0;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Launch1")]
-+		public const uint Launch1;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Launch2")]
-+		public const uint Launch2;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Launch3")]
-+		public const uint Launch3;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Launch4")]
-+		public const uint Launch4;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Launch5")]
-+		public const uint Launch5;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Launch6")]
-+		public const uint Launch6;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Launch7")]
-+		public const uint Launch7;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Launch8")]
-+		public const uint Launch8;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Launch9")]
-+		public const uint Launch9;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_LaunchA")]
-+		public const uint LaunchA;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_LaunchB")]
-+		public const uint LaunchB;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_LaunchC")]
-+		public const uint LaunchC;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_LaunchD")]
-+		public const uint LaunchD;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_LaunchE")]
-+		public const uint LaunchE;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_LaunchF")]
-+		public const uint LaunchF;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Lbelowdot")]
-+		public const uint Lbelowdot;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Lcaron")]
-+		public const uint Lcaron;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Lcedilla")]
-+		public const uint Lcedilla;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Left")]
-+		public const uint Left;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_LightBulb")]
-+		public const uint LightBulb;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Linefeed")]
-+		public const uint Linefeed;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_LiraSign")]
-+		public const uint LiraSign;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_LogGrabInfo")]
-+		public const uint LogGrabInfo;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_LogOff")]
-+		public const uint LogOff;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_LogWindowTree")]
-+		public const uint LogWindowTree;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Lstroke")]
-+		public const uint Lstroke;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_M")]
-+		public const uint M;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Mabovedot")]
-+		public const uint Mabovedot;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Macedonia_DSE")]
-+		public const uint Macedonia_DSE;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Macedonia_GJE")]
-+		public const uint Macedonia_GJE;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Macedonia_KJE")]
-+		public const uint Macedonia_KJE;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Macedonia_dse")]
-+		public const uint Macedonia_dse;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Macedonia_gje")]
-+		public const uint Macedonia_gje;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Macedonia_kje")]
-+		public const uint Macedonia_kje;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Mae_Koho")]
-+		public const uint Mae_Koho;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Mail")]
-+		public const uint Mail;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_MailForward")]
-+		public const uint MailForward;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Market")]
-+		public const uint Market;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Massyo")]
-+		public const uint Massyo;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Meeting")]
-+		public const uint Meeting;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Memo")]
-+		public const uint Memo;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Menu")]
-+		public const uint Menu;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_MenuKB")]
-+		public const uint MenuKB;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_MenuPB")]
-+		public const uint MenuPB;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Messenger")]
-+		public const uint Messenger;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Meta_L")]
-+		public const uint Meta_L;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Meta_R")]
-+		public const uint Meta_R;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_MillSign")]
-+		public const uint MillSign;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ModeLock")]
-+		public const uint ModeLock;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Mode_switch")]
-+		public const uint Mode_switch;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_MonBrightnessDown")]
-+		public const uint MonBrightnessDown;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_MonBrightnessUp")]
-+		public const uint MonBrightnessUp;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_MouseKeys_Accel_Enable")]
-+		public const uint MouseKeys_Accel_Enable;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_MouseKeys_Enable")]
-+		public const uint MouseKeys_Enable;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Muhenkan")]
-+		public const uint Muhenkan;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Multi_key")]
-+		public const uint Multi_key;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_MultipleCandidate")]
-+		public const uint MultipleCandidate;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Music")]
-+		public const uint Music;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_MyComputer")]
-+		public const uint MyComputer;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_MySites")]
-+		public const uint MySites;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_N")]
-+		public const uint N;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Nacute")]
-+		public const uint Nacute;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_NairaSign")]
-+		public const uint NairaSign;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ncaron")]
-+		public const uint Ncaron;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ncedilla")]
-+		public const uint Ncedilla;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_New")]
-+		public const uint New;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_NewSheqelSign")]
-+		public const uint NewSheqelSign;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_News")]
-+		public const uint News;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Next")]
-+		public const uint Next;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Next_VMode")]
-+		public const uint Next_VMode;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Next_Virtual_Screen")]
-+		public const uint Next_Virtual_Screen;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ntilde")]
-+		public const uint Ntilde;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Num_Lock")]
-+		public const uint Num_Lock;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_O")]
-+		public const uint O;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_OE")]
-+		public const uint OE;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Oacute")]
-+		public const uint Oacute;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Obarred")]
-+		public const uint Obarred;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Obelowdot")]
-+		public const uint Obelowdot;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ocaron")]
-+		public const uint Ocaron;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ocircumflex")]
-+		public const uint Ocircumflex;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ocircumflexacute")]
-+		public const uint Ocircumflexacute;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ocircumflexbelowdot")]
-+		public const uint Ocircumflexbelowdot;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ocircumflexgrave")]
-+		public const uint Ocircumflexgrave;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ocircumflexhook")]
-+		public const uint Ocircumflexhook;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ocircumflextilde")]
-+		public const uint Ocircumflextilde;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Odiaeresis")]
-+		public const uint Odiaeresis;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Odoubleacute")]
-+		public const uint Odoubleacute;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_OfficeHome")]
-+		public const uint OfficeHome;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ograve")]
-+		public const uint Ograve;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ohook")]
-+		public const uint Ohook;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ohorn")]
-+		public const uint Ohorn;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ohornacute")]
-+		public const uint Ohornacute;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ohornbelowdot")]
-+		public const uint Ohornbelowdot;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ohorngrave")]
-+		public const uint Ohorngrave;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ohornhook")]
-+		public const uint Ohornhook;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ohorntilde")]
-+		public const uint Ohorntilde;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Omacron")]
-+		public const uint Omacron;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ooblique")]
-+		public const uint Ooblique;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Open")]
-+		public const uint Open;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_OpenURL")]
-+		public const uint OpenURL;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Option")]
-+		public const uint Option;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Oslash")]
-+		public const uint Oslash;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Otilde")]
-+		public const uint Otilde;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Overlay1_Enable")]
-+		public const uint Overlay1_Enable;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Overlay2_Enable")]
-+		public const uint Overlay2_Enable;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_P")]
-+		public const uint P;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pabovedot")]
-+		public const uint Pabovedot;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Page_Down")]
-+		public const uint Page_Down;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Page_Up")]
-+		public const uint Page_Up;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Paste")]
-+		public const uint Paste;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pause")]
-+		public const uint Pause;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_PesetaSign")]
-+		public const uint PesetaSign;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Phone")]
-+		public const uint Phone;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pictures")]
-+		public const uint Pictures;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Accelerate")]
-+		public const uint Pointer_Accelerate;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Button1")]
-+		public const uint Pointer_Button1;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Button2")]
-+		public const uint Pointer_Button2;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Button3")]
-+		public const uint Pointer_Button3;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Button4")]
-+		public const uint Pointer_Button4;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Button5")]
-+		public const uint Pointer_Button5;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Button_Dflt")]
-+		public const uint Pointer_Button_Dflt;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_DblClick1")]
-+		public const uint Pointer_DblClick1;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_DblClick2")]
-+		public const uint Pointer_DblClick2;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_DblClick3")]
-+		public const uint Pointer_DblClick3;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_DblClick4")]
-+		public const uint Pointer_DblClick4;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_DblClick5")]
-+		public const uint Pointer_DblClick5;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_DblClick_Dflt")]
-+		public const uint Pointer_DblClick_Dflt;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_DfltBtnNext")]
-+		public const uint Pointer_DfltBtnNext;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_DfltBtnPrev")]
-+		public const uint Pointer_DfltBtnPrev;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Down")]
-+		public const uint Pointer_Down;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_DownLeft")]
-+		public const uint Pointer_DownLeft;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_DownRight")]
-+		public const uint Pointer_DownRight;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Drag1")]
-+		public const uint Pointer_Drag1;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Drag2")]
-+		public const uint Pointer_Drag2;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Drag3")]
-+		public const uint Pointer_Drag3;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Drag4")]
-+		public const uint Pointer_Drag4;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Drag5")]
-+		public const uint Pointer_Drag5;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Drag_Dflt")]
-+		public const uint Pointer_Drag_Dflt;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_EnableKeys")]
-+		public const uint Pointer_EnableKeys;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Left")]
-+		public const uint Pointer_Left;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Right")]
-+		public const uint Pointer_Right;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_Up")]
-+		public const uint Pointer_Up;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_UpLeft")]
-+		public const uint Pointer_UpLeft;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Pointer_UpRight")]
-+		public const uint Pointer_UpRight;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_PowerDown")]
-+		public const uint PowerDown;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_PowerOff")]
-+		public const uint PowerOff;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Prev_VMode")]
-+		public const uint Prev_VMode;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Prev_Virtual_Screen")]
-+		public const uint Prev_Virtual_Screen;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_PreviousCandidate")]
-+		public const uint PreviousCandidate;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Print")]
-+		public const uint Print;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Prior")]
-+		public const uint Prior;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Q")]
-+		public const uint Q;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R")]
-+		public const uint R;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R1")]
-+		public const uint R1;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R10")]
-+		public const uint R10;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R11")]
-+		public const uint R11;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R12")]
-+		public const uint R12;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R13")]
-+		public const uint R13;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R14")]
-+		public const uint R14;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R15")]
-+		public const uint R15;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R2")]
-+		public const uint R2;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R3")]
-+		public const uint R3;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R4")]
-+		public const uint R4;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R5")]
-+		public const uint R5;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R6")]
-+		public const uint R6;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R7")]
-+		public const uint R7;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R8")]
-+		public const uint R8;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_R9")]
-+		public const uint R9;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Racute")]
-+		public const uint Racute;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Rcaron")]
-+		public const uint Rcaron;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Rcedilla")]
-+		public const uint Rcedilla;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Red")]
-+		public const uint Red;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Redo")]
-+		public const uint Redo;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Refresh")]
-+		public const uint Refresh;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Reload")]
-+		public const uint Reload;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_RepeatKeys_Enable")]
-+		public const uint RepeatKeys_Enable;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Reply")]
-+		public const uint Reply;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Return")]
-+		public const uint Return;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Right")]
-+		public const uint Right;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_RockerDown")]
-+		public const uint RockerDown;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_RockerEnter")]
-+		public const uint RockerEnter;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_RockerUp")]
-+		public const uint RockerUp;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Romaji")]
-+		public const uint Romaji;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_RotateWindows")]
-+		public const uint RotateWindows;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_RotationKB")]
-+		public const uint RotationKB;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_RotationPB")]
-+		public const uint RotationPB;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_RupeeSign")]
-+		public const uint RupeeSign;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_S")]
-+		public const uint S;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_SCHWA")]
-+		public const uint SCHWA;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sabovedot")]
-+		public const uint Sabovedot;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sacute")]
-+		public const uint Sacute;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Save")]
-+		public const uint Save;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Scaron")]
-+		public const uint Scaron;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Scedilla")]
-+		public const uint Scedilla;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Scircumflex")]
-+		public const uint Scircumflex;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ScreenSaver")]
-+		public const uint ScreenSaver;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ScrollClick")]
-+		public const uint ScrollClick;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ScrollDown")]
-+		public const uint ScrollDown;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ScrollUp")]
-+		public const uint ScrollUp;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Scroll_Lock")]
-+		public const uint Scroll_Lock;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Search")]
-+		public const uint Search;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Select")]
-+		public const uint Select;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_SelectButton")]
-+		public const uint SelectButton;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Send")]
-+		public const uint Send;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Serbian_DJE")]
-+		public const uint Serbian_DJE;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Serbian_DZE")]
-+		public const uint Serbian_DZE;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Serbian_JE")]
-+		public const uint Serbian_JE;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Serbian_LJE")]
-+		public const uint Serbian_LJE;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Serbian_NJE")]
-+		public const uint Serbian_NJE;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Serbian_TSHE")]
-+		public const uint Serbian_TSHE;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Serbian_dje")]
-+		public const uint Serbian_dje;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Serbian_dze")]
-+		public const uint Serbian_dze;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Serbian_je")]
-+		public const uint Serbian_je;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Serbian_lje")]
-+		public const uint Serbian_lje;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Serbian_nje")]
-+		public const uint Serbian_nje;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Serbian_tshe")]
-+		public const uint Serbian_tshe;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Shift_L")]
-+		public const uint Shift_L;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Shift_Lock")]
-+		public const uint Shift_Lock;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Shift_R")]
-+		public const uint Shift_R;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Shop")]
-+		public const uint Shop;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_SingleCandidate")]
-+		public const uint SingleCandidate;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_a")]
-+		public const uint Sinh_a;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_aa")]
-+		public const uint Sinh_aa;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_aa2")]
-+		public const uint Sinh_aa2;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ae")]
-+		public const uint Sinh_ae;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ae2")]
-+		public const uint Sinh_ae2;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_aee")]
-+		public const uint Sinh_aee;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_aee2")]
-+		public const uint Sinh_aee2;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ai")]
-+		public const uint Sinh_ai;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ai2")]
-+		public const uint Sinh_ai2;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_al")]
-+		public const uint Sinh_al;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_au")]
-+		public const uint Sinh_au;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_au2")]
-+		public const uint Sinh_au2;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ba")]
-+		public const uint Sinh_ba;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_bha")]
-+		public const uint Sinh_bha;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ca")]
-+		public const uint Sinh_ca;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_cha")]
-+		public const uint Sinh_cha;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_dda")]
-+		public const uint Sinh_dda;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ddha")]
-+		public const uint Sinh_ddha;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_dha")]
-+		public const uint Sinh_dha;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_dhha")]
-+		public const uint Sinh_dhha;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_e")]
-+		public const uint Sinh_e;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_e2")]
-+		public const uint Sinh_e2;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ee")]
-+		public const uint Sinh_ee;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ee2")]
-+		public const uint Sinh_ee2;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_fa")]
-+		public const uint Sinh_fa;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ga")]
-+		public const uint Sinh_ga;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_gha")]
-+		public const uint Sinh_gha;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_h2")]
-+		public const uint Sinh_h2;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ha")]
-+		public const uint Sinh_ha;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_i")]
-+		public const uint Sinh_i;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_i2")]
-+		public const uint Sinh_i2;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ii")]
-+		public const uint Sinh_ii;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ii2")]
-+		public const uint Sinh_ii2;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ja")]
-+		public const uint Sinh_ja;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_jha")]
-+		public const uint Sinh_jha;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_jnya")]
-+		public const uint Sinh_jnya;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ka")]
-+		public const uint Sinh_ka;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_kha")]
-+		public const uint Sinh_kha;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_kunddaliya")]
-+		public const uint Sinh_kunddaliya;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_la")]
-+		public const uint Sinh_la;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_lla")]
-+		public const uint Sinh_lla;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_lu")]
-+		public const uint Sinh_lu;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_lu2")]
-+		public const uint Sinh_lu2;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_luu")]
-+		public const uint Sinh_luu;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_luu2")]
-+		public const uint Sinh_luu2;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ma")]
-+		public const uint Sinh_ma;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_mba")]
-+		public const uint Sinh_mba;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_na")]
-+		public const uint Sinh_na;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ndda")]
-+		public const uint Sinh_ndda;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ndha")]
-+		public const uint Sinh_ndha;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ng")]
-+		public const uint Sinh_ng;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ng2")]
-+		public const uint Sinh_ng2;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_nga")]
-+		public const uint Sinh_nga;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_nja")]
-+		public const uint Sinh_nja;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_nna")]
-+		public const uint Sinh_nna;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_nya")]
-+		public const uint Sinh_nya;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_o")]
-+		public const uint Sinh_o;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_o2")]
-+		public const uint Sinh_o2;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_oo")]
-+		public const uint Sinh_oo;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_oo2")]
-+		public const uint Sinh_oo2;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_pa")]
-+		public const uint Sinh_pa;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_pha")]
-+		public const uint Sinh_pha;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ra")]
-+		public const uint Sinh_ra;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ri")]
-+		public const uint Sinh_ri;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_rii")]
-+		public const uint Sinh_rii;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ru2")]
-+		public const uint Sinh_ru2;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ruu2")]
-+		public const uint Sinh_ruu2;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_sa")]
-+		public const uint Sinh_sa;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_sha")]
-+		public const uint Sinh_sha;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ssha")]
-+		public const uint Sinh_ssha;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_tha")]
-+		public const uint Sinh_tha;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_thha")]
-+		public const uint Sinh_thha;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_tta")]
-+		public const uint Sinh_tta;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ttha")]
-+		public const uint Sinh_ttha;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_u")]
-+		public const uint Sinh_u;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_u2")]
-+		public const uint Sinh_u2;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_uu")]
-+		public const uint Sinh_uu;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_uu2")]
-+		public const uint Sinh_uu2;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_va")]
-+		public const uint Sinh_va;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sinh_ya")]
-+		public const uint Sinh_ya;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sleep")]
-+		public const uint Sleep;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_SlowKeys_Enable")]
-+		public const uint SlowKeys_Enable;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Spell")]
-+		public const uint Spell;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_SplitScreen")]
-+		public const uint SplitScreen;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Standby")]
-+		public const uint Standby;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Start")]
-+		public const uint Start;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_StickyKeys_Enable")]
-+		public const uint StickyKeys_Enable;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Stop")]
-+		public const uint Stop;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Subtitle")]
-+		public const uint Subtitle;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Super_L")]
-+		public const uint Super_L;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Super_R")]
-+		public const uint Super_R;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Support")]
-+		public const uint Support;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Suspend")]
-+		public const uint Suspend;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Switch_VT_1")]
-+		public const uint Switch_VT_1;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Switch_VT_10")]
-+		public const uint Switch_VT_10;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Switch_VT_11")]
-+		public const uint Switch_VT_11;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Switch_VT_12")]
-+		public const uint Switch_VT_12;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Switch_VT_2")]
-+		public const uint Switch_VT_2;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Switch_VT_3")]
-+		public const uint Switch_VT_3;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Switch_VT_4")]
-+		public const uint Switch_VT_4;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Switch_VT_5")]
-+		public const uint Switch_VT_5;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Switch_VT_6")]
-+		public const uint Switch_VT_6;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Switch_VT_7")]
-+		public const uint Switch_VT_7;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Switch_VT_8")]
-+		public const uint Switch_VT_8;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Switch_VT_9")]
-+		public const uint Switch_VT_9;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Sys_Req")]
-+		public const uint Sys_Req;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_T")]
-+		public const uint T;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_THORN")]
-+		public const uint THORN;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Tab")]
-+		public const uint Tab;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Tabovedot")]
-+		public const uint Tabovedot;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_TaskPane")]
-+		public const uint TaskPane;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Tcaron")]
-+		public const uint Tcaron;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Tcedilla")]
-+		public const uint Tcedilla;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Terminal")]
-+		public const uint Terminal;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Terminate_Server")]
-+		public const uint Terminate_Server;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_baht")]
-+		public const uint Thai_baht;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_bobaimai")]
-+		public const uint Thai_bobaimai;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_chochan")]
-+		public const uint Thai_chochan;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_chochang")]
-+		public const uint Thai_chochang;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_choching")]
-+		public const uint Thai_choching;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_chochoe")]
-+		public const uint Thai_chochoe;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_dochada")]
-+		public const uint Thai_dochada;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_dodek")]
-+		public const uint Thai_dodek;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_fofa")]
-+		public const uint Thai_fofa;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_fofan")]
-+		public const uint Thai_fofan;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_hohip")]
-+		public const uint Thai_hohip;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_honokhuk")]
-+		public const uint Thai_honokhuk;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_khokhai")]
-+		public const uint Thai_khokhai;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_khokhon")]
-+		public const uint Thai_khokhon;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_khokhuat")]
-+		public const uint Thai_khokhuat;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_khokhwai")]
-+		public const uint Thai_khokhwai;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_khorakhang")]
-+		public const uint Thai_khorakhang;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_kokai")]
-+		public const uint Thai_kokai;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_lakkhangyao")]
-+		public const uint Thai_lakkhangyao;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_lekchet")]
-+		public const uint Thai_lekchet;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_lekha")]
-+		public const uint Thai_lekha;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_lekhok")]
-+		public const uint Thai_lekhok;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_lekkao")]
-+		public const uint Thai_lekkao;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_leknung")]
-+		public const uint Thai_leknung;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_lekpaet")]
-+		public const uint Thai_lekpaet;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_leksam")]
-+		public const uint Thai_leksam;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_leksi")]
-+		public const uint Thai_leksi;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_leksong")]
-+		public const uint Thai_leksong;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_leksun")]
-+		public const uint Thai_leksun;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_lochula")]
-+		public const uint Thai_lochula;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_loling")]
-+		public const uint Thai_loling;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_lu")]
-+		public const uint Thai_lu;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_maichattawa")]
-+		public const uint Thai_maichattawa;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_maiek")]
-+		public const uint Thai_maiek;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_maihanakat")]
-+		public const uint Thai_maihanakat;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_maihanakat_maitho")]
-+		public const uint Thai_maihanakat_maitho;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_maitaikhu")]
-+		public const uint Thai_maitaikhu;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_maitho")]
-+		public const uint Thai_maitho;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_maitri")]
-+		public const uint Thai_maitri;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_maiyamok")]
-+		public const uint Thai_maiyamok;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_moma")]
-+		public const uint Thai_moma;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_ngongu")]
-+		public const uint Thai_ngongu;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_nikhahit")]
-+		public const uint Thai_nikhahit;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_nonen")]
-+		public const uint Thai_nonen;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_nonu")]
-+		public const uint Thai_nonu;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_oang")]
-+		public const uint Thai_oang;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_paiyannoi")]
-+		public const uint Thai_paiyannoi;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_phinthu")]
-+		public const uint Thai_phinthu;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_phophan")]
-+		public const uint Thai_phophan;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_phophung")]
-+		public const uint Thai_phophung;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_phosamphao")]
-+		public const uint Thai_phosamphao;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_popla")]
-+		public const uint Thai_popla;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_rorua")]
-+		public const uint Thai_rorua;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_ru")]
-+		public const uint Thai_ru;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_saraa")]
-+		public const uint Thai_saraa;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_saraaa")]
-+		public const uint Thai_saraaa;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_saraae")]
-+		public const uint Thai_saraae;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_saraaimaimalai")]
-+		public const uint Thai_saraaimaimalai;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_saraaimaimuan")]
-+		public const uint Thai_saraaimaimuan;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_saraam")]
-+		public const uint Thai_saraam;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_sarae")]
-+		public const uint Thai_sarae;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_sarai")]
-+		public const uint Thai_sarai;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_saraii")]
-+		public const uint Thai_saraii;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_sarao")]
-+		public const uint Thai_sarao;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_sarau")]
-+		public const uint Thai_sarau;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_saraue")]
-+		public const uint Thai_saraue;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_sarauee")]
-+		public const uint Thai_sarauee;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_sarauu")]
-+		public const uint Thai_sarauu;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_sorusi")]
-+		public const uint Thai_sorusi;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_sosala")]
-+		public const uint Thai_sosala;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_soso")]
-+		public const uint Thai_soso;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_sosua")]
-+		public const uint Thai_sosua;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_thanthakhat")]
-+		public const uint Thai_thanthakhat;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_thonangmontho")]
-+		public const uint Thai_thonangmontho;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_thophuthao")]
-+		public const uint Thai_thophuthao;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_thothahan")]
-+		public const uint Thai_thothahan;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_thothan")]
-+		public const uint Thai_thothan;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_thothong")]
-+		public const uint Thai_thothong;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_thothung")]
-+		public const uint Thai_thothung;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_topatak")]
-+		public const uint Thai_topatak;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_totao")]
-+		public const uint Thai_totao;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_wowaen")]
-+		public const uint Thai_wowaen;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_yoyak")]
-+		public const uint Thai_yoyak;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thai_yoying")]
-+		public const uint Thai_yoying;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Thorn")]
-+		public const uint Thorn;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Time")]
-+		public const uint Time;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ToDoList")]
-+		public const uint ToDoList;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Tools")]
-+		public const uint Tools;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_TopMenu")]
-+		public const uint TopMenu;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_TouchpadOff")]
-+		public const uint TouchpadOff;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_TouchpadOn")]
-+		public const uint TouchpadOn;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_TouchpadToggle")]
-+		public const uint TouchpadToggle;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Touroku")]
-+		public const uint Touroku;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Travel")]
-+		public const uint Travel;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Tslash")]
-+		public const uint Tslash;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_U")]
-+		public const uint U;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_UWB")]
-+		public const uint UWB;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Uacute")]
-+		public const uint Uacute;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ubelowdot")]
-+		public const uint Ubelowdot;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ubreve")]
-+		public const uint Ubreve;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ucircumflex")]
-+		public const uint Ucircumflex;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Udiaeresis")]
-+		public const uint Udiaeresis;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Udoubleacute")]
-+		public const uint Udoubleacute;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ugrave")]
-+		public const uint Ugrave;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Uhook")]
-+		public const uint Uhook;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Uhorn")]
-+		public const uint Uhorn;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Uhornacute")]
-+		public const uint Uhornacute;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Uhornbelowdot")]
-+		public const uint Uhornbelowdot;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Uhorngrave")]
-+		public const uint Uhorngrave;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Uhornhook")]
-+		public const uint Uhornhook;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Uhorntilde")]
-+		public const uint Uhorntilde;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ukrainian_GHE_WITH_UPTURN")]
-+		public const uint Ukrainian_GHE_WITH_UPTURN;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ukrainian_I")]
-+		public const uint Ukrainian_I;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ukrainian_IE")]
-+		public const uint Ukrainian_IE;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ukrainian_YI")]
-+		public const uint Ukrainian_YI;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ukrainian_ghe_with_upturn")]
-+		public const uint Ukrainian_ghe_with_upturn;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ukrainian_i")]
-+		public const uint Ukrainian_i;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ukrainian_ie")]
-+		public const uint Ukrainian_ie;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ukrainian_yi")]
-+		public const uint Ukrainian_yi;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ukranian_I")]
-+		public const uint Ukranian_I;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ukranian_JE")]
-+		public const uint Ukranian_JE;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ukranian_YI")]
-+		public const uint Ukranian_YI;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ukranian_i")]
-+		public const uint Ukranian_i;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ukranian_je")]
-+		public const uint Ukranian_je;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ukranian_yi")]
-+		public const uint Ukranian_yi;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Umacron")]
-+		public const uint Umacron;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Undo")]
-+		public const uint Undo;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ungrab")]
-+		public const uint Ungrab;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Uogonek")]
-+		public const uint Uogonek;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Up")]
-+		public const uint Up;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Uring")]
-+		public const uint Uring;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_User1KB")]
-+		public const uint User1KB;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_User2KB")]
-+		public const uint User2KB;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_UserPB")]
-+		public const uint UserPB;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Utilde")]
-+		public const uint Utilde;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_V")]
-+		public const uint V;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_VendorHome")]
-+		public const uint VendorHome;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Video")]
-+		public const uint Video;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_View")]
-+		public const uint View;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_VoidSymbol")]
-+		public const uint VoidSymbol;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_W")]
-+		public const uint W;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_WLAN")]
-+		public const uint WLAN;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_WWW")]
-+		public const uint WWW;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Wacute")]
-+		public const uint Wacute;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_WakeUp")]
-+		public const uint WakeUp;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Wcircumflex")]
-+		public const uint Wcircumflex;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Wdiaeresis")]
-+		public const uint Wdiaeresis;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_WebCam")]
-+		public const uint WebCam;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Wgrave")]
-+		public const uint Wgrave;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_WheelButton")]
-+		public const uint WheelButton;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_WindowClear")]
-+		public const uint WindowClear;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_WonSign")]
-+		public const uint WonSign;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Word")]
-+		public const uint Word;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_X")]
-+		public const uint X;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Xabovedot")]
-+		public const uint Xabovedot;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Xfer")]
-+		public const uint Xfer;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Y")]
-+		public const uint Y;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Yacute")]
-+		public const uint Yacute;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ybelowdot")]
-+		public const uint Ybelowdot;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ycircumflex")]
-+		public const uint Ycircumflex;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ydiaeresis")]
-+		public const uint Ydiaeresis;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Yellow")]
-+		public const uint Yellow;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ygrave")]
-+		public const uint Ygrave;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Yhook")]
-+		public const uint Yhook;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Ytilde")]
-+		public const uint Ytilde;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Z")]
-+		public const uint Z;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Zabovedot")]
-+		public const uint Zabovedot;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Zacute")]
-+		public const uint Zacute;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Zcaron")]
-+		public const uint Zcaron;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Zen_Koho")]
-+		public const uint Zen_Koho;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Zenkaku")]
-+		public const uint Zenkaku;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Zenkaku_Hankaku")]
-+		public const uint Zenkaku_Hankaku;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ZoomIn")]
-+		public const uint ZoomIn;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ZoomOut")]
-+		public const uint ZoomOut;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_Zstroke")]
-+		public const uint Zstroke;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_a")]
-+		public const uint a;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_aacute")]
-+		public const uint aacute;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_abelowdot")]
-+		public const uint abelowdot;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_abovedot")]
-+		public const uint abovedot;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_abreve")]
-+		public const uint abreve;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_abreveacute")]
-+		public const uint abreveacute;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_abrevebelowdot")]
-+		public const uint abrevebelowdot;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_abrevegrave")]
-+		public const uint abrevegrave;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_abrevehook")]
-+		public const uint abrevehook;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_abrevetilde")]
-+		public const uint abrevetilde;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_acircumflex")]
-+		public const uint acircumflex;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_acircumflexacute")]
-+		public const uint acircumflexacute;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_acircumflexbelowdot")]
-+		public const uint acircumflexbelowdot;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_acircumflexgrave")]
-+		public const uint acircumflexgrave;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_acircumflexhook")]
-+		public const uint acircumflexhook;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_acircumflextilde")]
-+		public const uint acircumflextilde;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_acute")]
-+		public const uint acute;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_adiaeresis")]
-+		public const uint adiaeresis;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ae")]
-+		public const uint ae;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_agrave")]
-+		public const uint agrave;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ahook")]
-+		public const uint ahook;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_amacron")]
-+		public const uint amacron;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ampersand")]
-+		public const uint ampersand;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_aogonek")]
-+		public const uint aogonek;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_apostrophe")]
-+		public const uint apostrophe;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_approxeq")]
-+		public const uint approxeq;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_approximate")]
-+		public const uint approximate;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_aring")]
-+		public const uint aring;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_asciicircum")]
-+		public const uint asciicircum;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_asciitilde")]
-+		public const uint asciitilde;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_asterisk")]
-+		public const uint asterisk;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_at")]
-+		public const uint at;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_atilde")]
-+		public const uint atilde;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_b")]
-+		public const uint b;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_babovedot")]
-+		public const uint babovedot;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_backslash")]
-+		public const uint backslash;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ballotcross")]
-+		public const uint ballotcross;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_bar")]
-+		public const uint bar;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_because")]
-+		public const uint because;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_blank")]
-+		public const uint blank;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_botintegral")]
-+		public const uint botintegral;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_botleftparens")]
-+		public const uint botleftparens;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_botleftsqbracket")]
-+		public const uint botleftsqbracket;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_botleftsummation")]
-+		public const uint botleftsummation;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_botrightparens")]
-+		public const uint botrightparens;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_botrightsqbracket")]
-+		public const uint botrightsqbracket;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_botrightsummation")]
-+		public const uint botrightsummation;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_bott")]
-+		public const uint bott;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_botvertsummationconnector")]
-+		public const uint botvertsummationconnector;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braceleft")]
-+		public const uint braceleft;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braceright")]
-+		public const uint braceright;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_bracketleft")]
-+		public const uint bracketleft;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_bracketright")]
-+		public const uint bracketright;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_blank")]
-+		public const uint braille_blank;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dot_1")]
-+		public const uint braille_dot_1;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dot_10")]
-+		public const uint braille_dot_10;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dot_2")]
-+		public const uint braille_dot_2;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dot_3")]
-+		public const uint braille_dot_3;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dot_4")]
-+		public const uint braille_dot_4;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dot_5")]
-+		public const uint braille_dot_5;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dot_6")]
-+		public const uint braille_dot_6;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dot_7")]
-+		public const uint braille_dot_7;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dot_8")]
-+		public const uint braille_dot_8;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dot_9")]
-+		public const uint braille_dot_9;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1")]
-+		public const uint braille_dots_1;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12")]
-+		public const uint braille_dots_12;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_123")]
-+		public const uint braille_dots_123;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1234")]
-+		public const uint braille_dots_1234;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12345")]
-+		public const uint braille_dots_12345;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_123456")]
-+		public const uint braille_dots_123456;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1234567")]
-+		public const uint braille_dots_1234567;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12345678")]
-+		public const uint braille_dots_12345678;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1234568")]
-+		public const uint braille_dots_1234568;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_123457")]
-+		public const uint braille_dots_123457;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1234578")]
-+		public const uint braille_dots_1234578;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_123458")]
-+		public const uint braille_dots_123458;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12346")]
-+		public const uint braille_dots_12346;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_123467")]
-+		public const uint braille_dots_123467;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1234678")]
-+		public const uint braille_dots_1234678;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_123468")]
-+		public const uint braille_dots_123468;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12347")]
-+		public const uint braille_dots_12347;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_123478")]
-+		public const uint braille_dots_123478;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12348")]
-+		public const uint braille_dots_12348;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1235")]
-+		public const uint braille_dots_1235;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12356")]
-+		public const uint braille_dots_12356;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_123567")]
-+		public const uint braille_dots_123567;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1235678")]
-+		public const uint braille_dots_1235678;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_123568")]
-+		public const uint braille_dots_123568;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12357")]
-+		public const uint braille_dots_12357;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_123578")]
-+		public const uint braille_dots_123578;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12358")]
-+		public const uint braille_dots_12358;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1236")]
-+		public const uint braille_dots_1236;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12367")]
-+		public const uint braille_dots_12367;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_123678")]
-+		public const uint braille_dots_123678;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12368")]
-+		public const uint braille_dots_12368;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1237")]
-+		public const uint braille_dots_1237;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12378")]
-+		public const uint braille_dots_12378;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1238")]
-+		public const uint braille_dots_1238;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_124")]
-+		public const uint braille_dots_124;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1245")]
-+		public const uint braille_dots_1245;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12456")]
-+		public const uint braille_dots_12456;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_124567")]
-+		public const uint braille_dots_124567;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1245678")]
-+		public const uint braille_dots_1245678;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_124568")]
-+		public const uint braille_dots_124568;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12457")]
-+		public const uint braille_dots_12457;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_124578")]
-+		public const uint braille_dots_124578;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12458")]
-+		public const uint braille_dots_12458;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1246")]
-+		public const uint braille_dots_1246;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12467")]
-+		public const uint braille_dots_12467;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_124678")]
-+		public const uint braille_dots_124678;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12468")]
-+		public const uint braille_dots_12468;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1247")]
-+		public const uint braille_dots_1247;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12478")]
-+		public const uint braille_dots_12478;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1248")]
-+		public const uint braille_dots_1248;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_125")]
-+		public const uint braille_dots_125;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1256")]
-+		public const uint braille_dots_1256;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12567")]
-+		public const uint braille_dots_12567;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_125678")]
-+		public const uint braille_dots_125678;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12568")]
-+		public const uint braille_dots_12568;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1257")]
-+		public const uint braille_dots_1257;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12578")]
-+		public const uint braille_dots_12578;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1258")]
-+		public const uint braille_dots_1258;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_126")]
-+		public const uint braille_dots_126;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1267")]
-+		public const uint braille_dots_1267;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_12678")]
-+		public const uint braille_dots_12678;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1268")]
-+		public const uint braille_dots_1268;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_127")]
-+		public const uint braille_dots_127;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1278")]
-+		public const uint braille_dots_1278;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_128")]
-+		public const uint braille_dots_128;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_13")]
-+		public const uint braille_dots_13;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_134")]
-+		public const uint braille_dots_134;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1345")]
-+		public const uint braille_dots_1345;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_13456")]
-+		public const uint braille_dots_13456;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_134567")]
-+		public const uint braille_dots_134567;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1345678")]
-+		public const uint braille_dots_1345678;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_134568")]
-+		public const uint braille_dots_134568;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_13457")]
-+		public const uint braille_dots_13457;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_134578")]
-+		public const uint braille_dots_134578;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_13458")]
-+		public const uint braille_dots_13458;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1346")]
-+		public const uint braille_dots_1346;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_13467")]
-+		public const uint braille_dots_13467;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_134678")]
-+		public const uint braille_dots_134678;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_13468")]
-+		public const uint braille_dots_13468;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1347")]
-+		public const uint braille_dots_1347;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_13478")]
-+		public const uint braille_dots_13478;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1348")]
-+		public const uint braille_dots_1348;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_135")]
-+		public const uint braille_dots_135;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1356")]
-+		public const uint braille_dots_1356;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_13567")]
-+		public const uint braille_dots_13567;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_135678")]
-+		public const uint braille_dots_135678;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_13568")]
-+		public const uint braille_dots_13568;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1357")]
-+		public const uint braille_dots_1357;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_13578")]
-+		public const uint braille_dots_13578;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1358")]
-+		public const uint braille_dots_1358;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_136")]
-+		public const uint braille_dots_136;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1367")]
-+		public const uint braille_dots_1367;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_13678")]
-+		public const uint braille_dots_13678;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1368")]
-+		public const uint braille_dots_1368;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_137")]
-+		public const uint braille_dots_137;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1378")]
-+		public const uint braille_dots_1378;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_138")]
-+		public const uint braille_dots_138;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_14")]
-+		public const uint braille_dots_14;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_145")]
-+		public const uint braille_dots_145;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1456")]
-+		public const uint braille_dots_1456;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_14567")]
-+		public const uint braille_dots_14567;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_145678")]
-+		public const uint braille_dots_145678;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_14568")]
-+		public const uint braille_dots_14568;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1457")]
-+		public const uint braille_dots_1457;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_14578")]
-+		public const uint braille_dots_14578;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1458")]
-+		public const uint braille_dots_1458;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_146")]
-+		public const uint braille_dots_146;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1467")]
-+		public const uint braille_dots_1467;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_14678")]
-+		public const uint braille_dots_14678;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1468")]
-+		public const uint braille_dots_1468;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_147")]
-+		public const uint braille_dots_147;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1478")]
-+		public const uint braille_dots_1478;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_148")]
-+		public const uint braille_dots_148;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_15")]
-+		public const uint braille_dots_15;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_156")]
-+		public const uint braille_dots_156;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1567")]
-+		public const uint braille_dots_1567;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_15678")]
-+		public const uint braille_dots_15678;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1568")]
-+		public const uint braille_dots_1568;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_157")]
-+		public const uint braille_dots_157;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1578")]
-+		public const uint braille_dots_1578;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_158")]
-+		public const uint braille_dots_158;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_16")]
-+		public const uint braille_dots_16;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_167")]
-+		public const uint braille_dots_167;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_1678")]
-+		public const uint braille_dots_1678;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_168")]
-+		public const uint braille_dots_168;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_17")]
-+		public const uint braille_dots_17;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_178")]
-+		public const uint braille_dots_178;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_18")]
-+		public const uint braille_dots_18;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2")]
-+		public const uint braille_dots_2;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_23")]
-+		public const uint braille_dots_23;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_234")]
-+		public const uint braille_dots_234;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2345")]
-+		public const uint braille_dots_2345;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_23456")]
-+		public const uint braille_dots_23456;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_234567")]
-+		public const uint braille_dots_234567;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2345678")]
-+		public const uint braille_dots_2345678;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_234568")]
-+		public const uint braille_dots_234568;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_23457")]
-+		public const uint braille_dots_23457;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_234578")]
-+		public const uint braille_dots_234578;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_23458")]
-+		public const uint braille_dots_23458;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2346")]
-+		public const uint braille_dots_2346;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_23467")]
-+		public const uint braille_dots_23467;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_234678")]
-+		public const uint braille_dots_234678;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_23468")]
-+		public const uint braille_dots_23468;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2347")]
-+		public const uint braille_dots_2347;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_23478")]
-+		public const uint braille_dots_23478;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2348")]
-+		public const uint braille_dots_2348;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_235")]
-+		public const uint braille_dots_235;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2356")]
-+		public const uint braille_dots_2356;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_23567")]
-+		public const uint braille_dots_23567;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_235678")]
-+		public const uint braille_dots_235678;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_23568")]
-+		public const uint braille_dots_23568;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2357")]
-+		public const uint braille_dots_2357;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_23578")]
-+		public const uint braille_dots_23578;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2358")]
-+		public const uint braille_dots_2358;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_236")]
-+		public const uint braille_dots_236;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2367")]
-+		public const uint braille_dots_2367;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_23678")]
-+		public const uint braille_dots_23678;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2368")]
-+		public const uint braille_dots_2368;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_237")]
-+		public const uint braille_dots_237;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2378")]
-+		public const uint braille_dots_2378;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_238")]
-+		public const uint braille_dots_238;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_24")]
-+		public const uint braille_dots_24;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_245")]
-+		public const uint braille_dots_245;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2456")]
-+		public const uint braille_dots_2456;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_24567")]
-+		public const uint braille_dots_24567;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_245678")]
-+		public const uint braille_dots_245678;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_24568")]
-+		public const uint braille_dots_24568;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2457")]
-+		public const uint braille_dots_2457;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_24578")]
-+		public const uint braille_dots_24578;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2458")]
-+		public const uint braille_dots_2458;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_246")]
-+		public const uint braille_dots_246;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2467")]
-+		public const uint braille_dots_2467;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_24678")]
-+		public const uint braille_dots_24678;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2468")]
-+		public const uint braille_dots_2468;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_247")]
-+		public const uint braille_dots_247;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2478")]
-+		public const uint braille_dots_2478;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_248")]
-+		public const uint braille_dots_248;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_25")]
-+		public const uint braille_dots_25;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_256")]
-+		public const uint braille_dots_256;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2567")]
-+		public const uint braille_dots_2567;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_25678")]
-+		public const uint braille_dots_25678;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2568")]
-+		public const uint braille_dots_2568;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_257")]
-+		public const uint braille_dots_257;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2578")]
-+		public const uint braille_dots_2578;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_258")]
-+		public const uint braille_dots_258;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_26")]
-+		public const uint braille_dots_26;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_267")]
-+		public const uint braille_dots_267;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_2678")]
-+		public const uint braille_dots_2678;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_268")]
-+		public const uint braille_dots_268;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_27")]
-+		public const uint braille_dots_27;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_278")]
-+		public const uint braille_dots_278;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_28")]
-+		public const uint braille_dots_28;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_3")]
-+		public const uint braille_dots_3;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_34")]
-+		public const uint braille_dots_34;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_345")]
-+		public const uint braille_dots_345;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_3456")]
-+		public const uint braille_dots_3456;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_34567")]
-+		public const uint braille_dots_34567;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_345678")]
-+		public const uint braille_dots_345678;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_34568")]
-+		public const uint braille_dots_34568;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_3457")]
-+		public const uint braille_dots_3457;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_34578")]
-+		public const uint braille_dots_34578;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_3458")]
-+		public const uint braille_dots_3458;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_346")]
-+		public const uint braille_dots_346;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_3467")]
-+		public const uint braille_dots_3467;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_34678")]
-+		public const uint braille_dots_34678;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_3468")]
-+		public const uint braille_dots_3468;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_347")]
-+		public const uint braille_dots_347;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_3478")]
-+		public const uint braille_dots_3478;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_348")]
-+		public const uint braille_dots_348;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_35")]
-+		public const uint braille_dots_35;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_356")]
-+		public const uint braille_dots_356;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_3567")]
-+		public const uint braille_dots_3567;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_35678")]
-+		public const uint braille_dots_35678;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_3568")]
-+		public const uint braille_dots_3568;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_357")]
-+		public const uint braille_dots_357;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_3578")]
-+		public const uint braille_dots_3578;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_358")]
-+		public const uint braille_dots_358;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_36")]
-+		public const uint braille_dots_36;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_367")]
-+		public const uint braille_dots_367;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_3678")]
-+		public const uint braille_dots_3678;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_368")]
-+		public const uint braille_dots_368;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_37")]
-+		public const uint braille_dots_37;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_378")]
-+		public const uint braille_dots_378;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_38")]
-+		public const uint braille_dots_38;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_4")]
-+		public const uint braille_dots_4;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_45")]
-+		public const uint braille_dots_45;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_456")]
-+		public const uint braille_dots_456;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_4567")]
-+		public const uint braille_dots_4567;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_45678")]
-+		public const uint braille_dots_45678;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_4568")]
-+		public const uint braille_dots_4568;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_457")]
-+		public const uint braille_dots_457;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_4578")]
-+		public const uint braille_dots_4578;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_458")]
-+		public const uint braille_dots_458;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_46")]
-+		public const uint braille_dots_46;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_467")]
-+		public const uint braille_dots_467;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_4678")]
-+		public const uint braille_dots_4678;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_468")]
-+		public const uint braille_dots_468;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_47")]
-+		public const uint braille_dots_47;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_478")]
-+		public const uint braille_dots_478;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_48")]
-+		public const uint braille_dots_48;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_5")]
-+		public const uint braille_dots_5;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_56")]
-+		public const uint braille_dots_56;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_567")]
-+		public const uint braille_dots_567;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_5678")]
-+		public const uint braille_dots_5678;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_568")]
-+		public const uint braille_dots_568;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_57")]
-+		public const uint braille_dots_57;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_578")]
-+		public const uint braille_dots_578;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_58")]
-+		public const uint braille_dots_58;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_6")]
-+		public const uint braille_dots_6;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_67")]
-+		public const uint braille_dots_67;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_678")]
-+		public const uint braille_dots_678;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_68")]
-+		public const uint braille_dots_68;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_7")]
-+		public const uint braille_dots_7;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_78")]
-+		public const uint braille_dots_78;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_braille_dots_8")]
-+		public const uint braille_dots_8;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_breve")]
-+		public const uint breve;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_brokenbar")]
-+		public const uint brokenbar;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_c")]
-+		public const uint c;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_c_h")]
-+		public const uint c_h;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_cabovedot")]
-+		public const uint cabovedot;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_cacute")]
-+		public const uint cacute;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_careof")]
-+		public const uint careof;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_caret")]
-+		public const uint caret;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_caron")]
-+		public const uint caron;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ccaron")]
-+		public const uint ccaron;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ccedilla")]
-+		public const uint ccedilla;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ccircumflex")]
-+		public const uint ccircumflex;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_cedilla")]
-+		public const uint cedilla;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_cent")]
-+		public const uint cent;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ch")]
-+		public const uint ch;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_checkerboard")]
-+		public const uint checkerboard;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_checkmark")]
-+		public const uint checkmark;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_circle")]
-+		public const uint circle;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_club")]
-+		public const uint club;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_colon")]
-+		public const uint colon;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_comma")]
-+		public const uint comma;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_containsas")]
-+		public const uint containsas;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_copyright")]
-+		public const uint copyright;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_cr")]
-+		public const uint cr;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_crossinglines")]
-+		public const uint crossinglines;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_cuberoot")]
-+		public const uint cuberoot;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_currency")]
-+		public const uint currency;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_cursor")]
-+		public const uint cursor;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_d")]
-+		public const uint d;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dabovedot")]
-+		public const uint dabovedot;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dagger")]
-+		public const uint dagger;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dcaron")]
-+		public const uint dcaron;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_A")]
-+		public const uint dead_A;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_E")]
-+		public const uint dead_E;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_I")]
-+		public const uint dead_I;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_O")]
-+		public const uint dead_O;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_U")]
-+		public const uint dead_U;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_a")]
-+		public const uint dead_a;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_abovecomma")]
-+		public const uint dead_abovecomma;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_abovedot")]
-+		public const uint dead_abovedot;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_abovereversedcomma")]
-+		public const uint dead_abovereversedcomma;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_abovering")]
-+		public const uint dead_abovering;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_aboveverticalline")]
-+		public const uint dead_aboveverticalline;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_acute")]
-+		public const uint dead_acute;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_belowbreve")]
-+		public const uint dead_belowbreve;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_belowcircumflex")]
-+		public const uint dead_belowcircumflex;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_belowcomma")]
-+		public const uint dead_belowcomma;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_belowdiaeresis")]
-+		public const uint dead_belowdiaeresis;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_belowdot")]
-+		public const uint dead_belowdot;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_belowmacron")]
-+		public const uint dead_belowmacron;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_belowring")]
-+		public const uint dead_belowring;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_belowtilde")]
-+		public const uint dead_belowtilde;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_belowverticalline")]
-+		public const uint dead_belowverticalline;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_breve")]
-+		public const uint dead_breve;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_capital_schwa")]
-+		public const uint dead_capital_schwa;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_caron")]
-+		public const uint dead_caron;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_cedilla")]
-+		public const uint dead_cedilla;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_circumflex")]
-+		public const uint dead_circumflex;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_currency")]
-+		public const uint dead_currency;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_dasia")]
-+		public const uint dead_dasia;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_diaeresis")]
-+		public const uint dead_diaeresis;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_doubleacute")]
-+		public const uint dead_doubleacute;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_doublegrave")]
-+		public const uint dead_doublegrave;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_e")]
-+		public const uint dead_e;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_grave")]
-+		public const uint dead_grave;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_greek")]
-+		public const uint dead_greek;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_hook")]
-+		public const uint dead_hook;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_horn")]
-+		public const uint dead_horn;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_i")]
-+		public const uint dead_i;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_invertedbreve")]
-+		public const uint dead_invertedbreve;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_iota")]
-+		public const uint dead_iota;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_longsolidusoverlay")]
-+		public const uint dead_longsolidusoverlay;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_lowline")]
-+		public const uint dead_lowline;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_macron")]
-+		public const uint dead_macron;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_o")]
-+		public const uint dead_o;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_ogonek")]
-+		public const uint dead_ogonek;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_perispomeni")]
-+		public const uint dead_perispomeni;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_psili")]
-+		public const uint dead_psili;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_semivoiced_sound")]
-+		public const uint dead_semivoiced_sound;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_small_schwa")]
-+		public const uint dead_small_schwa;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_stroke")]
-+		public const uint dead_stroke;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_tilde")]
-+		public const uint dead_tilde;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_u")]
-+		public const uint dead_u;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dead_voiced_sound")]
-+		public const uint dead_voiced_sound;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_decimalpoint")]
-+		public const uint decimalpoint;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_degree")]
-+		public const uint degree;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_diaeresis")]
-+		public const uint diaeresis;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_diamond")]
-+		public const uint diamond;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_digitspace")]
-+		public const uint digitspace;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dintegral")]
-+		public const uint dintegral;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_division")]
-+		public const uint division;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dollar")]
-+		public const uint dollar;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_doubbaselinedot")]
-+		public const uint doubbaselinedot;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_doubleacute")]
-+		public const uint doubleacute;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_doubledagger")]
-+		public const uint doubledagger;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_doublelowquotemark")]
-+		public const uint doublelowquotemark;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_downarrow")]
-+		public const uint downarrow;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_downcaret")]
-+		public const uint downcaret;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_downshoe")]
-+		public const uint downshoe;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_downstile")]
-+		public const uint downstile;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_downtack")]
-+		public const uint downtack;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_dstroke")]
-+		public const uint dstroke;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_e")]
-+		public const uint e;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_eabovedot")]
-+		public const uint eabovedot;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_eacute")]
-+		public const uint eacute;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ebelowdot")]
-+		public const uint ebelowdot;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ecaron")]
-+		public const uint ecaron;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ecircumflex")]
-+		public const uint ecircumflex;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ecircumflexacute")]
-+		public const uint ecircumflexacute;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ecircumflexbelowdot")]
-+		public const uint ecircumflexbelowdot;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ecircumflexgrave")]
-+		public const uint ecircumflexgrave;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ecircumflexhook")]
-+		public const uint ecircumflexhook;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ecircumflextilde")]
-+		public const uint ecircumflextilde;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ediaeresis")]
-+		public const uint ediaeresis;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_egrave")]
-+		public const uint egrave;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ehook")]
-+		public const uint ehook;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_eightsubscript")]
-+		public const uint eightsubscript;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_eightsuperior")]
-+		public const uint eightsuperior;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_elementof")]
-+		public const uint elementof;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ellipsis")]
-+		public const uint ellipsis;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_em3space")]
-+		public const uint em3space;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_em4space")]
-+		public const uint em4space;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_emacron")]
-+		public const uint emacron;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_emdash")]
-+		public const uint emdash;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_emfilledcircle")]
-+		public const uint emfilledcircle;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_emfilledrect")]
-+		public const uint emfilledrect;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_emopencircle")]
-+		public const uint emopencircle;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_emopenrectangle")]
-+		public const uint emopenrectangle;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_emptyset")]
-+		public const uint emptyset;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_emspace")]
-+		public const uint emspace;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_endash")]
-+		public const uint endash;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_enfilledcircbullet")]
-+		public const uint enfilledcircbullet;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_enfilledsqbullet")]
-+		public const uint enfilledsqbullet;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_eng")]
-+		public const uint eng;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_enopencircbullet")]
-+		public const uint enopencircbullet;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_enopensquarebullet")]
-+		public const uint enopensquarebullet;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_enspace")]
-+		public const uint enspace;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_eogonek")]
-+		public const uint eogonek;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_equal")]
-+		public const uint equal;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_eth")]
-+		public const uint eth;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_etilde")]
-+		public const uint etilde;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_exclam")]
-+		public const uint exclam;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_exclamdown")]
-+		public const uint exclamdown;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ezh")]
-+		public const uint ezh;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_f")]
-+		public const uint f;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_fabovedot")]
-+		public const uint fabovedot;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_femalesymbol")]
-+		public const uint femalesymbol;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ff")]
-+		public const uint ff;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_figdash")]
-+		public const uint figdash;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_filledlefttribullet")]
-+		public const uint filledlefttribullet;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_filledrectbullet")]
-+		public const uint filledrectbullet;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_filledrighttribullet")]
-+		public const uint filledrighttribullet;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_filledtribulletdown")]
-+		public const uint filledtribulletdown;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_filledtribulletup")]
-+		public const uint filledtribulletup;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_fiveeighths")]
-+		public const uint fiveeighths;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_fivesixths")]
-+		public const uint fivesixths;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_fivesubscript")]
-+		public const uint fivesubscript;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_fivesuperior")]
-+		public const uint fivesuperior;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_fourfifths")]
-+		public const uint fourfifths;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_foursubscript")]
-+		public const uint foursubscript;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_foursuperior")]
-+		public const uint foursuperior;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_fourthroot")]
-+		public const uint fourthroot;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_function")]
-+		public const uint function;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_g")]
-+		public const uint g;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_gabovedot")]
-+		public const uint gabovedot;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_gbreve")]
-+		public const uint gbreve;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_gcaron")]
-+		public const uint gcaron;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_gcedilla")]
-+		public const uint gcedilla;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_gcircumflex")]
-+		public const uint gcircumflex;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_grave")]
-+		public const uint grave;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_greater")]
-+		public const uint greater;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_greaterthanequal")]
-+		public const uint greaterthanequal;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_guillemotleft")]
-+		public const uint guillemotleft;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_guillemotright")]
-+		public const uint guillemotright;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_h")]
-+		public const uint h;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hairspace")]
-+		public const uint hairspace;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hcircumflex")]
-+		public const uint hcircumflex;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_heart")]
-+		public const uint heart;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_aleph")]
-+		public const uint hebrew_aleph;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_ayin")]
-+		public const uint hebrew_ayin;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_bet")]
-+		public const uint hebrew_bet;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_beth")]
-+		public const uint hebrew_beth;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_chet")]
-+		public const uint hebrew_chet;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_dalet")]
-+		public const uint hebrew_dalet;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_daleth")]
-+		public const uint hebrew_daleth;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_doublelowline")]
-+		public const uint hebrew_doublelowline;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_finalkaph")]
-+		public const uint hebrew_finalkaph;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_finalmem")]
-+		public const uint hebrew_finalmem;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_finalnun")]
-+		public const uint hebrew_finalnun;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_finalpe")]
-+		public const uint hebrew_finalpe;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_finalzade")]
-+		public const uint hebrew_finalzade;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_finalzadi")]
-+		public const uint hebrew_finalzadi;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_gimel")]
-+		public const uint hebrew_gimel;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_gimmel")]
-+		public const uint hebrew_gimmel;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_he")]
-+		public const uint hebrew_he;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_het")]
-+		public const uint hebrew_het;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_kaph")]
-+		public const uint hebrew_kaph;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_kuf")]
-+		public const uint hebrew_kuf;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_lamed")]
-+		public const uint hebrew_lamed;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_mem")]
-+		public const uint hebrew_mem;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_nun")]
-+		public const uint hebrew_nun;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_pe")]
-+		public const uint hebrew_pe;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_qoph")]
-+		public const uint hebrew_qoph;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_resh")]
-+		public const uint hebrew_resh;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_samech")]
-+		public const uint hebrew_samech;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_samekh")]
-+		public const uint hebrew_samekh;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_shin")]
-+		public const uint hebrew_shin;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_taf")]
-+		public const uint hebrew_taf;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_taw")]
-+		public const uint hebrew_taw;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_tet")]
-+		public const uint hebrew_tet;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_teth")]
-+		public const uint hebrew_teth;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_waw")]
-+		public const uint hebrew_waw;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_yod")]
-+		public const uint hebrew_yod;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_zade")]
-+		public const uint hebrew_zade;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_zadi")]
-+		public const uint hebrew_zadi;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_zain")]
-+		public const uint hebrew_zain;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hebrew_zayin")]
-+		public const uint hebrew_zayin;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hexagram")]
-+		public const uint hexagram;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_horizconnector")]
-+		public const uint horizconnector;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_horizlinescan1")]
-+		public const uint horizlinescan1;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_horizlinescan3")]
-+		public const uint horizlinescan3;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_horizlinescan5")]
-+		public const uint horizlinescan5;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_horizlinescan7")]
-+		public const uint horizlinescan7;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_horizlinescan9")]
-+		public const uint horizlinescan9;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hstroke")]
-+		public const uint hstroke;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ht")]
-+		public const uint ht;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_hyphen")]
-+		public const uint hyphen;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_i")]
-+		public const uint i;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_iTouch")]
-+		public const uint iTouch;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_iacute")]
-+		public const uint iacute;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ibelowdot")]
-+		public const uint ibelowdot;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ibreve")]
-+		public const uint ibreve;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_icircumflex")]
-+		public const uint icircumflex;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_identical")]
-+		public const uint identical;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_idiaeresis")]
-+		public const uint idiaeresis;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_idotless")]
-+		public const uint idotless;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ifonlyif")]
-+		public const uint ifonlyif;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_igrave")]
-+		public const uint igrave;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ihook")]
-+		public const uint ihook;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_imacron")]
-+		public const uint imacron;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_implies")]
-+		public const uint implies;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_includedin")]
-+		public const uint includedin;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_includes")]
-+		public const uint includes;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_infinity")]
-+		public const uint infinity;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_integral")]
-+		public const uint integral;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_intersection")]
-+		public const uint intersection;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_iogonek")]
-+		public const uint iogonek;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_itilde")]
-+		public const uint itilde;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_j")]
-+		public const uint j;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_jcircumflex")]
-+		public const uint jcircumflex;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_jot")]
-+		public const uint jot;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_k")]
-+		public const uint k;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_A")]
-+		public const uint kana_A;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_CHI")]
-+		public const uint kana_CHI;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_E")]
-+		public const uint kana_E;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_FU")]
-+		public const uint kana_FU;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_HA")]
-+		public const uint kana_HA;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_HE")]
-+		public const uint kana_HE;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_HI")]
-+		public const uint kana_HI;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_HO")]
-+		public const uint kana_HO;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_HU")]
-+		public const uint kana_HU;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_I")]
-+		public const uint kana_I;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_KA")]
-+		public const uint kana_KA;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_KE")]
-+		public const uint kana_KE;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_KI")]
-+		public const uint kana_KI;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_KO")]
-+		public const uint kana_KO;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_KU")]
-+		public const uint kana_KU;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_MA")]
-+		public const uint kana_MA;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_ME")]
-+		public const uint kana_ME;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_MI")]
-+		public const uint kana_MI;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_MO")]
-+		public const uint kana_MO;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_MU")]
-+		public const uint kana_MU;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_N")]
-+		public const uint kana_N;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_NA")]
-+		public const uint kana_NA;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_NE")]
-+		public const uint kana_NE;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_NI")]
-+		public const uint kana_NI;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_NO")]
-+		public const uint kana_NO;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_NU")]
-+		public const uint kana_NU;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_O")]
-+		public const uint kana_O;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_RA")]
-+		public const uint kana_RA;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_RE")]
-+		public const uint kana_RE;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_RI")]
-+		public const uint kana_RI;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_RO")]
-+		public const uint kana_RO;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_RU")]
-+		public const uint kana_RU;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_SA")]
-+		public const uint kana_SA;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_SE")]
-+		public const uint kana_SE;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_SHI")]
-+		public const uint kana_SHI;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_SO")]
-+		public const uint kana_SO;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_SU")]
-+		public const uint kana_SU;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_TA")]
-+		public const uint kana_TA;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_TE")]
-+		public const uint kana_TE;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_TI")]
-+		public const uint kana_TI;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_TO")]
-+		public const uint kana_TO;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_TSU")]
-+		public const uint kana_TSU;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_TU")]
-+		public const uint kana_TU;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_U")]
-+		public const uint kana_U;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_WA")]
-+		public const uint kana_WA;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_WO")]
-+		public const uint kana_WO;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_YA")]
-+		public const uint kana_YA;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_YO")]
-+		public const uint kana_YO;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_YU")]
-+		public const uint kana_YU;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_a")]
-+		public const uint kana_a;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_closingbracket")]
-+		public const uint kana_closingbracket;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_comma")]
-+		public const uint kana_comma;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_conjunctive")]
-+		public const uint kana_conjunctive;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_e")]
-+		public const uint kana_e;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_fullstop")]
-+		public const uint kana_fullstop;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_i")]
-+		public const uint kana_i;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_middledot")]
-+		public const uint kana_middledot;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_o")]
-+		public const uint kana_o;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_openingbracket")]
-+		public const uint kana_openingbracket;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_switch")]
-+		public const uint kana_switch;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_tsu")]
-+		public const uint kana_tsu;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_tu")]
-+		public const uint kana_tu;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_u")]
-+		public const uint kana_u;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_ya")]
-+		public const uint kana_ya;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_yo")]
-+		public const uint kana_yo;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kana_yu")]
-+		public const uint kana_yu;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kappa")]
-+		public const uint kappa;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kcedilla")]
-+		public const uint kcedilla;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_kra")]
-+		public const uint kra;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_l")]
-+		public const uint l;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_lacute")]
-+		public const uint lacute;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_latincross")]
-+		public const uint latincross;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_lbelowdot")]
-+		public const uint lbelowdot;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_lcaron")]
-+		public const uint lcaron;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_lcedilla")]
-+		public const uint lcedilla;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_leftanglebracket")]
-+		public const uint leftanglebracket;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_leftarrow")]
-+		public const uint leftarrow;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_leftcaret")]
-+		public const uint leftcaret;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_leftdoublequotemark")]
-+		public const uint leftdoublequotemark;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_leftmiddlecurlybrace")]
-+		public const uint leftmiddlecurlybrace;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_leftopentriangle")]
-+		public const uint leftopentriangle;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_leftpointer")]
-+		public const uint leftpointer;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_leftradical")]
-+		public const uint leftradical;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_leftshoe")]
-+		public const uint leftshoe;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_leftsinglequotemark")]
-+		public const uint leftsinglequotemark;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_leftt")]
-+		public const uint leftt;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_lefttack")]
-+		public const uint lefttack;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_less")]
-+		public const uint less;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_lessthanequal")]
-+		public const uint lessthanequal;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_lf")]
-+		public const uint lf;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_logicaland")]
-+		public const uint logicaland;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_logicalor")]
-+		public const uint logicalor;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_lowleftcorner")]
-+		public const uint lowleftcorner;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_lowrightcorner")]
-+		public const uint lowrightcorner;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_lstroke")]
-+		public const uint lstroke;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_m")]
-+		public const uint m;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_mabovedot")]
-+		public const uint mabovedot;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_macron")]
-+		public const uint macron;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_malesymbol")]
-+		public const uint malesymbol;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_maltesecross")]
-+		public const uint maltesecross;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_marker")]
-+		public const uint marker;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_masculine")]
-+		public const uint masculine;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_minus")]
-+		public const uint minus;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_minutes")]
-+		public const uint minutes;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_mu")]
-+		public const uint mu;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_multiply")]
-+		public const uint multiply;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_musicalflat")]
-+		public const uint musicalflat;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_musicalsharp")]
-+		public const uint musicalsharp;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_n")]
-+		public const uint n;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_nabla")]
-+		public const uint nabla;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_nacute")]
-+		public const uint nacute;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ncaron")]
-+		public const uint ncaron;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ncedilla")]
-+		public const uint ncedilla;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ninesubscript")]
-+		public const uint ninesubscript;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ninesuperior")]
-+		public const uint ninesuperior;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_nl")]
-+		public const uint nl;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_nobreakspace")]
-+		public const uint nobreakspace;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_notapproxeq")]
-+		public const uint notapproxeq;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_notelementof")]
-+		public const uint notelementof;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_notequal")]
-+		public const uint notequal;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_notidentical")]
-+		public const uint notidentical;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_notsign")]
-+		public const uint notsign;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ntilde")]
-+		public const uint ntilde;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_numbersign")]
-+		public const uint numbersign;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_numerosign")]
-+		public const uint numerosign;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_o")]
-+		public const uint o;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_oacute")]
-+		public const uint oacute;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_obarred")]
-+		public const uint obarred;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_obelowdot")]
-+		public const uint obelowdot;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ocaron")]
-+		public const uint ocaron;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ocircumflex")]
-+		public const uint ocircumflex;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ocircumflexacute")]
-+		public const uint ocircumflexacute;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ocircumflexbelowdot")]
-+		public const uint ocircumflexbelowdot;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ocircumflexgrave")]
-+		public const uint ocircumflexgrave;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ocircumflexhook")]
-+		public const uint ocircumflexhook;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ocircumflextilde")]
-+		public const uint ocircumflextilde;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_odiaeresis")]
-+		public const uint odiaeresis;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_odoubleacute")]
-+		public const uint odoubleacute;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_oe")]
-+		public const uint oe;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ogonek")]
-+		public const uint ogonek;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ograve")]
-+		public const uint ograve;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ohook")]
-+		public const uint ohook;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ohorn")]
-+		public const uint ohorn;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ohornacute")]
-+		public const uint ohornacute;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ohornbelowdot")]
-+		public const uint ohornbelowdot;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ohorngrave")]
-+		public const uint ohorngrave;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ohornhook")]
-+		public const uint ohornhook;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ohorntilde")]
-+		public const uint ohorntilde;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_omacron")]
-+		public const uint omacron;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_oneeighth")]
-+		public const uint oneeighth;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_onefifth")]
-+		public const uint onefifth;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_onehalf")]
-+		public const uint onehalf;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_onequarter")]
-+		public const uint onequarter;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_onesixth")]
-+		public const uint onesixth;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_onesubscript")]
-+		public const uint onesubscript;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_onesuperior")]
-+		public const uint onesuperior;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_onethird")]
-+		public const uint onethird;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ooblique")]
-+		public const uint ooblique;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_openrectbullet")]
-+		public const uint openrectbullet;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_openstar")]
-+		public const uint openstar;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_opentribulletdown")]
-+		public const uint opentribulletdown;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_opentribulletup")]
-+		public const uint opentribulletup;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ordfeminine")]
-+		public const uint ordfeminine;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_oslash")]
-+		public const uint oslash;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_otilde")]
-+		public const uint otilde;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_overbar")]
-+		public const uint overbar;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_overline")]
-+		public const uint overline;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_p")]
-+		public const uint p;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_pabovedot")]
-+		public const uint pabovedot;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_paragraph")]
-+		public const uint paragraph;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_parenleft")]
-+		public const uint parenleft;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_parenright")]
-+		public const uint parenright;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_partdifferential")]
-+		public const uint partdifferential;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_partialderivative")]
-+		public const uint partialderivative;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_percent")]
-+		public const uint percent;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_period")]
-+		public const uint period;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_periodcentered")]
-+		public const uint periodcentered;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_permille")]
-+		public const uint permille;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_phonographcopyright")]
-+		public const uint phonographcopyright;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_plus")]
-+		public const uint plus;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_plusminus")]
-+		public const uint plusminus;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_prescription")]
-+		public const uint prescription;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_prolongedsound")]
-+		public const uint prolongedsound;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_punctspace")]
-+		public const uint punctspace;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_q")]
-+		public const uint q;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_quad")]
-+		public const uint quad;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_question")]
-+		public const uint question;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_questiondown")]
-+		public const uint questiondown;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_quotedbl")]
-+		public const uint quotedbl;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_quoteleft")]
-+		public const uint quoteleft;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_quoteright")]
-+		public const uint quoteright;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_r")]
-+		public const uint r;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_racute")]
-+		public const uint racute;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_radical")]
-+		public const uint radical;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_rcaron")]
-+		public const uint rcaron;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_rcedilla")]
-+		public const uint rcedilla;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_registered")]
-+		public const uint registered;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_rightanglebracket")]
-+		public const uint rightanglebracket;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_rightarrow")]
-+		public const uint rightarrow;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_rightcaret")]
-+		public const uint rightcaret;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_rightdoublequotemark")]
-+		public const uint rightdoublequotemark;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_rightmiddlecurlybrace")]
-+		public const uint rightmiddlecurlybrace;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_rightmiddlesummation")]
-+		public const uint rightmiddlesummation;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_rightopentriangle")]
-+		public const uint rightopentriangle;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_rightpointer")]
-+		public const uint rightpointer;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_rightshoe")]
-+		public const uint rightshoe;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_rightsinglequotemark")]
-+		public const uint rightsinglequotemark;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_rightt")]
-+		public const uint rightt;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_righttack")]
-+		public const uint righttack;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_s")]
-+		public const uint s;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_sabovedot")]
-+		public const uint sabovedot;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_sacute")]
-+		public const uint sacute;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_scaron")]
-+		public const uint scaron;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_scedilla")]
-+		public const uint scedilla;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_schwa")]
-+		public const uint schwa;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_scircumflex")]
-+		public const uint scircumflex;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_script_switch")]
-+		public const uint script_switch;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_seconds")]
-+		public const uint seconds;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_section")]
-+		public const uint section;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_semicolon")]
-+		public const uint semicolon;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_semivoicedsound")]
-+		public const uint semivoicedsound;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_seveneighths")]
-+		public const uint seveneighths;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_sevensubscript")]
-+		public const uint sevensubscript;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_sevensuperior")]
-+		public const uint sevensuperior;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_signaturemark")]
-+		public const uint signaturemark;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_signifblank")]
-+		public const uint signifblank;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_similarequal")]
-+		public const uint similarequal;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_singlelowquotemark")]
-+		public const uint singlelowquotemark;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_sixsubscript")]
-+		public const uint sixsubscript;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_sixsuperior")]
-+		public const uint sixsuperior;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_slash")]
-+		public const uint slash;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_soliddiamond")]
-+		public const uint soliddiamond;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_space")]
-+		public const uint space;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_squareroot")]
-+		public const uint squareroot;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ssharp")]
-+		public const uint ssharp;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_sterling")]
-+		public const uint sterling;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_stricteq")]
-+		public const uint stricteq;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_t")]
-+		public const uint t;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_tabovedot")]
-+		public const uint tabovedot;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_tcaron")]
-+		public const uint tcaron;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_tcedilla")]
-+		public const uint tcedilla;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_telephone")]
-+		public const uint telephone;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_telephonerecorder")]
-+		public const uint telephonerecorder;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_therefore")]
-+		public const uint therefore;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_thinspace")]
-+		public const uint thinspace;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_thorn")]
-+		public const uint thorn;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_threeeighths")]
-+		public const uint threeeighths;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_threefifths")]
-+		public const uint threefifths;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_threequarters")]
-+		public const uint threequarters;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_threesubscript")]
-+		public const uint threesubscript;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_threesuperior")]
-+		public const uint threesuperior;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_tintegral")]
-+		public const uint tintegral;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_topintegral")]
-+		public const uint topintegral;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_topleftparens")]
-+		public const uint topleftparens;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_topleftradical")]
-+		public const uint topleftradical;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_topleftsqbracket")]
-+		public const uint topleftsqbracket;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_topleftsummation")]
-+		public const uint topleftsummation;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_toprightparens")]
-+		public const uint toprightparens;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_toprightsqbracket")]
-+		public const uint toprightsqbracket;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_toprightsummation")]
-+		public const uint toprightsummation;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_topt")]
-+		public const uint topt;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_topvertsummationconnector")]
-+		public const uint topvertsummationconnector;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_trademark")]
-+		public const uint trademark;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_trademarkincircle")]
-+		public const uint trademarkincircle;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_tslash")]
-+		public const uint tslash;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_twofifths")]
-+		public const uint twofifths;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_twosubscript")]
-+		public const uint twosubscript;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_twosuperior")]
-+		public const uint twosuperior;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_twothirds")]
-+		public const uint twothirds;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_u")]
-+		public const uint u;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_uacute")]
-+		public const uint uacute;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ubelowdot")]
-+		public const uint ubelowdot;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ubreve")]
-+		public const uint ubreve;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ucircumflex")]
-+		public const uint ucircumflex;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_udiaeresis")]
-+		public const uint udiaeresis;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_udoubleacute")]
-+		public const uint udoubleacute;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ugrave")]
-+		public const uint ugrave;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_uhook")]
-+		public const uint uhook;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_uhorn")]
-+		public const uint uhorn;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_uhornacute")]
-+		public const uint uhornacute;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_uhornbelowdot")]
-+		public const uint uhornbelowdot;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_uhorngrave")]
-+		public const uint uhorngrave;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_uhornhook")]
-+		public const uint uhornhook;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_uhorntilde")]
-+		public const uint uhorntilde;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_umacron")]
-+		public const uint umacron;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_underbar")]
-+		public const uint underbar;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_underscore")]
-+		public const uint underscore;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_union")]
-+		public const uint union;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_uogonek")]
-+		public const uint uogonek;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_uparrow")]
-+		public const uint uparrow;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_upcaret")]
-+		public const uint upcaret;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_upleftcorner")]
-+		public const uint upleftcorner;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_uprightcorner")]
-+		public const uint uprightcorner;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_upshoe")]
-+		public const uint upshoe;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_upstile")]
-+		public const uint upstile;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_uptack")]
-+		public const uint uptack;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_uring")]
-+		public const uint uring;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_utilde")]
-+		public const uint utilde;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_v")]
-+		public const uint v;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_variation")]
-+		public const uint variation;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_vertbar")]
-+		public const uint vertbar;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_vertconnector")]
-+		public const uint vertconnector;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_voicedsound")]
-+		public const uint voicedsound;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_vt")]
-+		public const uint vt;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_w")]
-+		public const uint w;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_wacute")]
-+		public const uint wacute;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_wcircumflex")]
-+		public const uint wcircumflex;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_wdiaeresis")]
-+		public const uint wdiaeresis;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_wgrave")]
-+		public const uint wgrave;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_x")]
-+		public const uint x;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_xabovedot")]
-+		public const uint xabovedot;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_y")]
-+		public const uint y;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_yacute")]
-+		public const uint yacute;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ybelowdot")]
-+		public const uint ybelowdot;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ycircumflex")]
-+		public const uint ycircumflex;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ydiaeresis")]
-+		public const uint ydiaeresis;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_yen")]
-+		public const uint yen;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ygrave")]
-+		public const uint ygrave;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_yhook")]
-+		public const uint yhook;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_ytilde")]
-+		public const uint ytilde;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_z")]
-+		public const uint z;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_zabovedot")]
-+		public const uint zabovedot;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_zacute")]
-+		public const uint zacute;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_zcaron")]
-+		public const uint zcaron;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_zerosubscript")]
-+		public const uint zerosubscript;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_zerosuperior")]
-+		public const uint zerosuperior;
-+		[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_KEY_zstroke")]
-+		public const uint zstroke;
-+	}
-+	namespace Threads {
-+		namespace Idle {
-+			[CCode (cheader_filename = "clutter/clutter.h", cname = "clutter_threads_add_idle")]
-+			[Version (since = "0.4")]
-+			public static uint add (GLib.SourceFunc func);
-+			[CCode (cheader_filename = "clutter/clutter.h", cname = "clutter_threads_add_idle_full")]
-+			[Version (since = "0.4")]
-+			public static uint add_full (int priority, owned GLib.SourceFunc func);
-+		}
-+		namespace Timeout {
-+			[CCode (cheader_filename = "clutter/clutter.h", cname = "clutter_threads_add_timeout")]
-+			[Version (since = "0.4")]
-+			public static uint add (uint interval, GLib.SourceFunc func);
-+			[CCode (cheader_filename = "clutter/clutter.h", cname = "clutter_threads_add_timeout_full")]
-+			[Version (since = "0.4")]
-+			public static uint add_full (int priority, uint interval, owned GLib.SourceFunc func);
-+		}
-+		[CCode (cheader_filename = "clutter/clutter.h")]
-+		[Version (since = "1.0")]
-+		public static uint add_repaint_func (owned GLib.SourceFunc func);
-+		[CCode (cheader_filename = "clutter/clutter.h")]
-+		[Version (since = "1.10")]
-+		public static uint add_repaint_func_full (Clutter.RepaintFlags flags, owned GLib.SourceFunc func);
-+		[CCode (cheader_filename = "clutter/clutter.h")]
-+		[Version (since = "1.0")]
-+		public static void remove_repaint_func (uint handle_id);
-+	}
-+	namespace Value {
-+		[CCode (cheader_filename = "clutter/clutter.h")]
-+		[Version (since = "1.10")]
-+		public static Clutter.PaintNode dup_paint_node (GLib.Value value);
-+		[CCode (cheader_filename = "clutter/clutter.h")]
-+		[Version (since = "0.8")]
-+		public static unowned Clutter.Color? get_color (GLib.Value value);
-+		[CCode (cheader_filename = "clutter/clutter.h")]
-+		[Version (since = "1.10")]
-+		public static unowned Clutter.PaintNode get_paint_node (GLib.Value value);
-+		[CCode (array_length_pos = 1.1, array_length_type = "gsize", cheader_filename = "clutter/clutter.h")]
-+		[Version (since = "0.8")]
-+		public static unowned float[] get_shader_float (GLib.Value value);
-+		[CCode (array_length_pos = 1.1, array_length_type = "gsize", cheader_filename = "clutter/clutter.h")]
-+		[Version (since = "0.8")]
-+		public static unowned int[] get_shader_int (GLib.Value value);
-+		[CCode (array_length_pos = 1.1, array_length_type = "gsize", cheader_filename = "clutter/clutter.h")]
-+		[Version (since = "0.8")]
-+		public static unowned float[] get_shader_matrix (GLib.Value value);
-+		[CCode (cheader_filename = "clutter/clutter.h")]
-+		[Version (since = "0.8")]
-+		public static unowned Clutter.Units? get_units (GLib.Value value);
-+		[CCode (cheader_filename = "clutter/clutter.h")]
-+		[Version (since = "0.8")]
-+		public static void set_color (GLib.Value value, Clutter.Color color);
-+		[CCode (cheader_filename = "clutter/clutter.h")]
-+		[Version (since = "1.10")]
-+		public static void set_paint_node (GLib.Value value, Clutter.PaintNode? node);
-+		[CCode (cheader_filename = "clutter/clutter.h")]
-+		[Version (since = "0.8")]
-+		public static void set_shader_float (GLib.Value value, [CCode (array_length_cname = "size", array_length_pos = 1.5)] float[] floats);
-+		[CCode (cheader_filename = "clutter/clutter.h")]
-+		[Version (since = "0.8")]
-+		public static void set_shader_int (GLib.Value value, [CCode (array_length_cname = "size", array_length_pos = 1.5)] int[] ints);
-+		[CCode (cheader_filename = "clutter/clutter.h")]
-+		[Version (since = "0.8")]
-+		public static void set_shader_matrix (GLib.Value value, [CCode (array_length_cname = "size", array_length_pos = 1.5)] float[] matrix);
-+		[CCode (cheader_filename = "clutter/clutter.h")]
-+		[Version (since = "0.8")]
-+		public static void set_units (GLib.Value value, Clutter.Units units);
-+		[CCode (cheader_filename = "clutter/clutter.h")]
-+		[Version (since = "1.10")]
-+		public static void take_paint_node (GLib.Value value, Clutter.PaintNode? node);
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_action_get_type ()")]
-+	public abstract class Action : Clutter.ActorMeta {
-+		[CCode (has_construct_function = false)]
-+		protected Action ();
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_actor_get_type ()")]
-+	public class Actor : GLib.InitiallyUnowned, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
-+		public uint32 flags;
-+		[CCode (has_construct_function = false)]
-+		[Version (since = "1.10")]
-+		public Actor ();
-+		[Version (since = "1.4")]
-+		public void add_action (Clutter.Action action);
-+		[Version (since = "1.4")]
-+		public void add_action_with_name (string name, Clutter.Action action);
-+		[Version (since = "1.10")]
-+		public void add_child (Clutter.Actor child);
-+		[Version (since = "1.4")]
-+		public void add_constraint (Clutter.Constraint constraint);
-+		[Version (since = "1.4")]
-+		public void add_constraint_with_name (string name, Clutter.Constraint constraint);
-+		[Version (since = "1.4")]
-+		public void add_effect (Clutter.Effect effect);
-+		[Version (since = "1.4")]
-+		public void add_effect_with_name (string name, Clutter.Effect effect);
-+		[Version (since = "1.10")]
-+		public void add_transition (string name, Clutter.Transition transition);
-+		[Version (since = "0.8")]
-+		public virtual void allocate (Clutter.ActorBox box);
-+		[Version (since = "1.4")]
-+		public void allocate_align_fill (Clutter.ActorBox box, double x_align, double y_align, bool x_fill, bool y_fill);
-+		[Version (since = "1.0")]
-+		public void allocate_available_size (float x, float y, float available_width, float available_height);
-+		[Version (since = "0.8")]
-+		public void allocate_preferred_size (float x, float y);
-+		[Version (since = "0.6")]
-+		public Graphene.Point3D apply_relative_transform_to_point (Clutter.Actor? ancestor, Graphene.Point3D point);
-+		[NoWrapper]
-+		public virtual void apply_transform (ref Graphene.Matrix matrix);
-+		[Version (since = "0.4")]
-+		public Graphene.Point3D apply_transform_to_point (Graphene.Point3D point);
-+		[Version (since = "1.24")]
-+		public void bind_model (GLib.ListModel? model, owned Clutter.ActorCreateChildFunc create_child_func);
-+		[NoWrapper]
-+		public virtual float calculate_resource_scale (int phase);
-+		[Version (since = "1.4")]
-+		public void clear_actions ();
-+		[Version (since = "1.4")]
-+		public void clear_constraints ();
-+		[Version (since = "1.4")]
-+		public void clear_effects ();
-+		[Version (since = "1.4")]
-+		public bool contains (Clutter.Actor descendant);
-+		[Version (since = "1.8")]
-+		public void continue_paint (Clutter.PaintContext paint_context);
-+		public void continue_pick (Clutter.PickContext pick_context);
-+		[Version (since = "1.0")]
-+		public Pango.Context create_pango_context ();
-+		[Version (since = "1.0")]
-+		public Pango.Layout create_pango_layout (string? text);
-+		[Version (since = "1.10")]
-+		public void destroy_all_children ();
-+		[CCode (cname = "clutter_actor_event")]
-+		[Version (since = "0.6")]
-+		public bool emit_event (Clutter.Event event, bool capture);
-+		[Version (since = "0.4")]
-+		public void get_abs_allocation_vertices ([CCode (array_length = false)] Graphene.Point3D verts[4]);
-+		public virtual unowned Atk.Object get_accessible ();
-+		[Version (since = "1.4")]
-+		public unowned Clutter.Action get_action (string name);
-+		[Version (since = "1.4")]
-+		public GLib.List<weak Clutter.Action> get_actions ();
-+		[Version (since = "0.8")]
-+		public Clutter.ActorBox get_allocation_box ();
-+		[Version (since = "1.10")]
-+		public Clutter.Color get_background_color ();
-+		[Version (since = "1.10")]
-+		public unowned Clutter.Actor get_child_at_index (int index_);
-+		[Version (since = "1.12")]
-+		public Graphene.Matrix get_child_transform ();
-+		[Version (since = "1.10")]
-+		public GLib.List<weak Clutter.Actor> get_children ();
-+		[Version (since = "0.6")]
-+		public void get_clip (out float xoff, out float yoff, out float width, out float height);
-+		[Version (since = "1.4")]
-+		public bool get_clip_to_allocation ();
-+		[Version (since = "1.4")]
-+		public unowned Clutter.Constraint get_constraint (string name);
-+		[Version (since = "1.4")]
-+		public GLib.List<weak Clutter.Constraint> get_constraints ();
-+		[Version (since = "1.10")]
-+		public unowned Clutter.Content get_content ();
-+		[Version (since = "1.10")]
-+		public Clutter.ActorBox get_content_box ();
-+		[Version (since = "1.10")]
-+		public Clutter.ContentGravity get_content_gravity ();
-+		[Version (since = "1.12")]
-+		public Clutter.ContentRepeat get_content_repeat ();
-+		[Version (since = "1.10")]
-+		public void get_content_scaling_filters (out Clutter.ScalingFilter min_filter, out Clutter.ScalingFilter mag_filter);
-+		[Version (since = "1.10")]
-+		public unowned Clutter.PaintVolume? get_default_paint_volume ();
-+		[Version (since = "1.10")]
-+		public uint get_easing_delay ();
-+		[Version (since = "1.10")]
-+		public uint get_easing_duration ();
-+		[Version (since = "1.10")]
-+		public Clutter.AnimationMode get_easing_mode ();
-+		[Version (since = "1.4")]
-+		public unowned Clutter.Effect get_effect (string name);
-+		[Version (since = "1.4")]
-+		public GLib.List<weak Clutter.Effect> get_effects ();
-+		[Version (since = "1.10")]
-+		public unowned Clutter.Actor get_first_child ();
-+		public bool get_fixed_position (out float x, out float y);
-+		[Version (since = "0.8")]
-+		public bool get_fixed_position_set ();
-+		[Version (since = "1.0")]
-+		public Clutter.ActorFlags get_flags ();
-+		[CCode (cname = "clutter_actor_has_pointer")]
-+		[Version (since = "1.2")]
-+		public bool get_has_pointer ();
-+		public float get_height ();
-+		[Version (since = "1.10")]
-+		public unowned Clutter.Actor get_last_child ();
-+		[Version (since = "1.10")]
-+		public unowned Clutter.LayoutManager get_layout_manager ();
-+		[Version (since = "1.10")]
-+		public Clutter.Margin get_margin ();
-+		[Version (since = "1.10")]
-+		public float get_margin_bottom ();
-+		[Version (since = "1.10")]
-+		public float get_margin_left ();
-+		[Version (since = "1.10")]
-+		public float get_margin_right ();
-+		[Version (since = "1.10")]
-+		public float get_margin_top ();
-+		[Version (since = "1.10")]
-+		public int get_n_children ();
-+		public unowned string get_name ();
-+		[Version (since = "1.10")]
-+		public unowned Clutter.Actor get_next_sibling ();
-+		[Version (since = "1.8")]
-+		public Clutter.OffscreenRedirect get_offscreen_redirect ();
-+		public uint8 get_opacity ();
-+		[Version (since = "1.22")]
-+		public int get_opacity_override ();
-+		[Version (since = "1.6")]
-+		public bool get_paint_box (out Clutter.ActorBox box);
-+		[Version (since = "0.8")]
-+		public uint8 get_paint_opacity ();
-+		[Version (since = "0.8")]
-+		public bool get_paint_visibility ();
-+		[Version (since = "1.6")]
-+		public unowned Clutter.PaintVolume? get_paint_volume ();
-+		[CCode (vfunc_name = "get_paint_volume")]
-+		[NoWrapper]
-+		public virtual bool get_paint_volume_vfunc (out Clutter.PaintVolume volume);
-+		[Version (since = "1.0")]
-+		public unowned Pango.Context get_pango_context ();
-+		public unowned Clutter.Actor? get_parent ();
-+		[Version (since = "1.12")]
-+		public void get_pivot_point (out float pivot_x, out float pivot_y);
-+		[Version (since = "1.12")]
-+		public float get_pivot_point_z ();
-+		[Version (since = "0.6")]
-+		public void get_position (out float x, out float y);
-+		[Version (since = "0.8")]
-+		public virtual void get_preferred_height (float for_width, out float min_height_p, out float natural_height_p);
-+		[Version (since = "0.8")]
-+		public void get_preferred_size (out float min_width_p, out float min_height_p, out float natural_width_p, out float natural_height_p);
-+		[Version (since = "0.8")]
-+		public virtual void get_preferred_width (float for_height, out float min_width_p, out float natural_width_p);
-+		[Version (since = "1.10")]
-+		public unowned Clutter.Actor get_previous_sibling ();
-+		[Version (since = "0.6")]
-+		public bool get_reactive ();
-+		[Version (since = "1.2")]
-+		public Clutter.RequestMode get_request_mode ();
-+		public float get_resource_scale ();
-+		[Version (since = "1.12")]
-+		public double get_rotation_angle (Clutter.RotateAxis axis);
-+		[Version (since = "0.2")]
-+		public void get_scale (out double scale_x, out double scale_y);
-+		[Version (since = "1.12")]
-+		public double get_scale_z ();
-+		[Version (since = "0.2")]
-+		public void get_size (out float width, out float height);
-+		[Version (since = "0.8")]
-+		public unowned Clutter.Stage get_stage ();
-+		[Version (since = "1.2")]
-+		public Clutter.TextDirection get_text_direction ();
-+		[Version (since = "1.12")]
-+		public Graphene.Matrix get_transform ();
-+		public Graphene.Rect get_transformed_extents ();
-+		[Version (since = "1.6")]
-+		public unowned Clutter.PaintVolume? get_transformed_paint_volume (Clutter.Actor relative_to_ancestor);
-+		[Version (since = "0.8")]
-+		public void get_transformed_position (out float x, out float y);
-+		[Version (since = "0.8")]
-+		public void get_transformed_size (out float width, out float height);
-+		[Version (since = "1.10")]
-+		public unowned Clutter.Transition get_transition (string name);
-+		[Version (since = "1.12")]
-+		public void get_translation (out float translate_x, out float translate_y, out float translate_z);
-+		public float get_width ();
-+		public float get_x ();
-+		[Version (since = "1.10")]
-+		public Clutter.ActorAlign get_x_align ();
-+		[Version (since = "1.12")]
-+		public bool get_x_expand ();
-+		public float get_y ();
-+		[Version (since = "1.10")]
-+		public Clutter.ActorAlign get_y_align ();
-+		[Version (since = "1.12")]
-+		public bool get_y_expand ();
-+		[Version (since = "1.12")]
-+		public float get_z_position ();
-+		[Version (since = "1.0")]
-+		public void grab_key_focus ();
-+		public virtual bool has_accessible ();
-+		[Version (since = "1.10")]
-+		public bool has_actions ();
-+		[Version (since = "1.4")]
-+		public bool has_allocation ();
-+		[Version (since = "1.10")]
-+		public bool has_constraints ();
-+		public bool has_damage ();
-+		[Version (since = "1.10")]
-+		public bool has_effects ();
-+		[Version (since = "1.4")]
-+		public bool has_key_focus ();
-+		public bool has_mapped_clones ();
-+		[Version (since = "1.8")]
-+		public virtual bool has_overlaps ();
-+		[NoWrapper]
-+		public virtual void hide_all ();
-+		public void inhibit_culling ();
-+		[Version (since = "1.10")]
-+		public void insert_child_above (Clutter.Actor child, Clutter.Actor? sibling);
-+		[Version (since = "1.10")]
-+		public void insert_child_at_index (Clutter.Actor child, int index_);
-+		[Version (since = "1.10")]
-+		public void insert_child_below (Clutter.Actor child, Clutter.Actor? sibling);
-+		public void invalidate_transform ();
-+		public bool is_effectively_on_stage_view (Clutter.StageView view);
-+		[Version (since = "1.0")]
-+		public bool is_in_clone_paint ();
-+		[Version (since = "1.24")]
-+		public bool is_mapped ();
-+		[Version (since = "1.24")]
-+		public bool is_realized ();
-+		[Version (since = "0.6")]
-+		public bool is_rotated ();
-+		[Version (since = "0.6")]
-+		public bool is_scaled ();
-+		[Version (since = "1.24")]
-+		public bool is_visible ();
-+		[Version (since = "1.0")]
-+		public virtual void map ();
-+		[Version (since = "0.2")]
-+		public void move_by (float dx, float dy);
-+		[Version (since = "1.12")]
-+		public bool needs_expand (Clutter.Orientation orientation);
-+		public virtual void paint (Clutter.PaintContext paint_context);
-+		[NoWrapper]
-+		public virtual void paint_node (Clutter.PaintNode root);
-+		public unowned GLib.List<Clutter.StageView> peek_stage_views ();
-+		public void pick_box (Clutter.PickContext pick_context, Clutter.ActorBox box);
-+		public void queue_redraw ();
-+		[Version (since = "1.10")]
-+		public void queue_redraw_with_clip (Cairo.RectangleInt? clip);
-+		[Version (since = "1.4")]
-+		public void remove_action (Clutter.Action action);
-+		[Version (since = "1.4")]
-+		public void remove_action_by_name (string name);
-+		[Version (since = "1.10")]
-+		public void remove_all_children ();
-+		[Version (since = "1.10")]
-+		public void remove_all_transitions ();
-+		[Version (since = "1.10")]
-+		public void remove_child (Clutter.Actor child);
-+		public void remove_clip ();
-+		[Version (since = "1.4")]
-+		public void remove_constraint (Clutter.Constraint constraint);
-+		[Version (since = "1.4")]
-+		public void remove_constraint_by_name (string name);
-+		[Version (since = "1.4")]
-+		public void remove_effect (Clutter.Effect effect);
-+		[Version (since = "1.4")]
-+		public void remove_effect_by_name (string name);
-+		[Version (since = "1.10")]
-+		public void remove_transition (string name);
-+		[Version (since = "1.10")]
-+		public void replace_child (Clutter.Actor old_child, Clutter.Actor new_child);
-+		[Version (since = "1.10")]
-+		public void restore_easing_state ();
-+		[Version (since = "1.10")]
-+		public void save_easing_state ();
-+		[Version (since = "1.10")]
-+		public void set_allocation (Clutter.ActorBox box);
-+		[Version (since = "1.10")]
-+		public void set_background_color (Clutter.Color? color);
-+		[Version (since = "1.10")]
-+		public void set_child_above_sibling (Clutter.Actor child, Clutter.Actor? sibling);
-+		[Version (since = "1.10")]
-+		public void set_child_at_index (Clutter.Actor child, int index_);
-+		[Version (since = "1.10")]
-+		public void set_child_below_sibling (Clutter.Actor child, Clutter.Actor? sibling);
-+		[Version (since = "1.12")]
-+		public void set_child_transform (Graphene.Matrix? transform);
-+		[Version (since = "0.6")]
-+		public void set_clip (float xoff, float yoff, float width, float height);
-+		[Version (since = "1.4")]
-+		public void set_clip_to_allocation (bool clip_set);
-+		[Version (since = "1.10")]
-+		public void set_content (Clutter.Content? content);
-+		[Version (since = "1.10")]
-+		public void set_content_gravity (Clutter.ContentGravity gravity);
-+		[Version (since = "1.12")]
-+		public void set_content_repeat (Clutter.ContentRepeat repeat);
-+		[Version (since = "1.10")]
-+		public void set_content_scaling_filters (Clutter.ScalingFilter min_filter, Clutter.ScalingFilter mag_filter);
-+		[Version (since = "1.10")]
-+		public void set_easing_delay (uint msecs);
-+		[Version (since = "1.10")]
-+		public void set_easing_duration (uint msecs);
-+		[Version (since = "1.10")]
-+		public void set_easing_mode (Clutter.AnimationMode mode);
-+		[Version (since = "0.8")]
-+		public void set_fixed_position_set (bool is_set);
-+		[Version (since = "1.0")]
-+		public void set_flags (Clutter.ActorFlags flags);
-+		[Version (since = "0.2")]
-+		public void set_height (float height);
-+		[Version (since = "1.10")]
-+		public void set_layout_manager (Clutter.LayoutManager? manager);
-+		[Version (since = "1.10")]
-+		public void set_margin (Clutter.Margin margin);
-+		[Version (since = "1.10")]
-+		public void set_margin_bottom (float margin);
-+		[Version (since = "1.10")]
-+		public void set_margin_left (float margin);
-+		[Version (since = "1.10")]
-+		public void set_margin_right (float margin);
-+		[Version (since = "1.10")]
-+		public void set_margin_top (float margin);
-+		public void set_name (string name);
-+		[Version (since = "1.8")]
-+		public void set_offscreen_redirect (Clutter.OffscreenRedirect redirect);
-+		public void set_opacity (uint8 opacity);
-+		public void set_opacity_override (int opacity);
-+		[Version (since = "1.12")]
-+		public void set_pivot_point (float pivot_x, float pivot_y);
-+		[Version (since = "1.12")]
-+		public void set_pivot_point_z (float pivot_z);
-+		public void set_position (float x, float y);
-+		[Version (since = "0.6")]
-+		public void set_reactive (bool reactive);
-+		[Version (since = "1.2")]
-+		public void set_request_mode (Clutter.RequestMode mode);
-+		[Version (since = "1.12")]
-+		public void set_rotation_angle (Clutter.RotateAxis axis, double angle);
-+		[Version (since = "0.2")]
-+		public void set_scale (double scale_x, double scale_y);
-+		[Version (since = "1.12")]
-+		public void set_scale_z (double scale_z);
-+		public void set_size (float width, float height);
-+		[Version (since = "1.2")]
-+		public void set_text_direction (Clutter.TextDirection text_dir);
-+		[Version (since = "1.12")]
-+		public void set_transform (Graphene.Matrix? transform);
-+		[Version (since = "1.12")]
-+		public void set_translation (float translate_x, float translate_y, float translate_z);
-+		[Version (since = "0.2")]
-+		public void set_width (float width);
-+		[Version (since = "0.6")]
-+		public void set_x (float x);
-+		[Version (since = "1.10")]
-+		public void set_x_align (Clutter.ActorAlign x_align);
-+		[Version (since = "1.12")]
-+		public void set_x_expand (bool expand);
-+		[Version (since = "0.6")]
-+		public void set_y (float y);
-+		[Version (since = "1.10")]
-+		public void set_y_align (Clutter.ActorAlign y_align);
-+		[Version (since = "1.12")]
-+		public void set_y_expand (bool expand);
-+		[Version (since = "1.12")]
-+		public void set_z_position (float z_position);
-+		public bool should_pick (Clutter.PickContext pick_context);
-+		[Version (since = "0.6")]
-+		public bool transform_stage_point (float x, float y, out float x_out, out float y_out);
-+		public void uninhibit_culling ();
-+		[Version (since = "1.0")]
-+		public virtual void unmap ();
-+		[Version (since = "1.0")]
-+		public void unset_flags (Clutter.ActorFlags flags);
-+		[NoAccessorMethod]
-+		[Version (since = "1.4")]
-+		public Clutter.Action actions { set; }
-+		[NoAccessorMethod]
-+		[Version (since = "0.8")]
-+		public Clutter.ActorBox allocation { owned get; }
-+		[Version (since = "1.10")]
-+		public Clutter.Color background_color { get; set; }
-+		[NoAccessorMethod]
-+		[Version (since = "1.10")]
-+		public bool background_color_set { get; }
-+		[Version (since = "1.12")]
-+		public Graphene.Matrix child_transform { get; set; }
-+		[NoAccessorMethod]
-+		[Version (since = "1.12")]
-+		public bool child_transform_set { get; }
-+		[NoAccessorMethod]
-+		[Version (since = "1.12")]
-+		public Graphene.Rect clip_rect { owned get; set; }
-+		[Version (since = "1.0")]
-+		public bool clip_to_allocation { get; set; }
-+		[NoAccessorMethod]
-+		[Version (since = "1.4")]
-+		public Clutter.Constraint constraints { set; }
-+		[Version (since = "1.10")]
-+		public Clutter.Content content { get; set; }
-+		[Version (since = "1.10")]
-+		public Clutter.ActorBox content_box { get; }
-+		[Version (since = "1.10")]
-+		public Clutter.ContentGravity content_gravity { get; set; }
-+		[Version (since = "1.12")]
-+		public Clutter.ContentRepeat content_repeat { get; set; }
-+		[NoAccessorMethod]
-+		[Version (since = "1.4")]
-+		public Clutter.Effect effect { set; }
-+		[Version (since = "1.10")]
-+		public Clutter.Actor first_child { get; }
-+		[Version (since = "0.8")]
-+		public bool fixed_position_set { get; set; }
-+		[NoAccessorMethod]
-+		[Version (since = "0.8")]
-+		public float fixed_x { get; set; }
-+		[NoAccessorMethod]
-+		[Version (since = "0.8")]
-+		public float fixed_y { get; set; }
-+		[NoAccessorMethod]
-+		public bool has_clip { get; }
-+		[NoAccessorMethod]
-+		[Version (since = "1.2")]
-+		public bool has_pointer { get; }
-+		public float height { get; set; }
-+		[Version (since = "1.10")]
-+		public Clutter.Actor last_child { get; }
-+		[Version (since = "1.10")]
-+		public Clutter.LayoutManager layout_manager { get; set; }
-+		[NoAccessorMethod]
-+		public Clutter.ScalingFilter magnification_filter { get; set; }
-+		[NoAccessorMethod]
-+		[Version (since = "1.0")]
-+		public bool mapped { get; }
-+		[Version (since = "1.10")]
-+		public float margin_bottom { get; set; }
-+		[Version (since = "1.10")]
-+		public float margin_left { get; set; }
-+		[Version (since = "1.10")]
-+		public float margin_right { get; set; }
-+		[Version (since = "1.10")]
-+		public float margin_top { get; set; }
-+		[NoAccessorMethod]
-+		[Version (since = "0.8")]
-+		public float min_height { get; set; }
-+		[NoAccessorMethod]
-+		[Version (since = "0.8")]
-+		public bool min_height_set { get; set; }
-+		[NoAccessorMethod]
-+		[Version (since = "0.8")]
-+		public float min_width { get; set; }
-+		[NoAccessorMethod]
-+		[Version (since = "0.8")]
-+		public bool min_width_set { get; set; }
-+		[NoAccessorMethod]
-+		public Clutter.ScalingFilter minification_filter { get; set; }
-+		[Version (since = "0.2")]
-+		public string name { get; set; }
-+		[NoAccessorMethod]
-+		[Version (since = "0.8")]
-+		public float natural_height { get; set; }
-+		[NoAccessorMethod]
-+		[Version (since = "0.8")]
-+		public bool natural_height_set { get; set; }
-+		[NoAccessorMethod]
-+		[Version (since = "0.8")]
-+		public float natural_width { get; set; }
-+		[NoAccessorMethod]
-+		[Version (since = "0.8")]
-+		public bool natural_width_set { get; set; }
-+		[Version (since = "1.8")]
-+		public Clutter.OffscreenRedirect offscreen_redirect { get; set; }
-+		public uint opacity { get; set; }
-+		[NoAccessorMethod]
-+		[Version (since = "1.12")]
-+		public Graphene.Point pivot_point { owned get; set; }
-+		[Version (since = "1.12")]
-+		public float pivot_point_z { get; set; }
-+		[NoAccessorMethod]
-+		[Version (since = "1.12")]
-+		public Graphene.Point position { owned get; set; }
-+		[Version (since = "0.6")]
-+		public bool reactive { get; set; }
-+		[NoAccessorMethod]
-+		[Version (since = "1.0")]
-+		public bool realized { get; }
-+		[Version (since = "0.8")]
-+		public Clutter.RequestMode request_mode { get; set; }
-+		[NoAccessorMethod]
-+		[Version (since = "0.6")]
-+		public double rotation_angle_x { get; set; }
-+		[NoAccessorMethod]
-+		[Version (since = "0.6")]
-+		public double rotation_angle_y { get; set; }
-+		[NoAccessorMethod]
-+		[Version (since = "0.6")]
-+		public double rotation_angle_z { get; set; }
-+		[NoAccessorMethod]
-+		[Version (since = "0.6")]
-+		public double scale_x { get; set; }
-+		[NoAccessorMethod]
-+		[Version (since = "0.6")]
-+		public double scale_y { get; set; }
-+		[Version (since = "1.12")]
-+		public double scale_z { get; set; }
-+		[NoAccessorMethod]
-+		[Version (since = "0.8")]
-+		public bool show_on_set_parent { get; set; }
-+		[NoAccessorMethod]
-+		[Version (since = "1.12")]
-+		public Graphene.Size size { owned get; set; }
-+		[Version (since = "1.0")]
-+		public Clutter.TextDirection text_direction { get; set; }
-+		[Version (since = "1.12")]
-+		public Graphene.Matrix transform { get; set; }
-+		[NoAccessorMethod]
-+		[Version (since = "1.12")]
-+		public bool transform_set { get; }
-+		[NoAccessorMethod]
-+		[Version (since = "1.12")]
-+		public float translation_x { get; set; }
-+		[NoAccessorMethod]
-+		[Version (since = "1.12")]
-+		public float translation_y { get; set; }
-+		[NoAccessorMethod]
-+		[Version (since = "1.12")]
-+		public float translation_z { get; set; }
-+		[NoAccessorMethod]
-+		public bool visible { get; set; }
-+		public float width { get; set; }
-+		public float x { get; set; }
-+		[Version (since = "1.10")]
-+		public Clutter.ActorAlign x_align { get; set; }
-+		[Version (since = "1.12")]
-+		public bool x_expand { get; set; }
-+		public float y { get; set; }
-+		[Version (since = "1.10")]
-+		public Clutter.ActorAlign y_align { get; set; }
-+		[Version (since = "1.12")]
-+		public bool y_expand { get; set; }
-+		[Version (since = "1.12")]
-+		public float z_position { get; set; }
-+		[Version (since = "0.6")]
-+		public virtual signal bool button_press_event (Clutter.ButtonEvent event);
-+		[Version (since = "0.6")]
-+		public virtual signal bool button_release_event (Clutter.ButtonEvent event);
-+		[Version (since = "0.6")]
-+		public virtual signal bool captured_event (Clutter.Event event);
-+		[HasEmitter]
-+		[Version (since = "0.2")]
-+		public virtual signal void destroy ();
-+		[Version (since = "0.6")]
-+		public virtual signal bool enter_event (Clutter.CrossingEvent event);
-+		[Version (since = "0.6")]
-+		public virtual signal bool event (Clutter.Event event);
-+		[HasEmitter]
-+		[Version (since = "0.2")]
-+		public virtual signal void hide ();
-+		[Version (since = "0.6")]
-+		public virtual signal void key_focus_in ();
-+		[Version (since = "0.6")]
-+		public virtual signal void key_focus_out ();
-+		[Version (since = "0.6")]
-+		public virtual signal bool key_press_event (Clutter.KeyEvent event);
-+		[Version (since = "0.6")]
-+		public virtual signal bool key_release_event (Clutter.KeyEvent event);
-+		[Version (since = "0.6")]
-+		public virtual signal bool leave_event (Clutter.CrossingEvent event);
-+		[Version (since = "0.6")]
-+		public virtual signal bool motion_event (Clutter.MotionEvent event);
-+		[Version (since = "0.2")]
-+		public virtual signal void parent_set (Clutter.Actor? old_parent);
-+		[HasEmitter]
-+		[Version (since = "1.0")]
-+		public virtual signal void pick (Clutter.PickContext pick_context);
-+		[HasEmitter]
-+		[Version (since = "1.2")]
-+		public virtual signal void queue_relayout ();
-+		[HasEmitter]
-+		[Version (deprecated = true, deprecated_since = "1.16", since = "0.8")]
-+		public virtual signal void realize ();
-+		public virtual signal void resource_scale_changed ();
-+		[Version (since = "0.6")]
-+		public virtual signal bool scroll_event (Clutter.ScrollEvent event);
-+		[HasEmitter]
-+		[Version (since = "0.2")]
-+		public virtual signal void show ();
-+		public signal void stage_views_changed ();
-+		[Version (since = "1.12")]
-+		public virtual signal bool touch_event (Clutter.Event event);
-+		[Version (since = "1.12")]
-+		public signal void transition_stopped (string name, bool is_finished);
-+		[Version (since = "1.10")]
-+		public signal void transitions_completed ();
-+		[HasEmitter]
-+		[Version (deprecated = true, deprecated_since = "1.16", since = "0.8")]
-+		public virtual signal void unrealize ();
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_actor_meta_get_type ()")]
-+	public abstract class ActorMeta : GLib.InitiallyUnowned {
-+		[CCode (has_construct_function = false)]
-+		protected ActorMeta ();
-+		[Version (since = "1.4")]
-+		public unowned Clutter.Actor get_actor ();
-+		[Version (since = "1.4")]
-+		public bool get_enabled ();
-+		[Version (since = "1.4")]
-+		public unowned string get_name ();
-+		[NoWrapper]
-+		public virtual void set_actor (Clutter.Actor? actor);
-+		[Version (since = "1.4")]
-+		public virtual void set_enabled (bool is_enabled);
-+		[Version (since = "1.4")]
-+		public void set_name (string name);
-+		[Version (since = "1.4")]
-+		public Clutter.Actor actor { get; }
-+		[Version (since = "1.4")]
-+		public bool enabled { get; set; }
-+		[Version (since = "1.4")]
-+		public string name { get; set; }
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_actor_node_get_type ()")]
-+	public class ActorNode : Clutter.PaintNode {
-+		[CCode (has_construct_function = false, type = "ClutterPaintNode*")]
-+		public ActorNode (Clutter.Actor actor, int opacity);
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_align_constraint_get_type ()")]
-+	[Version (since = "1.4")]
-+	public class AlignConstraint : Clutter.Constraint {
-+		[CCode (has_construct_function = false, type = "ClutterConstraint*")]
-+		public AlignConstraint (Clutter.Actor? source, Clutter.AlignAxis axis, float factor);
-+		public Clutter.AlignAxis get_align_axis ();
-+		public float get_factor ();
-+		public Graphene.Point get_pivot_point ();
-+		public unowned Clutter.Actor get_source ();
-+		public void set_align_axis (Clutter.AlignAxis axis);
-+		public void set_factor (float factor);
-+		public void set_pivot_point (Graphene.Point pivot_point);
-+		public void set_source (Clutter.Actor? source);
-+		public Clutter.AlignAxis align_axis { get; set construct; }
-+		public float factor { get; set construct; }
-+		public Graphene.Point pivot_point { get; set; }
-+		public Clutter.Actor source { get; set construct; }
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
-+	[Compact]
-+	[Version (since = "0.2")]
-+	public class AnyEvent : Clutter.Event {
-+		public Clutter.EventFlags flags;
-+		public weak Clutter.Actor source;
-+		public weak Clutter.Stage stage;
-+		public uint32 time;
-+		public Clutter.EventType type;
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_backend_get_type ()")]
-+	[Version (since = "0.4")]
-+	public abstract class Backend : GLib.Object {
-+		[CCode (has_construct_function = false)]
-+		protected Backend ();
-+		[Version (since = "1.8")]
-+		public unowned Cogl.Context get_cogl_context ();
-+		public unowned Clutter.Seat get_default_seat ();
-+		[Version (since = "0.8")]
-+		public unowned Cairo.FontOptions get_font_options ();
-+		public unowned Clutter.InputMethod get_input_method ();
-+		public double get_resolution ();
-+		[Version (since = "0.8")]
-+		public void set_font_options (Cairo.FontOptions options);
-+		public void set_input_method (Clutter.InputMethod method);
-+		[Version (since = "1.0")]
-+		public signal void font_changed ();
-+		[Version (since = "1.0")]
-+		public signal void resolution_changed ();
-+		[Version (since = "1.4")]
-+		public signal void settings_changed ();
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_bin_layout_get_type ()")]
-+	[Version (since = "1.2")]
-+	public class BinLayout : Clutter.LayoutManager {
-+		[CCode (has_construct_function = false, type = "ClutterLayoutManager*")]
-+		public BinLayout (Clutter.BinAlignment x_align = Clutter.BinAlignment.START, Clutter.BinAlignment y_align = Clutter.BinAlignment.START);
-+		[NoAccessorMethod]
-+		[Version (deprecated = true, deprecated_since = "1.12", since = "1.2")]
-+		public Clutter.BinAlignment x_align { get; set; }
-+		[NoAccessorMethod]
-+		[Version (deprecated = true, deprecated_since = "1.12", since = "1.2")]
-+		public Clutter.BinAlignment y_align { get; set; }
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_bind_constraint_get_type ()")]
-+	[Version (since = "1.4")]
-+	public class BindConstraint : Clutter.Constraint {
-+		[CCode (has_construct_function = false, type = "ClutterConstraint*")]
-+		public BindConstraint (Clutter.Actor? source, Clutter.BindCoordinate coordinate, float offset);
-+		public Clutter.BindCoordinate get_coordinate ();
-+		public float get_offset ();
-+		public unowned Clutter.Actor get_source ();
-+		public void set_coordinate (Clutter.BindCoordinate coordinate);
-+		public void set_offset (float offset);
-+		public void set_source (Clutter.Actor? source);
-+		public Clutter.BindCoordinate coordinate { get; set construct; }
-+		public float offset { get; set construct; }
-+		public Clutter.Actor source { get; set construct; }
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_binding_pool_get_type ()")]
-+	[Version (since = "1.0")]
-+	public class BindingPool : GLib.Object {
-+		[CCode (has_construct_function = false)]
-+		public BindingPool (string name);
-+		public bool activate (uint key_val, Clutter.ModifierType modifiers, GLib.Object gobject);
-+		public void block_action (string action_name);
-+		public static unowned Clutter.BindingPool find (string name);
-+		public unowned string find_action (uint key_val, Clutter.ModifierType modifiers);
-+		public static unowned Clutter.BindingPool get_for_class (void* klass);
-+		public void install_action (string action_name, uint key_val, Clutter.ModifierType modifiers, owned Clutter.BindingActionFunc callback);
-+		public void install_closure (string action_name, uint key_val, Clutter.ModifierType modifiers, GLib.Closure closure);
-+		public void override_action (uint key_val, Clutter.ModifierType modifiers, owned GLib.Callback callback);
-+		public void override_closure (uint key_val, Clutter.ModifierType modifiers, GLib.Closure closure);
-+		public void remove_action (uint key_val, Clutter.ModifierType modifiers);
-+		public void unblock_action (string action_name);
-+		[NoAccessorMethod]
-+		public string name { owned get; construct; }
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_blit_node_get_type ()")]
-+	public class BlitNode : Clutter.PaintNode {
-+		[CCode (has_construct_function = false, type = "ClutterPaintNode*")]
-+		public BlitNode (Cogl.Framebuffer src);
-+		public void add_blit_rectangle (int src_x, int src_y, int dst_x, int dst_y, int width, int height);
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_blur_effect_get_type ()")]
-+	[Version (since = "1.4")]
-+	public class BlurEffect : Clutter.OffscreenEffect {
-+		[CCode (has_construct_function = false, type = "ClutterEffect*")]
-+		public BlurEffect ();
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_blur_node_get_type ()")]
-+	public class BlurNode : Clutter.LayerNode {
-+		[CCode (has_construct_function = false, type = "ClutterPaintNode*")]
-+		public BlurNode (uint width, uint height, float sigma);
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_box_layout_get_type ()")]
-+	[Version (since = "1.2")]
-+	public class BoxLayout : Clutter.LayoutManager {
-+		[CCode (has_construct_function = false, type = "ClutterLayoutManager*")]
-+		public BoxLayout ();
-+		[Version (since = "1.4")]
-+		public bool get_homogeneous ();
-+		[Version (since = "1.12")]
-+		public Clutter.Orientation get_orientation ();
-+		public bool get_pack_start ();
-+		public uint get_spacing ();
-+		[Version (since = "1.4")]
-+		public void set_homogeneous (bool homogeneous);
-+		[Version (since = "1.12")]
-+		public void set_orientation (Clutter.Orientation orientation);
-+		public void set_pack_start (bool pack_start);
-+		public void set_spacing (uint spacing);
-+		[Version (since = "1.4")]
-+		public bool homogeneous { get; set; }
-+		[Version (since = "1.12")]
-+		public Clutter.Orientation orientation { get; set; }
-+		public bool pack_start { get; set; }
-+		public uint spacing { get; set; }
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_brightness_contrast_effect_get_type ()")]
-+	[Version (since = "1.10")]
-+	public class BrightnessContrastEffect : Clutter.OffscreenEffect {
-+		[CCode (has_construct_function = false, type = "ClutterEffect*")]
-+		public BrightnessContrastEffect ();
-+		public void get_brightness (out float red, out float green, out float blue);
-+		public void get_contrast (out float red, out float green, out float blue);
-+		public void set_brightness (float brightness);
-+		public void set_brightness_full (float red, float green, float blue);
-+		public void set_contrast (float contrast);
-+		public void set_contrast_full (float red, float green, float blue);
-+		[NoAccessorMethod]
-+		public Clutter.Color brightness { owned get; set; }
-+		[NoAccessorMethod]
-+		public Clutter.Color contrast { owned get; set; }
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
-+	[Compact]
-+	[Version (since = "0.2")]
-+	public class ButtonEvent : Clutter.Event {
-+		public double axes;
-+		public uint32 button;
-+		public uint click_count;
-+		public weak Clutter.InputDevice device;
-+		public uint32 evdev_code;
-+		public Clutter.EventFlags flags;
-+		public Clutter.ModifierType modifier_state;
-+		public weak Clutter.Actor source;
-+		public weak Clutter.Stage stage;
-+		public uint32 time;
-+		public Clutter.EventType type;
-+		public float x;
-+		public float y;
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_canvas_get_type ()")]
-+	[Version (since = "1.10")]
-+	public class Canvas : GLib.Object, Clutter.Content {
-+		[CCode (has_construct_function = false, type = "ClutterContent*")]
-+		public Canvas ();
-+		public float get_scale_factor ();
-+		public void set_scale_factor (float scale);
-+		public bool set_size (int width, int height);
-+		[NoAccessorMethod]
-+		public int height { get; set; }
-+		public float scale_factor { get; set; }
-+		[NoAccessorMethod]
-+		public int width { get; set; }
-+		public virtual signal bool draw (Cairo.Context cr, int width, int height);
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_child_meta_get_type ()")]
-+	[Version (since = "0.8")]
-+	public abstract class ChildMeta : GLib.Object {
-+		[CCode (has_construct_function = false)]
-+		protected ChildMeta ();
-+		public unowned Clutter.Actor get_actor ();
-+		public unowned Clutter.Container get_container ();
-+		public Clutter.Actor actor { get; construct; }
-+		public Clutter.Container container { get; construct; }
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_click_action_get_type ()")]
-+	public class ClickAction : Clutter.Action {
-+		[CCode (has_construct_function = false, type = "ClutterAction*")]
-+		[Version (since = "1.4")]
-+		public ClickAction ();
-+		[Version (since = "1.4")]
-+		public uint get_button ();
-+		[Version (since = "1.8")]
-+		public void get_coords (out float press_x, out float press_y);
-+		[Version (since = "1.6")]
-+		public Clutter.ModifierType get_state ();
-+		[Version (since = "1.4")]
-+		public void release ();
-+		[NoAccessorMethod]
-+		[Version (since = "1.4")]
-+		public bool held { get; }
-+		[NoAccessorMethod]
-+		[Version (since = "1.8")]
-+		public int long_press_duration { get; set; }
-+		[NoAccessorMethod]
-+		[Version (since = "1.8")]
-+		public int long_press_threshold { get; set; }
-+		[NoAccessorMethod]
-+		[Version (since = "1.4")]
-+		public bool pressed { get; }
-+		[Version (since = "1.4")]
-+		public virtual signal void clicked (Clutter.Actor actor);
-+		[Version (since = "1.8")]
-+		public virtual signal bool long_press (Clutter.Actor actor, Clutter.LongPressState state);
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_clip_node_get_type ()")]
-+	[Version (since = "1.10")]
-+	public class ClipNode : Clutter.PaintNode {
-+		[CCode (has_construct_function = false, type = "ClutterPaintNode*")]
-+		public ClipNode ();
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_clone_get_type ()")]
-+	[Version (since = "1.0")]
-+	public class Clone : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
-+		[CCode (has_construct_function = false, type = "ClutterActor*")]
-+		public Clone (Clutter.Actor source);
-+		public unowned Clutter.Actor get_source ();
-+		public void set_source (Clutter.Actor? source);
-+		public Clutter.Actor source { get; set construct; }
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_color_node_get_type ()")]
-+	[Version (since = "1.10")]
-+	public class ColorNode : Clutter.PipelineNode {
-+		[CCode (has_construct_function = false, type = "ClutterPaintNode*")]
-+		public ColorNode (Clutter.Color? color);
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_colorize_effect_get_type ()")]
-+	[Version (since = "1.4")]
-+	public class ColorizeEffect : Clutter.OffscreenEffect {
-+		[CCode (has_construct_function = false, type = "ClutterEffect*")]
-+		public ColorizeEffect (Clutter.Color tint);
-+		public Clutter.Color get_tint ();
-+		public void set_tint (Clutter.Color tint);
-+		public Clutter.Color tint { get; set; }
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_constraint_get_type ()")]
-+	[Version (since = "1.4")]
-+	public abstract class Constraint : Clutter.ActorMeta {
-+		[CCode (has_construct_function = false)]
-+		protected Constraint ();
-+		[NoWrapper]
-+		public virtual void update_allocation (Clutter.Actor actor, Clutter.ActorBox allocation);
-+		public virtual void update_preferred_size (Clutter.Actor actor, Clutter.Orientation direction, float for_size, ref float minimum_size, ref float natural_size);
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
-+	[Compact]
-+	[Version (since = "0.2")]
-+	public class CrossingEvent : Clutter.Event {
-+		public weak Clutter.InputDevice device;
-+		public Clutter.EventFlags flags;
-+		public weak Clutter.Actor related;
-+		public weak Clutter.EventSequence sequence;
-+		public weak Clutter.Actor source;
-+		public weak Clutter.Stage stage;
-+		public uint32 time;
-+		public Clutter.EventType type;
-+		public float x;
-+		public float y;
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_deform_effect_get_type ()")]
-+	[Version (since = "1.4")]
-+	public abstract class DeformEffect : Clutter.OffscreenEffect {
-+		[CCode (has_construct_function = false)]
-+		protected DeformEffect ();
-+		[NoWrapper]
-+		public virtual void deform_vertex (float width, float height, Cogl.TextureVertex vertex);
-+		public unowned Cogl.Handle get_back_material ();
-+		public void get_n_tiles (out uint x_tiles, out uint y_tiles);
-+		public void invalidate ();
-+		public void set_back_material (Cogl.Handle? material);
-+		public void set_n_tiles (uint x_tiles, uint y_tiles);
-+		[NoAccessorMethod]
-+		public uint x_tiles { get; set; }
-+		[NoAccessorMethod]
-+		public uint y_tiles { get; set; }
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_desaturate_effect_get_type ()")]
-+	[Version (since = "1.4")]
-+	public class DesaturateEffect : Clutter.OffscreenEffect {
-+		[CCode (has_construct_function = false, type = "ClutterEffect*")]
-+		public DesaturateEffect (double factor);
-+		public double get_factor ();
-+		public void set_factor (double factor);
-+		public double factor { get; set; }
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
-+	[Compact]
-+	public class DeviceEvent : Clutter.Event {
-+		public weak Clutter.InputDevice device;
-+		public Clutter.EventFlags flags;
-+		public weak Clutter.Actor source;
-+		public weak Clutter.Stage stage;
-+		public uint32 time;
-+		public Clutter.EventType type;
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_effect_get_type ()")]
-+	[Version (since = "1.4")]
-+	public abstract class Effect : Clutter.ActorMeta {
-+		[CCode (has_construct_function = false)]
-+		protected Effect ();
-+		[NoWrapper]
-+		public virtual bool modify_paint_volume (Clutter.PaintVolume volume);
-+		[NoWrapper]
-+		public virtual void paint (Clutter.PaintNode node, Clutter.PaintContext paint_context, Clutter.EffectPaintFlags flags);
-+		[NoWrapper]
-+		public virtual void paint_node (Clutter.PaintNode node, Clutter.PaintContext paint_context, Clutter.EffectPaintFlags flags);
-+		[NoWrapper]
-+		public virtual void pick (Clutter.PickContext pick_context);
-+		[NoWrapper]
-+		public virtual void post_paint (Clutter.PaintNode node, Clutter.PaintContext paint_context);
-+		[NoWrapper]
-+		public virtual bool pre_paint (Clutter.PaintNode node, Clutter.PaintContext paint_context);
-+		[Version (since = "1.8")]
-+		public void queue_repaint ();
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_event_get_type ()")]
-+	[Compact]
-+	[Version (since = "0.2")]
-+	public class Event {
-+		public Clutter.EventType type;
-+		[CCode (has_construct_function = false)]
-+		public Event (Clutter.EventType type);
-+		[Version (since = "1.18")]
-+		public static uint add_filter (Clutter.Stage? stage, [CCode (delegate_target_pos = 2.2, destroy_notify_pos = 2.1)] owned Clutter.EventFilterFunc func);
-+		public Clutter.Event copy ();
-+		public void free ();
-+		[Version (since = "0.4")]
-+		public static Clutter.Event @get ();
-+		[Version (since = "1.12")]
-+		public double get_angle (Clutter.Event target);
-+		[Version (since = "1.6")]
-+		public double get_axes (out uint n_axes);
-+		[Version (since = "1.0")]
-+		public uint32 get_button ();
-+		[Version (since = "1.0")]
-+		public uint get_click_count ();
-+		[Version (since = "0.4")]
-+		public void get_coords (out float x, out float y);
-+		[Version (since = "1.0")]
-+		public unowned Clutter.InputDevice get_device ();
-+		[Version (since = "1.28")]
-+		public unowned Clutter.InputDeviceTool get_device_tool ();
-+		[Version (since = "1.0")]
-+		public Clutter.InputDeviceType get_device_type ();
-+		[Version (since = "1.12")]
-+		public float get_distance (Clutter.Event target);
-+		public uint32 get_event_code ();
-+		[Version (since = "1.10")]
-+		public unowned Clutter.EventSequence get_event_sequence ();
-+		[Version (since = "1.0")]
-+		public Clutter.EventFlags get_flags ();
-+		[Version (since = "1.24")]
-+		public void get_gesture_motion_delta (out double dx, out double dy);
-+		public Clutter.TouchpadGesturePhase get_gesture_phase ();
-+		[Version (since = "1.24")]
-+		public double get_gesture_pinch_angle_delta ();
-+		[Version (since = "1.24")]
-+		public double get_gesture_pinch_scale ();
-+		[Version (since = "1.0")]
-+		public uint16 get_key_code ();
-+		[Version (since = "1.0")]
-+		public uint get_key_symbol ();
-+		public unichar get_key_unicode ();
-+		public uint get_mode_group ();
-+		public bool get_pad_event_details (out uint number, out uint mode, out double value);
-+		[Version (since = "1.12")]
-+		public Graphene.Point get_position ();
-+		[Version (since = "1.0")]
-+		public unowned Clutter.Actor get_related ();
-+		public bool get_relative_motion (double dx, double dy, double dx_unaccel, double dy_unaccel);
-+		[Version (since = "1.10")]
-+		public void get_scroll_delta (out double dx, out double dy);
-+		[Version (since = "1.0")]
-+		public Clutter.ScrollDirection get_scroll_direction ();
-+		[Version (since = "1.26")]
-+		public Clutter.ScrollFinishFlags get_scroll_finish_flags ();
-+		[Version (since = "1.26")]
-+		public Clutter.ScrollSource get_scroll_source ();
-+		[Version (since = "0.6")]
-+		public unowned Clutter.Actor get_source ();
-+		[Version (since = "1.6")]
-+		public unowned Clutter.InputDevice get_source_device ();
-+		[Version (since = "0.8")]
-+		public unowned Clutter.Stage get_stage ();
-+		[Version (since = "0.4")]
-+		public Clutter.ModifierType get_state ();
-+		[Version (since = "1.16")]
-+		public void get_state_full (out Clutter.ModifierType button_state, out Clutter.ModifierType base_state, out Clutter.ModifierType latched_state, out Clutter.ModifierType locked_state, out Clutter.ModifierType effective_state);
-+		[Version (since = "0.4")]
-+		public uint32 get_time ();
-+		public int64 get_time_us ();
-+		[Version (since = "1.24")]
-+		public uint get_touchpad_gesture_finger_count ();
-+		[CCode (cname = "clutter_event_type")]
-+		public Clutter.EventType get_type ();
-+		[Version (since = "1.12")]
-+		public bool has_control_modifier ();
-+		[Version (since = "1.12")]
-+		public bool has_shift_modifier ();
-+		[Version (since = "1.12")]
-+		public bool is_pointer_emulated ();
-+		[Version (since = "0.6")]
-+		public void put ();
-+		[Version (since = "1.18")]
-+		public static void remove_filter (uint id);
-+		[Version (since = "1.8")]
-+		public void set_button (uint32 button);
-+		[Version (since = "1.8")]
-+		public void set_coords (float x, float y);
-+		[Version (since = "1.6")]
-+		public void set_device (Clutter.InputDevice? device);
-+		[Version (since = "1.28")]
-+		public void set_device_tool (Clutter.InputDeviceTool? tool);
-+		[Version (since = "1.8")]
-+		public void set_flags (Clutter.EventFlags flags);
-+		[Version (since = "1.8")]
-+		public void set_key_code (uint16 key_code);
-+		[Version (since = "1.8")]
-+		public void set_key_symbol (uint key_sym);
-+		[Version (since = "1.8")]
-+		public void set_key_unicode (unichar key_unicode);
-+		[Version (since = "1.8")]
-+		public void set_related (Clutter.Actor? actor);
-+		[Version (since = "1.10")]
-+		public void set_scroll_delta (double dx, double dy);
-+		[Version (since = "1.8")]
-+		public void set_scroll_direction (Clutter.ScrollDirection direction);
-+		[Version (since = "1.8")]
-+		public void set_source (Clutter.Actor? actor);
-+		[Version (since = "1.8")]
-+		public void set_source_device (Clutter.InputDevice? device);
-+		[Version (since = "1.8")]
-+		public void set_stage (Clutter.Stage? stage);
-+		[Version (since = "1.8")]
-+		public void set_state (Clutter.ModifierType state);
-+		[Version (since = "1.8")]
-+		public void set_time (uint32 time_);
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_event_sequence_get_type ()")]
-+	[Compact]
-+	[Version (since = "1.12")]
-+	public class EventSequence {
-+		public int32 get_slot ();
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_fixed_layout_get_type ()")]
-+	[Version (since = "1.2")]
-+	public class FixedLayout : Clutter.LayoutManager {
-+		[CCode (has_construct_function = false, type = "ClutterLayoutManager*")]
-+		public FixedLayout ();
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_flow_layout_get_type ()")]
-+	[Version (since = "1.2")]
-+	public class FlowLayout : Clutter.LayoutManager {
-+		[CCode (has_construct_function = false, type = "ClutterLayoutManager*")]
-+		public FlowLayout (Clutter.FlowOrientation orientation);
-+		public float get_column_spacing ();
-+		public void get_column_width (out float min_width, out float max_width);
-+		public bool get_homogeneous ();
-+		public Clutter.FlowOrientation get_orientation ();
-+		public void get_row_height (out float min_height, out float max_height);
-+		public float get_row_spacing ();
-+		[Version (since = "1.16")]
-+		public bool get_snap_to_grid ();
-+		public void set_column_spacing (float spacing);
-+		public void set_column_width (float min_width, float max_width);
-+		public void set_homogeneous (bool homogeneous);
-+		public void set_orientation (Clutter.FlowOrientation orientation);
-+		public void set_row_height (float min_height, float max_height);
-+		public void set_row_spacing (float spacing);
-+		[Version (since = "1.16")]
-+		public void set_snap_to_grid (bool snap_to_grid);
-+		public float column_spacing { get; set; }
-+		public bool homogeneous { get; set; }
-+		[NoAccessorMethod]
-+		public float max_column_width { get; set; }
-+		[NoAccessorMethod]
-+		public float max_row_height { get; set; }
-+		[NoAccessorMethod]
-+		public float min_column_width { get; set; }
-+		[NoAccessorMethod]
-+		public float min_row_height { get; set; }
-+		public Clutter.FlowOrientation orientation { get; set construct; }
-+		public float row_spacing { get; set; }
-+		[Version (since = "1.16")]
-+		public bool snap_to_grid { get; set; }
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
-+	[Compact]
-+	public class Frame {
-+		public bool has_result ();
-+		public void set_result (Clutter.FrameResult result);
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_frame_clock_get_type ()")]
-+	public class FrameClock : GLib.Object {
-+		[CCode (has_construct_function = false)]
-+		protected FrameClock ();
-+		public void add_timeline (Clutter.Timeline timeline);
-+		public float get_refresh_rate ();
-+		public void inhibit ();
-+		public void notify_ready ();
-+		public void remove_timeline (Clutter.Timeline timeline);
-+		public void schedule_update ();
-+		public void schedule_update_now ();
-+		public void uninhibit ();
-+		[HasEmitter]
-+		public signal void destroy ();
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_gesture_action_get_type ()")]
-+	public class GestureAction : Clutter.Action {
-+		[CCode (has_construct_function = false, type = "ClutterAction*")]
-+		[Version (since = "1.8")]
-+		public GestureAction ();
-+		[Version (since = "1.12")]
-+		public void cancel ();
-+		[NoWrapper]
-+		public virtual bool gesture_prepare (Clutter.Actor actor);
-+		[Version (since = "1.12")]
-+		public unowned Clutter.InputDevice get_device (uint point);
-+		[Version (since = "1.14")]
-+		public unowned Clutter.Event get_last_event (uint point);
-+		[Version (since = "1.8")]
-+		public void get_motion_coords (uint point, out float motion_x, out float motion_y);
-+		[Version (since = "1.12")]
-+		public float get_motion_delta (uint point, out float delta_x, out float delta_y);
-+		[Version (since = "1.12")]
-+		public uint get_n_current_points ();
-+		[Version (since = "1.12")]
-+		public int get_n_touch_points ();
-+		[Version (since = "1.8")]
-+		public void get_press_coords (uint point, out float press_x, out float press_y);
-+		[Version (since = "1.8")]
-+		public void get_release_coords (uint point, out float release_x, out float release_y);
-+		[Version (since = "1.12")]
-+		public unowned Clutter.EventSequence get_sequence (uint point);
-+		[Version (since = "1.18")]
-+		public void get_threshold_trigger_distance (out float x, out float y);
-+		[Version (since = "1.20")]
-+		public Clutter.GestureTriggerEdge get_threshold_trigger_edge ();
-+		[Version (deprecated = true, deprecated_since = "1.20", since = "1.18")]
-+		public Clutter.GestureTriggerEdge get_threshold_trigger_egde ();
-+		[Version (since = "1.12")]
-+		public float get_velocity (uint point, out float velocity_x, out float velocity_y);
-+		[Version (since = "1.12")]
-+		public void set_n_touch_points (int nb_points);
-+		[Version (since = "1.18")]
-+		public void set_threshold_trigger_distance (float x, float y);
-+		[Version (since = "1.18")]
-+		public void set_threshold_trigger_edge (Clutter.GestureTriggerEdge edge);
-+		[Version (since = "1.16")]
-+		public int n_touch_points { get; set; }
-+		[NoAccessorMethod]
-+		[Version (since = "1.18")]
-+		public float threshold_trigger_distance_x { get; construct; }
-+		[NoAccessorMethod]
-+		[Version (since = "1.18")]
-+		public float threshold_trigger_distance_y { get; construct; }
-+		[Version (since = "1.18")]
-+		public Clutter.GestureTriggerEdge threshold_trigger_edge { get; construct; }
-+		[Version (since = "1.8")]
-+		public virtual signal bool gesture_begin (Clutter.Actor actor);
-+		[Version (since = "1.8")]
-+		public virtual signal void gesture_cancel (Clutter.Actor actor);
-+		[Version (since = "1.8")]
-+		public virtual signal void gesture_end (Clutter.Actor actor);
-+		[Version (since = "1.8")]
-+		public virtual signal bool gesture_progress (Clutter.Actor actor);
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_grid_layout_get_type ()")]
-+	[Version (since = "1.12")]
-+	public class GridLayout : Clutter.LayoutManager {
-+		[CCode (has_construct_function = false, type = "ClutterLayoutManager*")]
-+		public GridLayout ();
-+		public void attach (Clutter.Actor child, int left, int top, int width, int height);
-+		public void attach_next_to (Clutter.Actor child, Clutter.Actor? sibling, Clutter.GridPosition side, int width, int height);
-+		public unowned Clutter.Actor get_child_at (int left, int top);
-+		public bool get_column_homogeneous ();
-+		public uint get_column_spacing ();
-+		public Clutter.Orientation get_orientation ();
-+		public bool get_row_homogeneous ();
-+		public uint get_row_spacing ();
-+		public void insert_column (int position);
-+		public void insert_next_to (Clutter.Actor sibling, Clutter.GridPosition side);
-+		public void insert_row (int position);
-+		public void set_column_homogeneous (bool homogeneous);
-+		public void set_column_spacing (uint spacing);
-+		public void set_orientation (Clutter.Orientation orientation);
-+		public void set_row_homogeneous (bool homogeneous);
-+		public void set_row_spacing (uint spacing);
-+		public bool column_homogeneous { get; set; }
-+		public uint column_spacing { get; set; }
-+		public Clutter.Orientation orientation { get; set; }
-+		public bool row_homogeneous { get; set; }
-+		public uint row_spacing { get; set; }
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
-+	[Compact]
-+	public class IMEvent : Clutter.Event {
-+		public Clutter.EventFlags flags;
-+		public uint32 len;
-+		public int32 offset;
-+		public weak Clutter.Actor source;
-+		public weak Clutter.Stage stage;
-+		public weak string text;
-+		public uint32 time;
-+		public Clutter.EventType type;
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_image_get_type ()")]
-+	[Version (since = "1.10")]
-+	public class Image : GLib.Object, Clutter.Content {
-+		[CCode (has_construct_function = false, type = "ClutterContent*")]
-+		public Image ();
-+		public unowned Cogl.Texture get_texture ();
-+		public bool set_area ([CCode (array_length = false)] uint8[] data, Cogl.PixelFormat pixel_format, Cairo.RectangleInt rect, uint row_stride) throws GLib.Error;
-+		[Version (since = "1.12")]
-+		public bool set_bytes (GLib.Bytes data, Cogl.PixelFormat pixel_format, uint width, uint height, uint row_stride) throws GLib.Error;
-+		public bool set_data ([CCode (array_length = false)] uint8[] data, Cogl.PixelFormat pixel_format, uint width, uint height, uint row_stride) throws GLib.Error;
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_input_device_get_type ()")]
-+	public class InputDevice : GLib.Object {
-+		[CCode (has_construct_function = false)]
-+		protected InputDevice ();
-+		public Clutter.InputAxis get_axis (uint index_);
-+		public bool get_axis_value (double axes, Clutter.InputAxis axis, double value);
-+		[Version (since = "1.6")]
-+		public Clutter.InputMode get_device_mode ();
-+		[Version (since = "1.2")]
-+		public unowned string get_device_name ();
-+		public unowned string get_device_node ();
-+		[Version (since = "1.0")]
-+		public Clutter.InputDeviceType get_device_type ();
-+		[Version (since = "1.10")]
-+		public unowned Clutter.Actor get_grabbed_actor ();
-+		public virtual int get_group_n_modes (int group);
-+		[Version (since = "1.6")]
-+		public bool get_has_cursor ();
-+		public int get_mode_switch_button_group (uint button);
-+		public uint get_n_axes ();
-+		public int get_n_buttons ();
-+		public int get_n_mode_groups ();
-+		public int get_n_rings ();
-+		public int get_n_strips ();
-+		public virtual int get_pad_feature_group (Clutter.InputDevicePadFeature feature, int n_feature);
-+		[Version (since = "1.22")]
-+		public unowned string get_product_id ();
-+		public unowned Clutter.Seat get_seat ();
-+		[Version (since = "1.22")]
-+		public unowned string get_vendor_id ();
-+		[Version (since = "1.10")]
-+		public void grab (Clutter.Actor actor);
-+		public virtual bool is_grouped (Clutter.InputDevice other_device);
-+		public virtual bool is_mode_switch_button (uint group, uint button);
-+		[Version (since = "1.12")]
-+		public unowned Clutter.Actor sequence_get_grabbed_actor (Clutter.EventSequence sequence);
-+		[Version (since = "1.12")]
-+		public void sequence_grab (Clutter.EventSequence sequence, Clutter.Actor actor);
-+		[Version (since = "1.12")]
-+		public void sequence_ungrab (Clutter.EventSequence sequence);
-+		[Version (since = "1.10")]
-+		public void ungrab ();
-+		[NoAccessorMethod]
-+		[Version (since = "1.6")]
-+		public Clutter.Backend backend { owned get; construct; }
-+		public Clutter.InputMode device_mode { get; construct; }
-+		public string device_node { get; construct; }
-+		[Version (since = "1.2")]
-+		public Clutter.InputDeviceType device_type { get; construct; }
-+		[Version (since = "1.6")]
-+		public bool has_cursor { get; construct; }
-+		public int n_buttons { get; construct; }
-+		public int n_mode_groups { get; construct; }
-+		public int n_rings { get; construct; }
-+		public int n_strips { get; construct; }
-+		[NoAccessorMethod]
-+		[Version (since = "1.2")]
-+		public string name { owned get; construct; }
-+		[Version (since = "1.22")]
-+		public string product_id { get; construct; }
-+		public Clutter.Seat seat { get; construct; }
-+		[Version (since = "1.22")]
-+		public string vendor_id { get; construct; }
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_input_device_tool_get_type ()")]
-+	public abstract class InputDeviceTool : GLib.Object {
-+		[CCode (has_construct_function = false)]
-+		protected InputDeviceTool ();
-+		public Clutter.InputAxisFlags get_axes ();
-+		public uint64 get_id ();
-+		[Version (since = "1.28")]
-+		public uint64 get_serial ();
-+		[Version (since = "1.28")]
-+		public Clutter.InputDeviceToolType get_tool_type ();
-+		public Clutter.InputAxisFlags axes { get; construct; }
-+		public uint64 id { get; construct; }
-+		public uint64 serial { get; construct; }
-+		[NoAccessorMethod]
-+		public Clutter.InputDeviceToolType type { get; construct; }
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_input_focus_get_type ()")]
-+	public abstract class InputFocus : GLib.Object {
-+		[CCode (has_construct_function = false)]
-+		protected InputFocus ();
-+		[NoWrapper]
-+		public virtual void commit_text (string text);
-+		[NoWrapper]
-+		public virtual void delete_surrounding (int offset, uint len);
-+		public bool filter_event (Clutter.Event event);
-+		[NoWrapper]
-+		public virtual void focus_in (Clutter.InputMethod input_method);
-+		[NoWrapper]
-+		public virtual void focus_out ();
-+		public bool is_focused ();
-+		[NoWrapper]
-+		public virtual void request_surrounding ();
-+		public void reset ();
-+		public void set_can_show_preedit (bool can_show_preedit);
-+		public void set_content_hints (Clutter.InputContentHintFlags hint);
-+		public void set_content_purpose (Clutter.InputContentPurpose purpose);
-+		public void set_cursor_location (Graphene.Rect rect);
-+		public void set_input_panel_state (Clutter.InputPanelState state);
-+		[NoWrapper]
-+		public virtual void set_preedit_text (string preedit, uint cursor);
-+		public void set_surrounding (string text, uint cursor, uint anchor);
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_input_method_get_type ()")]
-+	public abstract class InputMethod : GLib.Object {
-+		[CCode (has_construct_function = false)]
-+		protected InputMethod ();
-+		[NoWrapper]
-+		public virtual bool filter_key_event (Clutter.Event key);
-+		public virtual void focus_in (Clutter.InputFocus actor);
-+		public virtual void focus_out ();
-+		public void forward_key (uint32 keyval, uint32 keycode, uint32 state, uint64 time_, bool press);
-+		public void notify_key_event (Clutter.Event event, bool filtered);
-+		[NoWrapper]
-+		public virtual void reset ();
-+		[NoWrapper]
-+		public virtual void set_cursor_location (Graphene.Rect rect);
-+		public void set_input_panel_state (Clutter.InputPanelState state);
-+		public void set_preedit_text (string? preedit, uint cursor);
-+		[NoWrapper]
-+		public virtual void set_surrounding (string text, uint cursor, uint anchor);
-+		[NoWrapper]
-+		public virtual void update_content_hints (Clutter.InputContentHintFlags hint);
-+		[NoWrapper]
-+		public virtual void update_content_purpose (Clutter.InputContentPurpose purpose);
-+		[NoAccessorMethod]
-+		public bool can_show_preedit { get; set; }
-+		[NoAccessorMethod]
-+		public Clutter.InputContentHintFlags content_hints { get; set; }
-+		[NoAccessorMethod]
-+		public Clutter.InputContentPurpose content_purpose { get; set; }
-+		[HasEmitter]
-+		public signal void commit (string text);
-+		public signal void cursor_location_changed (Graphene.Rect object);
-+		[HasEmitter]
-+		public signal void delete_surrounding (int offset, uint len);
-+		public signal void input_panel_state (Clutter.InputPanelState object);
-+		[HasEmitter]
-+		public signal void request_surrounding ();
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_interval_get_type ()")]
-+	[Version (since = "1.0")]
-+	public class Interval : GLib.InitiallyUnowned, Clutter.Scriptable {
-+		[CCode (has_construct_function = false)]
-+		public Interval (GLib.Type gtype, ...);
-+		public Clutter.Interval clone ();
-+		[Version (since = "1.4")]
-+		public unowned GLib.Value? compute (double factor);
-+		public virtual bool compute_value (double factor, out GLib.Value value);
-+		public GLib.Value get_final_value ();
-+		public GLib.Value get_initial_value ();
-+		public void get_interval (...);
-+		public GLib.Type get_value_type ();
-+		[Version (since = "1.12")]
-+		public bool is_valid ();
-+		public unowned GLib.Value? peek_final_value ();
-+		public unowned GLib.Value? peek_initial_value ();
-+		public static void register_progress_func (GLib.Type value_type, Clutter.ProgressFunc func);
-+		[Version (since = "1.10")]
-+		public void set_final (...);
-+		public void set_final_value (GLib.Value value);
-+		[Version (since = "1.10")]
-+		public void set_initial (...);
-+		public void set_initial_value (GLib.Value value);
-+		public void set_interval (...);
-+		public virtual bool validate (GLib.ParamSpec pspec);
-+		[CCode (has_construct_function = false)]
-+		public Interval.with_values (GLib.Type gtype, GLib.Value? initial, GLib.Value? final);
-+		[NoAccessorMethod]
-+		[Version (since = "1.12")]
-+		public GLib.Value final { owned get; set; }
-+		[NoAccessorMethod]
-+		[Version (since = "1.12")]
-+		public GLib.Value initial { owned get; set; }
-+		public GLib.Type value_type { get; construct; }
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
-+	[Compact]
-+	[Version (since = "0.2")]
-+	public class KeyEvent : Clutter.Event {
-+		public weak Clutter.InputDevice device;
-+		public uint32 evdev_code;
-+		public Clutter.EventFlags flags;
-+		public uint16 hardware_keycode;
-+		public uint keyval;
-+		public Clutter.ModifierType modifier_state;
-+		public weak Clutter.Actor source;
-+		public weak Clutter.Stage stage;
-+		public uint32 time;
-+		public Clutter.EventType type;
-+		public unichar unicode_value;
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_keyframe_transition_get_type ()")]
-+	[Version (since = "1.12")]
-+	public class KeyframeTransition : Clutter.PropertyTransition, Clutter.Scriptable {
-+		[CCode (has_construct_function = false, type = "ClutterTransition*")]
-+		public KeyframeTransition (string property_name);
-+		public void clear ();
-+		public void get_key_frame (uint index_, out double key, out Clutter.AnimationMode mode, out GLib.Value value);
-+		public uint get_n_key_frames ();
-+		public void set_key_frame (uint index_, double key, Clutter.AnimationMode mode, GLib.Value value);
-+		public void set_key_frames ([CCode (array_length_cname = "n_key_frames", array_length_pos = 0.5, array_length_type = "guint")] double[] key_frames);
-+		public void set_modes ([CCode (array_length_cname = "n_modes", array_length_pos = 0.5, array_length_type = "guint")] Clutter.AnimationMode[] modes);
-+		public void set_values ([CCode (array_length_cname = "n_values", array_length_pos = 0.5, array_length_type = "guint")] GLib.Value[] values);
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_keymap_get_type ()")]
-+	public abstract class Keymap : GLib.Object {
-+		[CCode (has_construct_function = false)]
-+		protected Keymap ();
-+		public virtual bool get_caps_lock_state ();
-+		public virtual Pango.Direction get_direction ();
-+		public virtual bool get_num_lock_state ();
-+		public signal void state_changed ();
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_layer_node_get_type ()")]
-+	public class LayerNode : Clutter.PaintNode {
-+		[CCode (has_construct_function = false, type = "ClutterPaintNode*")]
-+		public LayerNode (Graphene.Matrix projection, Cairo.Rectangle viewport, float width, float height, uint8 opacity);
-+		[CCode (has_construct_function = false, type = "ClutterPaintNode*")]
-+		public LayerNode.to_framebuffer (Cogl.Framebuffer framebuffer, Cogl.Pipeline pipeline);
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_layout_manager_get_type ()")]
-+	[Version (since = "1.2")]
-+	public abstract class LayoutManager : GLib.InitiallyUnowned {
-+		[CCode (has_construct_function = false)]
-+		protected LayoutManager ();
-+		public virtual void allocate (Clutter.Container container, Clutter.ActorBox allocation);
-+		public void child_get (Clutter.Container container, Clutter.Actor actor, ...);
-+		public void child_get_property (Clutter.Container container, Clutter.Actor actor, string property_name, GLib.Value value);
-+		public void child_set (Clutter.Container container, Clutter.Actor actor, ...);
-+		public void child_set_property (Clutter.Container container, Clutter.Actor actor, string property_name, GLib.Value value);
-+		[NoWrapper]
-+		public virtual unowned Clutter.LayoutMeta create_child_meta (Clutter.Container container, Clutter.Actor actor);
-+		public unowned GLib.ParamSpec find_child_property (string name);
-+		[Version (since = "1.0")]
-+		public unowned Clutter.LayoutMeta get_child_meta (Clutter.Container container, Clutter.Actor actor);
-+		[NoWrapper]
-+		public virtual GLib.Type get_child_meta_type ();
-+		public virtual void get_preferred_height (Clutter.Container container, float for_width, out float min_height_p, out float nat_height_p);
-+		public virtual void get_preferred_width (Clutter.Container container, float for_height, out float min_width_p, out float nat_width_p);
-+		[CCode (array_length_pos = 0.1, array_length_type = "guint")]
-+		public GLib.ParamSpec[] list_child_properties ();
-+		public virtual void set_container (Clutter.Container? container);
-+		[HasEmitter]
-+		public virtual signal void layout_changed ();
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_layout_meta_get_type ()")]
-+	[Version (since = "1.2")]
-+	public abstract class LayoutMeta : Clutter.ChildMeta {
-+		[CCode (has_construct_function = false)]
-+		protected LayoutMeta ();
-+		public unowned Clutter.LayoutManager get_manager ();
-+		public Clutter.LayoutManager manager { get; construct; }
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
-+	[Compact]
-+	[Version (since = "0.2")]
-+	public class MotionEvent : Clutter.Event {
-+		public double axes;
-+		public weak Clutter.InputDevice device;
-+		public double dx;
-+		public double dx_unaccel;
-+		public double dy;
-+		public double dy_unaccel;
-+		public Clutter.EventFlags flags;
-+		public Clutter.ModifierType modifier_state;
-+		public weak Clutter.Actor source;
-+		public weak Clutter.Stage stage;
-+		public uint32 time;
-+		public int64 time_us;
-+		public Clutter.EventType type;
-+		public float x;
-+		public float y;
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_offscreen_effect_get_type ()")]
-+	[Version (since = "1.4")]
-+	public abstract class OffscreenEffect : Clutter.Effect {
-+		[CCode (has_construct_function = false)]
-+		protected OffscreenEffect ();
-+		public virtual Cogl.Handle create_texture (float width, float height);
-+		public unowned Cogl.Pipeline? get_pipeline ();
-+		[Version (since = "1.8")]
-+		public bool get_target_size (out float width, out float height);
-+		[Version (since = "1.10")]
-+		public unowned Cogl.Handle get_texture ();
-+		public virtual void paint_target (Clutter.PaintNode node, Clutter.PaintContext paint_context);
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
-+	[Compact]
-+	public class PadButtonEvent : Clutter.Event {
-+		public uint32 button;
-+		public weak Clutter.InputDevice device;
-+		public Clutter.EventFlags flags;
-+		public uint32 group;
-+		public uint32 mode;
-+		public weak Clutter.Actor source;
-+		public weak Clutter.Stage stage;
-+		public uint32 time;
-+		public Clutter.EventType type;
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
-+	[Compact]
-+	public class PadRingEvent : Clutter.Event {
-+		public double angle;
-+		public weak Clutter.InputDevice device;
-+		public Clutter.EventFlags flags;
-+		public uint32 group;
-+		public uint32 mode;
-+		public uint32 ring_number;
-+		public Clutter.InputDevicePadSource ring_source;
-+		public weak Clutter.Actor source;
-+		public weak Clutter.Stage stage;
-+		public uint32 time;
-+		public Clutter.EventType type;
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
-+	[Compact]
-+	public class PadStripEvent : Clutter.Event {
-+		public weak Clutter.InputDevice device;
-+		public Clutter.EventFlags flags;
-+		public uint32 group;
-+		public uint32 mode;
-+		public weak Clutter.Actor source;
-+		public weak Clutter.Stage stage;
-+		public uint32 strip_number;
-+		public Clutter.InputDevicePadSource strip_source;
-+		public uint32 time;
-+		public Clutter.EventType type;
-+		public double value;
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_page_turn_effect_get_type ()")]
-+	[Version (since = "1.4")]
-+	public class PageTurnEffect : Clutter.DeformEffect {
-+		[CCode (has_construct_function = false, type = "ClutterEffect*")]
-+		public PageTurnEffect (double period, double angle, float radius);
-+		public double get_angle ();
-+		public double get_period ();
-+		public float get_radius ();
-+		public void set_angle (double angle);
-+		public void set_period (double period);
-+		public void set_radius (float radius);
-+		public double angle { get; set; }
-+		public double period { get; set; }
-+		public float radius { get; set; }
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", ref_function = "clutter_paint_context_ref", type_id = "clutter_paint_context_get_type ()", unref_function = "clutter_paint_context_unref")]
-+	[Compact]
-+	public class PaintContext {
-+		public void destroy ();
-+		public unowned Cogl.Framebuffer get_framebuffer ();
-+		public unowned Cairo.Region get_redraw_clip ();
-+		public void pop_framebuffer ();
-+		public void push_framebuffer (Cogl.Framebuffer framebuffer);
-+		public unowned Clutter.PaintContext @ref ();
-+		public void unref ();
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_paint_node_get_type ()")]
-+	[Version (since = "1.10")]
-+	public abstract class PaintNode {
-+		[CCode (has_construct_function = false)]
-+		protected PaintNode ();
-+		public void add_child (Clutter.PaintNode child);
-+		public void add_multitexture_rectangle (Clutter.ActorBox rect, float text_coords, uint text_coords_len);
-+		public void add_rectangle (Clutter.ActorBox rect);
-+		public void add_rectangles ([CCode (array_length_cname = "n_rects", array_length_pos = 1.1, array_length_type = "guint")] float[] coords);
-+		public void add_texture_rectangle (Clutter.ActorBox rect, float x_1, float y_1, float x_2, float y_2);
-+		public void add_texture_rectangles ([CCode (array_length_cname = "n_rects", array_length_pos = 1.1, array_length_type = "guint")] float[] coords);
-+		public unowned Cogl.Framebuffer get_framebuffer ();
-+		public void paint (Clutter.PaintContext paint_context);
-+		public unowned Clutter.PaintNode @ref ();
-+		public void set_name (string name);
-+		public void unref ();
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_pan_action_get_type ()")]
-+	[Version (since = "1.12")]
-+	public class PanAction : Clutter.GestureAction {
-+		[CCode (has_construct_function = false, type = "ClutterAction*")]
-+		public PanAction ();
-+		public double get_acceleration_factor ();
-+		[Version (since = "1.24")]
-+		public float get_constrained_motion_delta (uint point, out float delta_x, out float delta_y);
-+		public double get_deceleration ();
-+		public bool get_interpolate ();
-+		public void get_interpolated_coords (out float interpolated_x, out float interpolated_y);
-+		public float get_interpolated_delta (out float delta_x, out float delta_y);
-+		[Version (since = "1.14")]
-+		public void get_motion_coords (uint point, out float motion_x, out float motion_y);
-+		[Version (since = "1.14")]
-+		public float get_motion_delta (uint point, out float delta_x, out float delta_y);
-+		public Clutter.PanAxis get_pan_axis ();
-+		public void set_acceleration_factor (double factor);
-+		public void set_deceleration (double rate);
-+		public void set_interpolate (bool should_interpolate);
-+		public void set_pan_axis (Clutter.PanAxis axis);
-+		public double acceleration_factor { get; set; }
-+		public double deceleration { get; set; }
-+		public bool interpolate { get; set; }
-+		public Clutter.PanAxis pan_axis { get; set; }
-+		public virtual signal bool pan (Clutter.Actor actor, bool is_interpolated);
-+		public virtual signal void pan_stopped (Clutter.Actor actor);
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", lower_case_csuffix = "param_units", type_id = "clutter_param_units_get_type ()")]
-+	public class ParamSpecUnit : GLib.ParamSpec {
-+		[CCode (has_construct_function = false)]
-+		protected ParamSpecUnit ();
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_path_get_type ()")]
-+	[Version (since = "1.0")]
-+	public class Path : GLib.InitiallyUnowned {
-+		[CCode (has_construct_function = false)]
-+		public Path ();
-+		public void add_cairo_path (Cairo.Path cpath);
-+		public void add_close ();
-+		public void add_curve_to (int x_1, int y_1, int x_2, int y_2, int x_3, int y_3);
-+		public void add_line_to (int x, int y);
-+		public void add_move_to (int x, int y);
-+		public void add_node (Clutter.PathNode node);
-+		public void add_rel_curve_to (int x_1, int y_1, int x_2, int y_2, int x_3, int y_3);
-+		public void add_rel_line_to (int x, int y);
-+		public void add_rel_move_to (int x, int y);
-+		public bool add_string (string str);
-+		public void clear ();
-+		public void @foreach (Clutter.PathCallback callback);
-+		public string get_description ();
-+		public uint get_length ();
-+		public uint get_n_nodes ();
-+		public Clutter.PathNode get_node (uint index_);
-+		public GLib.SList<weak Clutter.PathNode?> get_nodes ();
-+		public uint get_position (double progress, out Clutter.Knot position);
-+		public void insert_node (int index_, Clutter.PathNode node);
-+		public void remove_node (uint index_);
-+		public void replace_node (uint index_, Clutter.PathNode node);
-+		public bool set_description (string str);
-+		public void to_cairo_path (Cairo.Context cr);
-+		[CCode (has_construct_function = false)]
-+		public Path.with_description (string desc);
-+		public string description { owned get; set; }
-+		public uint length { get; }
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_path_constraint_get_type ()")]
-+	[Version (since = "1.6")]
-+	public class PathConstraint : Clutter.Constraint {
-+		[CCode (has_construct_function = false, type = "ClutterConstraint*")]
-+		public PathConstraint (Clutter.Path? path, float offset);
-+		public float get_offset ();
-+		public unowned Clutter.Path get_path ();
-+		public void set_offset (float offset);
-+		public void set_path (Clutter.Path? path);
-+		public float offset { get; set; }
-+		public Clutter.Path path { get; set; }
-+		public signal void node_reached (Clutter.Actor actor, uint index);
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", ref_function = "clutter_pick_context_ref", type_id = "clutter_pick_context_get_type ()", unref_function = "clutter_pick_context_unref")]
-+	[Compact]
-+	public class PickContext {
-+		public void destroy ();
-+		public Graphene.Matrix get_transform ();
-+		public void log_pick (Clutter.ActorBox box, Clutter.Actor actor);
-+		public void pop_clip ();
-+		public void pop_transform ();
-+		public void push_clip (Clutter.ActorBox box);
-+		public void push_transform (Graphene.Matrix transform);
-+		public unowned Clutter.PickContext @ref ();
-+		public void unref ();
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_pipeline_node_get_type ()")]
-+	[Version (since = "1.10")]
-+	public class PipelineNode : Clutter.PaintNode {
-+		[CCode (has_construct_function = false, type = "ClutterPaintNode*")]
-+		public PipelineNode (Cogl.Pipeline? pipeline);
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_property_transition_get_type ()")]
-+	[Version (since = "1.10")]
-+	public class PropertyTransition : Clutter.Transition, Clutter.Scriptable {
-+		[CCode (has_construct_function = false, type = "ClutterTransition*")]
-+		public PropertyTransition (string? property_name);
-+		[CCode (has_construct_function = false, type = "ClutterTransition*")]
-+		public PropertyTransition.for_actor (Clutter.Actor actor, string? property_name);
-+		public unowned string get_property_name ();
-+		public void set_property_name (string? property_name);
-+		public string property_name { get; set; }
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
-+	[Compact]
-+	[Version (since = "1.28")]
-+	public class ProximityEvent : Clutter.Event {
-+		public weak Clutter.InputDevice device;
-+		public Clutter.EventFlags flags;
-+		public weak Clutter.Actor source;
-+		public weak Clutter.Stage stage;
-+		public uint32 time;
-+		public Clutter.EventType type;
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_root_node_get_type ()")]
-+	public class RootNode : Clutter.PaintNode {
-+		[CCode (has_construct_function = false, type = "ClutterPaintNode*")]
-+		public RootNode (Cogl.Framebuffer framebuffer, Clutter.Color clear_color, Cogl.BufferBit clear_flags);
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_rotate_action_get_type ()")]
-+	[Version (since = "1.12")]
-+	public class RotateAction : Clutter.GestureAction {
-+		[CCode (has_construct_function = false, type = "ClutterAction*")]
-+		public RotateAction ();
-+		public virtual signal bool rotate (Clutter.Actor actor, double angle);
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_script_get_type ()")]
-+	[Version (since = "0.6")]
-+	public class Script : GLib.Object {
-+		[CCode (has_construct_function = false)]
-+		public Script ();
-+		[Version (since = "0.8")]
-+		public void add_search_paths ([CCode (array_length_cname = "n_paths", array_length_pos = 1.1, array_length_type = "gsize")] string[] paths);
-+		public void connect_signals (void* user_data);
-+		public void connect_signals_full (Clutter.ScriptConnectFunc func);
-+		public void ensure_objects ();
-+		public unowned GLib.Object get_object (string name);
-+		public int get_objects (...);
-+		[Version (since = "1.10")]
-+		public unowned string get_translation_domain ();
-+		public virtual GLib.Type get_type_from_name (string type_name);
-+		[Version (since = "0.8")]
-+		public GLib.List<weak GLib.Object> list_objects ();
-+		public uint load_from_data (string data, ssize_t length) throws GLib.Error;
-+		public uint load_from_file (string filename) throws GLib.Error;
-+		[Version (since = "1.10")]
-+		public uint load_from_resource (string resource_path) throws GLib.Error;
-+		[Version (since = "0.8")]
-+		public string lookup_filename (string filename);
-+		[Version (since = "1.10")]
-+		public void set_translation_domain (string? domain);
-+		public void unmerge_objects (uint merge_id);
-+		[NoAccessorMethod]
-+		public string filename { owned get; }
-+		[NoAccessorMethod]
-+		public bool filename_set { get; }
-+		[Version (since = "1.10")]
-+		public string translation_domain { get; set; }
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_scroll_actor_get_type ()")]
-+	[Version (since = "1.12")]
-+	public class ScrollActor : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
-+		[CCode (has_construct_function = false, type = "ClutterActor*")]
-+		public ScrollActor ();
-+		public Clutter.ScrollMode get_scroll_mode ();
-+		public void scroll_to_point (Graphene.Point point);
-+		public void scroll_to_rect (Graphene.Rect rect);
-+		public void set_scroll_mode (Clutter.ScrollMode mode);
-+		public Clutter.ScrollMode scroll_mode { get; set; }
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
-+	[Compact]
-+	[Version (since = "0.2")]
-+	public class ScrollEvent : Clutter.Event {
-+		public double axes;
-+		public weak Clutter.InputDevice device;
-+		public Clutter.ScrollDirection direction;
-+		public Clutter.ScrollFinishFlags finish_flags;
-+		public Clutter.EventFlags flags;
-+		public Clutter.ModifierType modifier_state;
-+		public Clutter.ScrollSource scroll_source;
-+		public weak Clutter.Actor source;
-+		public weak Clutter.Stage stage;
-+		public uint32 time;
-+		public Clutter.EventType type;
-+		public float x;
-+		public float y;
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_seat_get_type ()")]
-+	public abstract class Seat : GLib.Object {
-+		[CCode (has_construct_function = false)]
-+		protected Seat ();
-+		public virtual void bell_notify ();
-+		public virtual Clutter.VirtualInputDevice create_virtual_device (Clutter.InputDeviceType device_type);
-+		public void ensure_a11y_state ();
-+		public virtual unowned Clutter.InputDevice get_keyboard ();
-+		public virtual unowned Clutter.Keymap get_keymap ();
-+		public virtual unowned Clutter.InputDevice get_pointer ();
-+		public void get_pointer_a11y_settings (Clutter.PointerA11ySettings settings);
-+		public bool get_touch_mode ();
-+		public virtual bool handle_event_post (Clutter.Event event);
-+		public void inhibit_unfocus ();
-+		public bool is_unfocus_inhibited ();
-+		public GLib.List<weak Clutter.InputDevice> list_devices ();
-+		public virtual bool query_state (Clutter.InputDevice device, Clutter.EventSequence sequence, Graphene.Point coords, Clutter.ModifierType modifiers);
-+		public void set_pointer_a11y_dwell_click_type (Clutter.PointerA11yDwellClickType click_type);
-+		public void set_pointer_a11y_settings (Clutter.PointerA11ySettings settings);
-+		public void uninhibit_unfocus ();
-+		public virtual void warp_pointer (int x, int y);
-+		[NoAccessorMethod]
-+		public Clutter.Backend backend { owned get; construct; }
-+		public bool touch_mode { get; }
-+		public signal void device_added (Clutter.InputDevice object);
-+		public signal void device_removed (Clutter.InputDevice object);
-+		public signal void is_unfocus_inhibited_changed ();
-+		public signal void kbd_a11y_flags_changed (uint settings_flags, uint changed_mask);
-+		public signal void kbd_a11y_mods_state_changed (uint latched_mask, uint locked_mask);
-+		public signal void ptr_a11y_dwell_click_type_changed (Clutter.PointerA11yDwellClickType click_type);
-+		public signal void ptr_a11y_timeout_started (Clutter.InputDevice device, Clutter.PointerA11yTimeoutType timeout_type, uint delay);
-+		public signal void ptr_a11y_timeout_stopped (Clutter.InputDevice device, Clutter.PointerA11yTimeoutType timeout_type, bool clicked);
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_settings_get_type ()")]
-+	[Version (since = "1.4")]
-+	public class Settings : GLib.Object {
-+		[CCode (has_construct_function = false)]
-+		protected Settings ();
-+		public static unowned Clutter.Settings get_default ();
-+		[NoAccessorMethod]
-+		[Version (deprecated = true, deprecated_since = "1.10", since = "1.4")]
-+		public Clutter.Backend backend { construct; }
-+		[NoAccessorMethod]
-+		[Version (since = "1.8")]
-+		public int dnd_drag_threshold { get; set; }
-+		[NoAccessorMethod]
-+		public int double_click_distance { get; set; }
-+		[NoAccessorMethod]
-+		public int double_click_time { get; set; }
-+		[NoAccessorMethod]
-+		public int font_antialias { get; set; }
-+		[NoAccessorMethod]
-+		public int font_dpi { get; set; }
-+		[NoAccessorMethod]
-+		public string font_hint_style { owned get; set; }
-+		[NoAccessorMethod]
-+		public int font_hinting { get; set; }
-+		[NoAccessorMethod]
-+		public string font_name { owned get; set; }
-+		[NoAccessorMethod]
-+		public string font_subpixel_order { owned get; set; }
-+		[NoAccessorMethod]
-+		public uint fontconfig_timestamp { set; }
-+		[NoAccessorMethod]
-+		[Version (since = "1.8")]
-+		public int long_press_duration { get; set; }
-+		[NoAccessorMethod]
-+		public uint password_hint_time { get; set; }
-+		[NoAccessorMethod]
-+		public int unscaled_font_dpi { set; }
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
-+	[Compact]
-+	public class Shader {
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_shader_effect_get_type ()")]
-+	[Version (since = "1.4")]
-+	public class ShaderEffect : Clutter.OffscreenEffect {
-+		[CCode (has_construct_function = false, type = "ClutterEffect*")]
-+		[Version (since = "1.8")]
-+		public ShaderEffect (Clutter.ShaderType shader_type);
-+		public unowned Cogl.Handle get_program ();
-+		public unowned Cogl.Handle get_shader ();
-+		[NoWrapper]
-+		public virtual string get_static_shader_source ();
-+		public bool set_shader_source (string source);
-+		public void set_uniform_value (string name, GLib.Value value);
-+		[NoAccessorMethod]
-+		public Clutter.ShaderType shader_type { construct; }
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_shader_float_get_type ()")]
-+	public class ShaderFloat {
-+		[CCode (has_construct_function = false)]
-+		protected ShaderFloat ();
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_shader_int_get_type ()")]
-+	public class ShaderInt {
-+		[CCode (has_construct_function = false)]
-+		protected ShaderInt ();
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_shader_matrix_get_type ()")]
-+	public class ShaderMatrix {
-+		[CCode (has_construct_function = false)]
-+		protected ShaderMatrix ();
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_snap_constraint_get_type ()")]
-+	[Version (since = "1.6")]
-+	public class SnapConstraint : Clutter.Constraint {
-+		[CCode (has_construct_function = false, type = "ClutterConstraint*")]
-+		public SnapConstraint (Clutter.Actor? source, Clutter.SnapEdge from_edge, Clutter.SnapEdge to_edge, float offset);
-+		public void get_edges (out Clutter.SnapEdge from_edge, out Clutter.SnapEdge to_edge);
-+		public float get_offset ();
-+		public unowned Clutter.Actor get_source ();
-+		public void set_edges (Clutter.SnapEdge from_edge, Clutter.SnapEdge to_edge);
-+		public void set_offset (float offset);
-+		public void set_source (Clutter.Actor? source);
-+		[NoAccessorMethod]
-+		public Clutter.SnapEdge from_edge { get; set construct; }
-+		public float offset { get; set construct; }
-+		public Clutter.Actor source { get; set construct; }
-+		[NoAccessorMethod]
-+		public Clutter.SnapEdge to_edge { get; set construct; }
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_stage_get_type ()")]
-+	[Version (since = "0.2")]
-+	public class Stage : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
-+		[CCode (has_construct_function = false)]
-+		protected Stage ();
-+		public void capture_into (Cairo.RectangleInt rect, uint8 data);
-+		public void clear_stage_views ();
-+		[CCode (cname = "clutter_stage_event")]
-+		public bool emit_event (Clutter.Event event);
-+		[Version (since = "1.0")]
-+		public void ensure_viewport ();
-+		public unowned Clutter.Actor get_actor_at_pos (Clutter.PickMode pick_mode, float x, float y);
-+		public bool get_capture_final_size (Cairo.RectangleInt rect, out int out_width, out int out_height, out float out_scale);
-+		public unowned Clutter.Actor get_device_actor (Clutter.InputDevice device, Clutter.EventSequence? sequence);
-+		public int64 get_frame_counter ();
-+		[Version (since = "0.6")]
-+		public unowned Clutter.Actor get_key_focus ();
-+		[Version (since = "1.2")]
-+		public void get_minimum_size (out uint width, out uint height);
-+		[Version (since = "1.8")]
-+		public bool get_motion_events_enabled ();
-+		public Clutter.Perspective get_perspective ();
-+		[Version (since = "1.0")]
-+		public bool get_throttle_motion_events ();
-+		[Version (since = "0.4")]
-+		public unowned string get_title ();
-+		public bool get_use_alpha ();
-+		public bool paint_to_buffer (Cairo.RectangleInt rect, float scale, [CCode (array_length = false)] ref uint8[] data, int stride, Cogl.PixelFormat format, Clutter.PaintFlag paint_flags) throws GLib.Error;
-+		public void paint_to_framebuffer (Cogl.Framebuffer framebuffer, Cairo.RectangleInt rect, float scale, Clutter.PaintFlag paint_flags);
-+		[CCode (array_length = false)]
-+		public uint8[] read_pixels (int x, int y, int width = -1, int height = -1);
-+		public void repick_device (Clutter.InputDevice device);
-+		public void schedule_update ();
-+		[Version (since = "0.6")]
-+		public void set_key_focus (Clutter.Actor? actor);
-+		[Version (since = "1.2")]
-+		public void set_minimum_size (uint width, uint height);
-+		[Version (since = "1.8")]
-+		public void set_motion_events_enabled (bool enabled);
-+		[Version (since = "1.0")]
-+		public void set_throttle_motion_events (bool throttle);
-+		[Version (since = "0.4")]
-+		public void set_title (string title);
-+		public void set_use_alpha (bool use_alpha);
-+		public void update_device (Clutter.InputDevice device, Clutter.EventSequence sequence, Graphene.Point point, uint32 time, Clutter.Actor new_actor, bool emit_crossing);
-+		[Version (since = "1.2")]
-+		public Clutter.Actor key_focus { get; set; }
-+		[Version (since = "0.8")]
-+		public Clutter.Perspective perspective { get; }
-+		[Version (since = "0.4")]
-+		public string title { get; set; }
-+		[Version (since = "0.6")]
-+		public virtual signal void activate ();
-+		[Version (since = "1.20")]
-+		public signal void after_paint (Clutter.StageView view);
-+		public signal void after_update (Clutter.StageView view);
-+		public virtual signal void before_paint (Clutter.StageView view);
-+		public signal void before_update (Clutter.StageView view);
-+		[Version (since = "0.6")]
-+		public virtual signal void deactivate ();
-+		public virtual signal void paint_view (Clutter.StageView view, Cairo.Region redraw_clip);
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_stage_manager_get_type ()")]
-+	[Version (since = "1.0")]
-+	public class StageManager : GLib.Object {
-+		[CCode (has_construct_function = false)]
-+		protected StageManager ();
-+		[Version (since = "0.8")]
-+		public static unowned Clutter.StageManager get_default ();
-+		[Version (since = "0.8")]
-+		public unowned Clutter.Stage get_default_stage ();
-+		[Version (since = "0.8")]
-+		public GLib.SList<weak Clutter.Stage> list_stages ();
-+		public unowned GLib.SList<Clutter.Stage> peek_stages ();
-+		[Version (since = "0.8")]
-+		public Clutter.Stage default_stage { get; }
-+		[Version (since = "0.8")]
-+		public virtual signal void stage_added (Clutter.Stage stage);
-+		[Version (since = "0.8")]
-+		public virtual signal void stage_removed (Clutter.Stage stage);
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_stage_view_get_type ()")]
-+	public class StageView : GLib.Object {
-+		[CCode (has_construct_function = false)]
-+		protected StageView ();
-+		public void assign_next_scanout (Cogl.Scanout scanout);
-+		public void destroy ();
-+		public unowned Cogl.Framebuffer get_framebuffer ();
-+		public void get_layout (Cairo.RectangleInt rect);
-+		public virtual void get_offscreen_transformation_matrix (Graphene.Matrix matrix);
-+		public unowned Cogl.Framebuffer get_onscreen ();
-+		public float get_refresh_rate ();
-+		public float get_scale ();
-+		public void invalidate_offscreen_blit_pipeline ();
-+		[NoWrapper]
-+		public virtual void setup_offscreen_blit_pipeline (Cogl.Pipeline pipeline);
-+		[NoWrapper]
-+		public virtual void transform_rect_to_onscreen (Cairo.RectangleInt src_rect, int dst_width, int dst_height, Cairo.RectangleInt dst_rect);
-+		[NoAccessorMethod]
-+		public Cogl.Framebuffer framebuffer { owned get; set construct; }
-+		[NoAccessorMethod]
-+		public string name { owned get; construct; }
-+		[NoAccessorMethod]
-+		public Cogl.Offscreen offscreen { owned get; construct; }
-+		[NoAccessorMethod]
-+		public float refresh_rate { get; set construct; }
-+		[NoAccessorMethod]
-+		public float scale { get; set construct; }
-+		[NoAccessorMethod]
-+		public Clutter.Stage stage { owned get; construct; }
-+		[NoAccessorMethod]
-+		public bool use_shadowfb { get; construct; }
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_swipe_action_get_type ()")]
-+	[Version (since = "1.8")]
-+	public class SwipeAction : Clutter.GestureAction {
-+		[CCode (has_construct_function = false, type = "ClutterAction*")]
-+		public SwipeAction ();
-+		[Version (deprecated = true, deprecated_since = "1.14", since = "1.8")]
-+		public virtual signal void swept (Clutter.Actor actor, Clutter.SwipeDirection direction);
-+		[Version (since = "1.14")]
-+		public virtual signal bool swipe (Clutter.Actor actor, Clutter.SwipeDirection direction);
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_tap_action_get_type ()")]
-+	[Version (since = "1.14")]
-+	public class TapAction : Clutter.GestureAction {
-+		[CCode (has_construct_function = false, type = "ClutterAction*")]
-+		public TapAction ();
-+		public virtual signal void tap (Clutter.Actor actor);
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_text_get_type ()")]
-+	[Version (since = "1.0")]
-+	public class Text : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
-+		[CCode (has_construct_function = false, type = "ClutterActor*")]
-+		public Text ();
-+		[Version (since = "1.10")]
-+		public int coords_to_position (float x, float y);
-+		public void delete_chars (uint n_chars);
-+		public bool delete_selection ();
-+		[CCode (has_construct_function = false, type = "ClutterActor*")]
-+		public Text.full (string font_name, string text, Clutter.Color color);
-+		public bool get_activatable ();
-+		public unowned Pango.AttrList get_attributes ();
-+		[Version (since = "1.10")]
-+		public unowned Clutter.TextBuffer get_buffer ();
-+		public string get_chars (ssize_t start_pos, ssize_t end_pos);
-+		public Clutter.Color get_color ();
-+		public Clutter.Color get_cursor_color ();
-+		public int get_cursor_position ();
-+		[Version (since = "1.16")]
-+		public Graphene.Rect get_cursor_rect ();
-+		public uint get_cursor_size ();
-+		public bool get_cursor_visible ();
-+		public bool get_editable ();
-+		public Pango.EllipsizeMode get_ellipsize ();
-+		[Version (since = "1.2")]
-+		public Pango.FontDescription get_font_description ();
-+		public unowned string get_font_name ();
-+		public Clutter.InputContentHintFlags get_input_hints ();
-+		public Clutter.InputContentPurpose get_input_purpose ();
-+		[Version (since = "0.6")]
-+		public bool get_justify ();
-+		public unowned Pango.Layout get_layout ();
-+		[Version (since = "1.8")]
-+		public void get_layout_offsets (out int x, out int y);
-+		public Pango.Alignment get_line_alignment ();
-+		public bool get_line_wrap ();
-+		public Pango.WrapMode get_line_wrap_mode ();
-+		public int get_max_length ();
-+		public unichar get_password_char ();
-+		public bool get_selectable ();
-+		[Version (since = "1.8")]
-+		public Clutter.Color get_selected_text_color ();
-+		public string get_selection ();
-+		public int get_selection_bound ();
-+		public Clutter.Color get_selection_color ();
-+		public bool get_single_line_mode ();
-+		public unowned string get_text ();
-+		public bool get_use_markup ();
-+		public bool has_preedit ();
-+		public void insert_text (string text, ssize_t position);
-+		public void insert_unichar (unichar wc);
-+		public bool position_to_coords (int position, out float x, out float y, out float line_height = null);
-+		public void set_activatable (bool activatable);
-+		public void set_attributes (Pango.AttrList? attrs);
-+		[Version (since = "1.10")]
-+		public void set_buffer (Clutter.TextBuffer buffer);
-+		public void set_color (Clutter.Color color);
-+		public void set_cursor_color (Clutter.Color? color);
-+		public void set_cursor_position (int position);
-+		public void set_cursor_size (int size);
-+		public void set_cursor_visible (bool cursor_visible);
-+		public void set_editable (bool editable);
-+		public void set_ellipsize (Pango.EllipsizeMode mode);
-+		[Version (since = "1.2")]
-+		public void set_font_description (Pango.FontDescription font_desc);
-+		public void set_font_name (string? font_name);
-+		public void set_input_hints (Clutter.InputContentHintFlags hints);
-+		public void set_input_purpose (Clutter.InputContentPurpose purpose);
-+		public void set_justify (bool justify);
-+		public void set_line_alignment (Pango.Alignment alignment);
-+		public void set_line_wrap (bool line_wrap);
-+		public void set_line_wrap_mode (Pango.WrapMode wrap_mode);
-+		public void set_markup (string? markup);
-+		public void set_max_length (int max);
-+		public void set_password_char (unichar wc);
-+		[Version (since = "1.2")]
-+		public void set_preedit_string (string? preedit_str, Pango.AttrList? preedit_attrs, uint cursor_pos);
-+		public void set_selectable (bool selectable);
-+		[Version (since = "1.8")]
-+		public void set_selected_text_color (Clutter.Color? color);
-+		public void set_selection (ssize_t start_pos, ssize_t end_pos);
-+		public void set_selection_bound (int selection_bound);
-+		public void set_selection_color (Clutter.Color? color);
-+		public void set_single_line_mode (bool single_line);
-+		public void set_text (string? text);
-+		public void set_use_markup (bool setting);
-+		[CCode (cname = "clutter_text_activate")]
-+		public bool try_activate ();
-+		[CCode (has_construct_function = false, type = "ClutterActor*")]
-+		[Version (since = "1.10")]
-+		public Text.with_buffer (Clutter.TextBuffer buffer);
-+		[CCode (has_construct_function = false, type = "ClutterActor*")]
-+		public Text.with_text (string? font_name, string text);
-+		public bool activatable { get; set; }
-+		public Pango.AttrList attributes { get; set; }
-+		[Version (since = "1.8")]
-+		public Clutter.TextBuffer buffer { get; set; }
-+		public Clutter.Color color { get; set; }
-+		public Clutter.Color cursor_color { get; set; }
-+		[NoAccessorMethod]
-+		public bool cursor_color_set { get; }
-+		[Version (since = "1.12")]
-+		public int cursor_position { get; set; }
-+		public int cursor_size { get; set; }
-+		public bool cursor_visible { get; set; }
-+		public bool editable { get; set; }
-+		public Pango.EllipsizeMode ellipsize { get; set; }
-+		[Version (since = "1.2")]
-+		public Pango.FontDescription font_description { owned get; set; }
-+		public string font_name { get; set; }
-+		public Clutter.InputContentHintFlags input_hints { get; set; }
-+		public Clutter.InputContentPurpose input_purpose { get; set; }
-+		public bool justify { get; set; }
-+		public Pango.Alignment line_alignment { get; set; }
-+		public bool line_wrap { get; set; }
-+		public Pango.WrapMode line_wrap_mode { get; set; }
-+		public int max_length { get; set; }
-+		public uint password_char { get; set; }
-+		[NoAccessorMethod]
-+		[Version (deprecated = true, deprecated_since = "1.12", since = "1.0")]
-+		public int position { get; set; }
-+		public bool selectable { get; set; }
-+		[Version (since = "1.8")]
-+		public Clutter.Color selected_text_color { get; set; }
-+		[NoAccessorMethod]
-+		[Version (since = "1.8")]
-+		public bool selected_text_color_set { get; }
-+		public int selection_bound { get; set; }
-+		public Clutter.Color selection_color { get; set; }
-+		[NoAccessorMethod]
-+		public bool selection_color_set { get; }
-+		public bool single_line_mode { get; set; }
-+		public string text { get; set; }
-+		public bool use_markup { get; set; }
-+		public virtual signal void activate ();
-+		[Version (since = "1.16")]
-+		public virtual signal void cursor_changed ();
-+		[Version (deprecated = true, deprecated_since = "1.16", since = "1.0")]
-+		public virtual signal void cursor_event (Graphene.Rect rect);
-+		[HasEmitter]
-+		[Version (since = "1.2")]
-+		public signal void delete_text (int start_pos, int end_pos);
-+		public virtual signal void text_changed ();
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_text_buffer_get_type ()")]
-+	[Version (since = "1.10")]
-+	public class TextBuffer : GLib.Object {
-+		[CCode (has_construct_function = false)]
-+		public TextBuffer ();
-+		public virtual uint delete_text (uint position, uint n_chars);
-+		public void emit_deleted_text (uint position, uint n_chars);
-+		public void emit_inserted_text (uint position, string chars, uint n_chars);
-+		public size_t get_bytes ();
-+		public virtual uint get_length ();
-+		public int get_max_length ();
-+		public unowned string get_text ();
-+		[CCode (vfunc_name = "get_text")]
-+		[NoWrapper]
-+		public virtual unowned string get_text_with_length (size_t n_bytes);
-+		public virtual uint insert_text (uint position, string chars, uint n_chars);
-+		public void set_max_length (int max_length);
-+		public void set_text (string chars, int n_chars);
-+		[CCode (has_construct_function = false)]
-+		public TextBuffer.with_text (string? text, ssize_t text_len);
-+		public uint length { get; }
-+		public int max_length { get; set; }
-+		public string text { get; }
-+		public virtual signal void deleted_text (uint position, uint n_chars);
-+		public virtual signal void inserted_text (uint position, string chars, uint n_chars);
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_text_node_get_type ()")]
-+	[Version (since = "1.10")]
-+	public class TextNode : Clutter.PaintNode {
-+		[CCode (has_construct_function = false, type = "ClutterPaintNode*")]
-+		public TextNode (Pango.Layout? layout, Clutter.Color? color);
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_texture_node_get_type ()")]
-+	[Version (since = "1.10")]
-+	public class TextureNode : Clutter.PipelineNode {
-+		[CCode (has_construct_function = false, type = "ClutterPaintNode*")]
-+		public TextureNode (Cogl.Texture texture, Clutter.Color? color, Clutter.ScalingFilter min_filter, Clutter.ScalingFilter mag_filter);
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_timeline_get_type ()")]
-+	[Version (since = "0.2")]
-+	public class Timeline : GLib.Object, Clutter.Scriptable {
-+		[CCode (has_construct_function = false)]
-+		[Version (since = "0.6")]
-+		public Timeline (uint duration_ms);
-+		[Version (since = "1.14")]
-+		public void add_marker (string marker_name, double progress);
-+		[Version (since = "0.8")]
-+		public void add_marker_at_time (string marker_name, uint msecs);
-+		public void advance (uint msecs);
-+		[Version (since = "0.8")]
-+		public void advance_to_marker (string marker_name);
-+		[CCode (has_construct_function = false)]
-+		public Timeline.for_actor (Clutter.Actor actor, uint duration_ms);
-+		[CCode (has_construct_function = false)]
-+		public Timeline.for_frame_clock (Clutter.FrameClock frame_clock, uint duration_ms);
-+		public unowned Clutter.Actor get_actor ();
-+		[Version (since = "1.6")]
-+		public bool get_auto_reverse ();
-+		[Version (since = "1.12")]
-+		public bool get_cubic_bezier_progress (out Graphene.Point c_1, out Graphene.Point c_2);
-+		[Version (since = "1.10")]
-+		public int get_current_repeat ();
-+		[Version (since = "0.4")]
-+		public uint get_delay ();
-+		[Version (since = "0.6")]
-+		public uint get_delta ();
-+		[Version (since = "0.6")]
-+		public Clutter.TimelineDirection get_direction ();
-+		[Version (since = "0.6")]
-+		public uint get_duration ();
-+		[Version (since = "1.10")]
-+		public int64 get_duration_hint ();
-+		public uint get_elapsed_time ();
-+		[Version (since = "0.6")]
-+		public double get_progress ();
-+		[Version (since = "1.10")]
-+		public Clutter.AnimationMode get_progress_mode ();
-+		[Version (since = "1.10")]
-+		public int get_repeat_count ();
-+		[Version (since = "1.12")]
-+		public bool get_step_progress (out int n_steps, out Clutter.StepMode step_mode);
-+		[Version (since = "0.8")]
-+		public bool has_marker (string marker_name);
-+		public bool is_playing ();
-+		[CCode (array_length = true, array_length_pos = 1.1, array_length_type = "gsize", array_null_terminated = true)]
-+		[Version (since = "0.8")]
-+		public string[] list_markers (int msecs);
-+		public void pause ();
-+		[Version (since = "0.8")]
-+		public void remove_marker (string marker_name);
-+		public void rewind ();
-+		public void set_actor (Clutter.Actor? actor);
-+		[Version (since = "1.6")]
-+		public void set_auto_reverse (bool reverse);
-+		[Version (since = "1.12")]
-+		public void set_cubic_bezier_progress (Graphene.Point c_1, Graphene.Point c_2);
-+		[Version (since = "0.4")]
-+		public void set_delay (uint msecs);
-+		[Version (since = "0.6")]
-+		public void set_direction (Clutter.TimelineDirection direction);
-+		[Version (since = "0.6")]
-+		public void set_duration (uint msecs);
-+		public void set_frame_clock (Clutter.FrameClock frame_clock);
-+		[Version (since = "1.10")]
-+		public void set_progress_func (owned Clutter.TimelineProgressFunc? func);
-+		[Version (since = "1.10")]
-+		public void set_progress_mode (Clutter.AnimationMode mode);
-+		[Version (since = "1.10")]
-+		public void set_repeat_count (int count);
-+		[Version (since = "1.12")]
-+		public void set_step_progress (int n_steps, Clutter.StepMode step_mode);
-+		public void skip (uint msecs);
-+		public void start ();
-+		public void stop ();
-+		public Clutter.Actor actor { get; set construct; }
-+		[Version (since = "1.6")]
-+		public bool auto_reverse { get; set; }
-+		[Version (since = "0.4")]
-+		public uint delay { get; set; }
-+		[Version (since = "0.6")]
-+		public Clutter.TimelineDirection direction { get; set; }
-+		[Version (since = "0.6")]
-+		public uint duration { get; set; }
-+		[NoAccessorMethod]
-+		public Clutter.FrameClock frame_clock { owned get; set construct; }
-+		[Version (since = "1.10")]
-+		public Clutter.AnimationMode progress_mode { get; set; }
-+		[Version (since = "1.10")]
-+		public int repeat_count { get; set; }
-+		public virtual signal void completed ();
-+		[Version (since = "0.8")]
-+		public virtual signal void marker_reached (string marker_name, int msecs);
-+		public virtual signal void new_frame (int msecs);
-+		public virtual signal void paused ();
-+		public virtual signal void started ();
-+		[Version (since = "1.12")]
-+		public virtual signal void stopped (bool is_finished);
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
-+	[Compact]
-+	[Version (since = "1.10")]
-+	public class TouchEvent : Clutter.Event {
-+		public double axes;
-+		public weak Clutter.InputDevice device;
-+		public Clutter.EventFlags flags;
-+		public Clutter.ModifierType modifier_state;
-+		public weak Clutter.EventSequence sequence;
-+		public weak Clutter.Actor source;
-+		public weak Clutter.Stage stage;
-+		public uint32 time;
-+		public Clutter.EventType type;
-+		public float x;
-+		public float y;
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
-+	[Compact]
-+	[Version (since = "1.24")]
-+	public class TouchpadPinchEvent : Clutter.Event {
-+		public float angle_delta;
-+		public float dx;
-+		public float dy;
-+		public Clutter.EventFlags flags;
-+		public uint n_fingers;
-+		public Clutter.TouchpadGesturePhase phase;
-+		public float scale;
-+		public weak Clutter.Actor source;
-+		public weak Clutter.Stage stage;
-+		public uint32 time;
-+		public Clutter.EventType type;
-+		public float x;
-+		public float y;
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
-+	[Compact]
-+	[Version (since = "1.24")]
-+	public class TouchpadSwipeEvent : Clutter.Event {
-+		public float dx;
-+		public float dy;
-+		public Clutter.EventFlags flags;
-+		public uint n_fingers;
-+		public Clutter.TouchpadGesturePhase phase;
-+		public weak Clutter.Actor source;
-+		public weak Clutter.Stage stage;
-+		public uint32 time;
-+		public Clutter.EventType type;
-+		public float x;
-+		public float y;
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_transform_node_get_type ()")]
-+	public class TransformNode : Clutter.PaintNode {
-+		[CCode (has_construct_function = false, type = "ClutterPaintNode*")]
-+		public TransformNode (Graphene.Matrix projection);
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_transition_get_type ()")]
-+	[Version (since = "1.10")]
-+	public abstract class Transition : Clutter.Timeline, Clutter.Scriptable {
-+		[CCode (has_construct_function = false)]
-+		protected Transition ();
-+		[NoWrapper]
-+		public virtual void attached (Clutter.Animatable animatable);
-+		[NoWrapper]
-+		public virtual void compute_value (Clutter.Animatable animatable, Clutter.Interval interval, double progress);
-+		[NoWrapper]
-+		public virtual void detached (Clutter.Animatable animatable);
-+		public unowned Clutter.Animatable get_animatable ();
-+		public unowned Clutter.Interval get_interval ();
-+		public bool get_remove_on_complete ();
-+		public void set_animatable (Clutter.Animatable? animatable);
-+		[Version (since = "1.12")]
-+		public void set_from_value (GLib.Value value);
-+		public void set_interval (Clutter.Interval? interval);
-+		public void set_remove_on_complete (bool remove_complete);
-+		[Version (since = "1.12")]
-+		public void set_to_value (GLib.Value value);
-+		public Clutter.Animatable animatable { get; set; }
-+		public Clutter.Interval interval { get; set; }
-+		public bool remove_on_complete { get; set; }
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_transition_group_get_type ()")]
-+	[Version (since = "1.12")]
-+	public class TransitionGroup : Clutter.Transition, Clutter.Scriptable {
-+		[CCode (has_construct_function = false, type = "ClutterTransition*")]
-+		public TransitionGroup ();
-+		public void add_transition (Clutter.Transition transition);
-+		public void remove_all ();
-+		public void remove_transition (Clutter.Transition transition);
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_virtual_input_device_get_type ()")]
-+	public class VirtualInputDevice : GLib.Object {
-+		[CCode (has_construct_function = false)]
-+		protected VirtualInputDevice ();
-+		public int get_device_type ();
-+		public virtual void notify_absolute_motion (uint64 time_us, double x, double y);
-+		public virtual void notify_button (uint64 time_us, uint32 button, Clutter.ButtonState button_state);
-+		public virtual void notify_discrete_scroll (uint64 time_us, Clutter.ScrollDirection direction, Clutter.ScrollSource scroll_source);
-+		public virtual void notify_key (uint64 time_us, uint32 key, Clutter.KeyState key_state);
-+		public virtual void notify_keyval (uint64 time_us, uint32 keyval, Clutter.KeyState key_state);
-+		public virtual void notify_relative_motion (uint64 time_us, double dx, double dy);
-+		public virtual void notify_scroll_continuous (uint64 time_us, double dx, double dy, Clutter.ScrollSource scroll_source, Clutter.ScrollFinishFlags finish_flags);
-+		public virtual void notify_touch_down (uint64 time_us, int slot, double x, double y);
-+		public virtual void notify_touch_motion (uint64 time_us, int slot, double x, double y);
-+		public virtual void notify_touch_up (uint64 time_us, int slot);
-+		public Clutter.InputDeviceType device_type { get; construct; }
-+		[NoAccessorMethod]
-+		public Clutter.Seat seat { owned get; construct; }
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_zoom_action_get_type ()")]
-+	[Version (since = "1.12")]
-+	public class ZoomAction : Clutter.GestureAction {
-+		[CCode (has_construct_function = false, type = "ClutterAction*")]
-+		public ZoomAction ();
-+		public Graphene.Point get_focal_point ();
-+		public Graphene.Point get_transformed_focal_point ();
-+		public Clutter.ZoomAxis get_zoom_axis ();
-+		public void set_zoom_axis (Clutter.ZoomAxis axis);
-+		public Clutter.ZoomAxis zoom_axis { get; set; }
-+		public virtual signal bool zoom (Clutter.Actor actor, Graphene.Point focal_point, double factor);
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_cname = "ClutterAnimatableInterface", type_id = "clutter_animatable_get_type ()")]
-+	public interface Animatable : GLib.Object {
-+		[Version (since = "1.4")]
-+		public abstract unowned GLib.ParamSpec find_property (string property_name);
-+		public abstract unowned Clutter.Actor get_actor ();
-+		[Version (since = "1.4")]
-+		public abstract void get_initial_state (string property_name, GLib.Value value);
-+		[Version (since = "1.8")]
-+		public abstract bool interpolate_value (string property_name, Clutter.Interval interval, double progress, out GLib.Value value);
-+		[Version (since = "1.4")]
-+		public abstract void set_final_state (string property_name, GLib.Value value);
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_container_get_type ()")]
-+	[Version (since = "0.4")]
-+	public interface Container : GLib.Object {
-+		public void add (params Clutter.Actor[] actors);
-+		[CCode (vfunc_name = "add")]
-+		[Version (deprecated = true, deprecated_since = "1.10", since = "0.4")]
-+		public abstract void add_actor (Clutter.Actor actor);
-+		[Version (since = "0.8")]
-+		public void child_get (Clutter.Actor actor, ...);
-+		[Version (since = "0.8")]
-+		public void child_get_property (Clutter.Actor child, string property, GLib.Value value);
-+		[Version (since = "0.8")]
-+		public void child_set (Clutter.Actor actor, ...);
-+		[Version (since = "0.8")]
-+		public void child_set_property (Clutter.Actor child, string property, GLib.Value value);
-+		[Version (since = "1.2")]
-+		public virtual void create_child_meta (Clutter.Actor actor);
-+		[Version (since = "1.2")]
-+		public virtual void destroy_child_meta (Clutter.Actor actor);
-+		[Version (since = "0.6")]
-+		public unowned Clutter.Actor find_child_by_name (string child_name);
-+		[CCode (cname = "clutter_container_class_find_child_property")]
-+		public class unowned GLib.ParamSpec find_child_property (string property_name);
-+		[Version (since = "0.8")]
-+		public virtual unowned Clutter.ChildMeta get_child_meta (Clutter.Actor actor);
-+		[Version (deprecated = true, deprecated_since = "1.10", since = "0.4")]
-+		public GLib.List<weak Clutter.Actor> get_children ();
-+		[CCode (cname = "clutter_container_class_list_child_properties")]
-+		public class unowned GLib.ParamSpec[] list_child_properties ();
-+		[CCode (vfunc_name = "lower")]
-+		[Version (deprecated = true, deprecated_since = "1.10", since = "0.6")]
-+		public virtual void lower_child (Clutter.Actor actor, Clutter.Actor? sibling = null);
-+		[CCode (vfunc_name = "raise")]
-+		[Version (deprecated = true, deprecated_since = "1.10", since = "0.6")]
-+		public virtual void raise_child (Clutter.Actor actor, Clutter.Actor? sibling = null);
-+		[Version (deprecated = true, deprecated_since = "1.10", since = "0.4")]
-+		public void remove (...);
-+		[CCode (vfunc_name = "remove")]
-+		[Version (deprecated = true, deprecated_since = "1.10", since = "0.4")]
-+		public abstract void remove_actor (Clutter.Actor actor);
-+		[Version (deprecated = true, deprecated_since = "1.10", since = "0.6")]
-+		public abstract void sort_depth_order ();
-+		public virtual signal void actor_added (Clutter.Actor actor);
-+		public virtual signal void actor_removed (Clutter.Actor actor);
-+		[HasEmitter]
-+		[Version (since = "0.8")]
-+		public virtual signal void child_notify (Clutter.Actor child, GLib.ParamSpec pspec);
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_cname = "ClutterContentInterface", type_id = "clutter_content_get_type ()")]
-+	public interface Content : GLib.Object {
-+		[Version (since = "1.10")]
-+		public abstract bool get_preferred_size (out float width, out float height);
-+		[Version (since = "1.10")]
-+		public abstract void invalidate ();
-+		public abstract void invalidate_size ();
-+		[NoWrapper]
-+		public abstract void paint_content (Clutter.Actor actor, Clutter.PaintNode node, Clutter.PaintContext paint_context);
-+		[Version (since = "1.10")]
-+		public virtual signal void attached (Clutter.Actor actor);
-+		[Version (since = "1.10")]
-+		public virtual signal void detached (Clutter.Actor actor);
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_scriptable_get_type ()")]
-+	[Version (since = "0.6")]
-+	public interface Scriptable : GLib.Object {
-+		public abstract unowned string get_id ();
-+		public abstract bool parse_custom_node (Clutter.Script script, GLib.Value value, string name, Json.Node node);
-+		public abstract void set_custom_property (Clutter.Script script, string name, GLib.Value value);
-+		public abstract void set_id (string id_);
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_actor_box_get_type ()")]
-+	public struct ActorBox {
-+		public float x1;
-+		public float y1;
-+		public float x2;
-+		public float y2;
-+		[Version (since = "1.12")]
-+		public static Clutter.ActorBox? alloc ();
-+		[Version (since = "1.2")]
-+		public static void clamp_to_pixel (ref Clutter.ActorBox box);
-+		[Version (since = "1.0")]
-+		public bool contains (float x, float y);
-+		[Version (since = "1.0")]
-+		public Clutter.ActorBox? copy ();
-+		[Version (since = "1.0")]
-+		public bool equal (Clutter.ActorBox box_b);
-+		[Version (since = "1.0")]
-+		public void free ();
-+		[Version (since = "1.0")]
-+		public float get_area ();
-+		[Version (since = "1.0")]
-+		public float get_height ();
-+		[Version (since = "1.0")]
-+		public void get_origin (out float x, out float y);
-+		[Version (since = "1.0")]
-+		public void get_size (out float width, out float height);
-+		[Version (since = "1.0")]
-+		public float get_width ();
-+		[Version (since = "1.0")]
-+		public float get_x ();
-+		[Version (since = "1.0")]
-+		public float get_y ();
-+		[Version (since = "1.10")]
-+		public unowned Clutter.ActorBox? init (float x_1, float y_1, float x_2, float y_2);
-+		[Version (since = "1.10")]
-+		public void init_rect (float x, float y, float width, float height);
-+		[Version (since = "1.2")]
-+		public Clutter.ActorBox interpolate (Clutter.ActorBox final, double progress);
-+		public bool is_initialized ();
-+		[Version (since = "1.6")]
-+		public void scale (float scale);
-+		[Version (since = "1.6")]
-+		public void set_origin (float x, float y);
-+		[Version (since = "1.6")]
-+		public void set_size (float width, float height);
-+		[Version (since = "1.4")]
-+		public Clutter.ActorBox union (Clutter.ActorBox b);
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
-+	[Version (since = "1.10")]
-+	public struct ActorIter {
-+		public void destroy ();
-+		public void init (Clutter.Actor root);
-+		[Version (since = "1.12")]
-+		public bool is_valid ();
-+		public bool next (out unowned Clutter.Actor child);
-+		public bool prev (out unowned Clutter.Actor child);
-+		public void remove ();
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", has_copy_function = false, has_destroy_function = false, has_type_id = false)]
-+	public struct Capture {
-+		public Cairo.ImageSurface image;
-+		public Cairo.RectangleInt rect;
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_color_get_type ()")]
-+	public struct Color {
-+		public uint8 red;
-+		public uint8 green;
-+		public uint8 blue;
-+		public uint8 alpha;
-+		public Clutter.Color add (Clutter.Color b);
-+		[Version (since = "1.12")]
-+		public static Clutter.Color? alloc ();
-+		[Version (since = "0.2")]
-+		public Clutter.Color? copy ();
-+		public Clutter.Color darken ();
-+		[Version (since = "0.2")]
-+		public bool equal (Clutter.Color v2);
-+		[Version (since = "0.2")]
-+		public void free ();
-+		[CCode (cname = "clutter_color_from_hls")]
-+		public Color.from_hls (float hue, float luminance, float saturation);
-+		[CCode (cname = "clutter_color_from_pixel")]
-+		public Color.from_pixel (uint32 pixel);
-+		[CCode (cname = "clutter_color_from_string")]
-+		public static bool from_string (out Clutter.Color color, string str);
-+		public static unowned Clutter.Color? get_static (Clutter.StaticColor color);
-+		[Version (since = "1.0")]
-+		public uint hash ();
-+		[Version (since = "1.12")]
-+		public unowned Clutter.Color? init (uint8 red, uint8 green, uint8 blue, uint8 alpha);
-+		[Version (since = "1.6")]
-+		public Clutter.Color interpolate (Clutter.Color final, double progress);
-+		public Clutter.Color lighten ();
-+		public bool parse_string (string str);
-+		public Clutter.Color shade (double factor);
-+		public Clutter.Color subtract (Clutter.Color b);
-+		public void to_hls (out float hue, out float luminance, out float saturation);
-+		public uint32 to_pixel ();
-+		[Version (since = "0.2")]
-+		public string to_string ();
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_knot_get_type ()")]
-+	[Version (since = "0.2")]
-+	public struct Knot {
-+		public int x;
-+		public int y;
-+		public Clutter.Knot? copy ();
-+		public bool equal (Clutter.Knot knot_b);
-+		public void free ();
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_margin_get_type ()")]
-+	[Version (since = "1.10")]
-+	public struct Margin {
-+		public float left;
-+		public float right;
-+		public float top;
-+		public float bottom;
-+		public Clutter.Margin? copy ();
-+		public void free ();
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_paint_volume_get_type ()")]
-+	[Version (since = "1.4")]
-+	public struct PaintVolume {
-+		[Version (since = "1.6")]
-+		public Clutter.PaintVolume? copy ();
-+		[Version (since = "1.6")]
-+		public void free ();
-+		[Version (since = "1.6")]
-+		public float get_depth ();
-+		[Version (since = "1.6")]
-+		public float get_height ();
-+		[Version (since = "1.6")]
-+		public Graphene.Point3D get_origin ();
-+		[Version (since = "1.6")]
-+		public float get_width ();
-+		[Version (since = "1.6")]
-+		public void set_depth (float depth);
-+		[Version (since = "1.6")]
-+		public bool set_from_allocation (Clutter.Actor actor);
-+		[Version (since = "1.6")]
-+		public void set_height (float height);
-+		[Version (since = "1.6")]
-+		public void set_origin (Graphene.Point3D origin);
-+		[Version (since = "1.6")]
-+		public void set_width (float width);
-+		[Version (since = "1.6")]
-+		public void union (Clutter.PaintVolume another_pv);
-+		[Version (since = "1.10")]
-+		public void union_box (Clutter.ActorBox box);
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_path_node_get_type ()")]
-+	[Version (since = "1.0")]
-+	public struct PathNode {
-+		public Clutter.PathNodeType type;
-+		[CCode (array_length = false)]
-+		public weak Clutter.Knot points[3];
-+		public Clutter.PathNode? copy ();
-+		public bool equal (Clutter.PathNode node_b);
-+		public void free ();
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_perspective_get_type ()")]
-+	[Version (since = "0.4")]
-+	public struct Perspective {
-+		public float fovy;
-+		public float aspect;
-+		public float z_near;
-+		public float z_far;
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
-+	public struct PointerA11ySettings {
-+		public Clutter.PointerA11yFlags controls;
-+		public Clutter.PointerA11yDwellClickType dwell_click_type;
-+		public Clutter.PointerA11yDwellMode dwell_mode;
-+		public Clutter.PointerA11yDwellDirection dwell_gesture_single;
-+		public Clutter.PointerA11yDwellDirection dwell_gesture_double;
-+		public Clutter.PointerA11yDwellDirection dwell_gesture_drag;
-+		public Clutter.PointerA11yDwellDirection dwell_gesture_secondary;
-+		public int secondary_click_delay;
-+		public int dwell_delay;
-+		public int dwell_threshold;
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_units_get_type ()")]
-+	[Version (since = "1.0")]
-+	public struct Units {
-+		public Clutter.Units? copy ();
-+		public void free ();
-+		[CCode (cname = "clutter_units_from_cm")]
-+		public Units.from_cm (float cm);
-+		[CCode (cname = "clutter_units_from_em")]
-+		public Units.from_em (float em);
-+		[CCode (cname = "clutter_units_from_em_for_font")]
-+		public Units.from_em_for_font (string font_name, float em);
-+		[CCode (cname = "clutter_units_from_mm")]
-+		public Units.from_mm (float mm);
-+		[CCode (cname = "clutter_units_from_pixels")]
-+		public Units.from_pixels (int px);
-+		[CCode (cname = "clutter_units_from_pt")]
-+		public Units.from_pt (float pt);
-+		[CCode (cname = "clutter_units_from_string")]
-+		public Units.from_string (string str);
-+		public Clutter.UnitType get_unit_type ();
-+		public float get_unit_value ();
-+		public float to_pixels ();
-+		public string to_string ();
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_ACTOR_ALIGN_", type_id = "clutter_actor_align_get_type ()")]
-+	[Version (since = "1.10")]
-+	public enum ActorAlign {
-+		FILL,
-+		START,
-+		CENTER,
-+		END
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_ACTOR_", type_id = "clutter_actor_flags_get_type ()")]
-+	[Flags]
-+	public enum ActorFlags {
-+		MAPPED,
-+		REALIZED,
-+		REACTIVE,
-+		VISIBLE,
-+		NO_LAYOUT
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_ALIGN_", type_id = "clutter_align_axis_get_type ()")]
-+	[Version (since = "1.4")]
-+	public enum AlignAxis {
-+		X_AXIS,
-+		Y_AXIS,
-+		BOTH
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_", type_id = "clutter_animation_mode_get_type ()")]
-+	[Version (since = "1.0")]
-+	public enum AnimationMode {
-+		CUSTOM_MODE,
-+		LINEAR,
-+		EASE_IN_QUAD,
-+		EASE_OUT_QUAD,
-+		EASE_IN_OUT_QUAD,
-+		EASE_IN_CUBIC,
-+		EASE_OUT_CUBIC,
-+		EASE_IN_OUT_CUBIC,
-+		EASE_IN_QUART,
-+		EASE_OUT_QUART,
-+		EASE_IN_OUT_QUART,
-+		EASE_IN_QUINT,
-+		EASE_OUT_QUINT,
-+		EASE_IN_OUT_QUINT,
-+		EASE_IN_SINE,
-+		EASE_OUT_SINE,
-+		EASE_IN_OUT_SINE,
-+		EASE_IN_EXPO,
-+		EASE_OUT_EXPO,
-+		EASE_IN_OUT_EXPO,
-+		EASE_IN_CIRC,
-+		EASE_OUT_CIRC,
-+		EASE_IN_OUT_CIRC,
-+		EASE_IN_ELASTIC,
-+		EASE_OUT_ELASTIC,
-+		EASE_IN_OUT_ELASTIC,
-+		EASE_IN_BACK,
-+		EASE_OUT_BACK,
-+		EASE_IN_OUT_BACK,
-+		EASE_IN_BOUNCE,
-+		EASE_OUT_BOUNCE,
-+		EASE_IN_OUT_BOUNCE,
-+		STEPS,
-+		STEP_START,
-+		STEP_END,
-+		CUBIC_BEZIER,
-+		EASE,
-+		EASE_IN,
-+		EASE_OUT,
-+		EASE_IN_OUT,
-+		ANIMATION_LAST
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_BIN_ALIGNMENT_", type_id = "clutter_bin_alignment_get_type ()")]
-+	[Version (since = "1.2")]
-+	public enum BinAlignment {
-+		[Version (deprecated = true)]
-+		FIXED,
-+		[Version (deprecated = true)]
-+		FILL,
-+		START,
-+		[Version (deprecated = true)]
-+		END,
-+		[Version (deprecated = true)]
-+		CENTER
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_BIND_", type_id = "clutter_bind_coordinate_get_type ()")]
-+	[Version (since = "1.4")]
-+	public enum BindCoordinate {
-+		X,
-+		Y,
-+		WIDTH,
-+		HEIGHT,
-+		POSITION,
-+		SIZE,
-+		ALL
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_BOX_ALIGNMENT_", type_id = "clutter_box_alignment_get_type ()")]
-+	[Version (since = "1.2")]
-+	public enum BoxAlignment {
-+		START,
-+		END,
-+		CENTER
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_BUTTON_STATE_", type_id = "clutter_button_state_get_type ()")]
-+	public enum ButtonState {
-+		RELEASED,
-+		PRESSED
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_CONTENT_GRAVITY_", type_id = "clutter_content_gravity_get_type ()")]
-+	[Version (since = "1.10")]
-+	public enum ContentGravity {
-+		TOP_LEFT,
-+		TOP,
-+		TOP_RIGHT,
-+		LEFT,
-+		CENTER,
-+		RIGHT,
-+		BOTTOM_LEFT,
-+		BOTTOM,
-+		BOTTOM_RIGHT,
-+		RESIZE_FILL,
-+		RESIZE_ASPECT
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_REPEAT_", type_id = "clutter_content_repeat_get_type ()")]
-+	[Flags]
-+	[Version (since = "1.12")]
-+	public enum ContentRepeat {
-+		NONE,
-+		X_AXIS,
-+		Y_AXIS,
-+		BOTH
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_DEBUG_", type_id = "clutter_debug_flag_get_type ()")]
-+	[Flags]
-+	public enum DebugFlag {
-+		MISC,
-+		ACTOR,
-+		TEXTURE,
-+		EVENT,
-+		PAINT,
-+		PANGO,
-+		BACKEND,
-+		SCHEDULER,
-+		SCRIPT,
-+		SHADER,
-+		MULTISTAGE,
-+		ANIMATION,
-+		LAYOUT,
-+		PICK,
-+		EVENTLOOP,
-+		CLIPPING,
-+		OOB_TRANSFORMS
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_DRAG_", type_id = "clutter_drag_axis_get_type ()")]
-+	[Version (since = "1.4")]
-+	public enum DragAxis {
-+		AXIS_NONE,
-+		X_AXIS,
-+		Y_AXIS
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_DEBUG_", type_id = "clutter_draw_debug_flag_get_type ()")]
-+	[Flags]
-+	public enum DrawDebugFlag {
-+		DISABLE_SWAP_EVENTS,
-+		DISABLE_CLIPPED_REDRAWS,
-+		REDRAWS,
-+		PAINT_VOLUMES,
-+		DISABLE_CULLING,
-+		DISABLE_OFFSCREEN_REDIRECT,
-+		CONTINUOUS_REDRAW,
-+		PAINT_DEFORM_TILES,
-+		PAINT_DAMAGE_REGION
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_EFFECT_PAINT_", type_id = "clutter_effect_paint_flags_get_type ()")]
-+	[Flags]
-+	public enum EffectPaintFlags {
-+		ACTOR_DIRTY,
-+		BYPASS_EFFECT
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_EVENT_", type_id = "clutter_event_flags_get_type ()")]
-+	[Flags]
-+	[Version (since = "0.6")]
-+	public enum EventFlags {
-+		NONE,
-+		FLAG_SYNTHETIC,
-+		FLAG_INPUT_METHOD,
-+		FLAG_REPEATED,
-+		FLAG_RELATIVE_MOTION
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_", type_id = "clutter_event_type_get_type ()")]
-+	[Version (since = "0.4")]
-+	public enum EventType {
-+		NOTHING,
-+		KEY_PRESS,
-+		KEY_RELEASE,
-+		MOTION,
-+		ENTER,
-+		LEAVE,
-+		BUTTON_PRESS,
-+		BUTTON_RELEASE,
-+		SCROLL,
-+		TOUCH_BEGIN,
-+		TOUCH_UPDATE,
-+		TOUCH_END,
-+		TOUCH_CANCEL,
-+		TOUCHPAD_PINCH,
-+		TOUCHPAD_SWIPE,
-+		PROXIMITY_IN,
-+		PROXIMITY_OUT,
-+		PAD_BUTTON_PRESS,
-+		PAD_BUTTON_RELEASE,
-+		PAD_STRIP,
-+		PAD_RING,
-+		DEVICE_ADDED,
-+		DEVICE_REMOVED,
-+		IM_COMMIT,
-+		IM_DELETE,
-+		IM_PREEDIT,
-+		EVENT_LAST
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_FEATURE_", type_id = "clutter_feature_flags_get_type ()")]
-+	[Flags]
-+	[Version (since = "0.4")]
-+	public enum FeatureFlags {
-+		STAGE_STATIC,
-+		STAGE_CURSOR,
-+		SHADERS_GLSL,
-+		OFFSCREEN,
-+		STAGE_MULTIPLE,
-+		SWAP_EVENTS
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_FLOW_", type_id = "clutter_flow_orientation_get_type ()")]
-+	[Version (since = "1.2")]
-+	public enum FlowOrientation {
-+		HORIZONTAL,
-+		VERTICAL
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_FRAME_RESULT_", type_id = "clutter_frame_result_get_type ()")]
-+	public enum FrameResult {
-+		PENDING_PRESENTED,
-+		IDLE
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_GESTURE_TRIGGER_EDGE_", type_id = "clutter_gesture_trigger_edge_get_type ()")]
-+	[Version (since = "1.18")]
-+	public enum GestureTriggerEdge {
-+		NONE,
-+		AFTER,
-+		BEFORE
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_GRAVITY_", type_id = "clutter_gravity_get_type ()")]
-+	[Version (deprecated = true, deprecated_since = "1.22", since = "0.2")]
-+	public enum Gravity {
-+		NONE,
-+		NORTH,
-+		NORTH_EAST,
-+		EAST,
-+		SOUTH_EAST,
-+		SOUTH,
-+		SOUTH_WEST,
-+		WEST,
-+		NORTH_WEST,
-+		CENTER
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_GRID_POSITION_", type_id = "clutter_grid_position_get_type ()")]
-+	[Version (since = "1.12")]
-+	public enum GridPosition {
-+		LEFT,
-+		RIGHT,
-+		TOP,
-+		BOTTOM
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_INIT_", type_id = "clutter_init_error_get_type ()")]
-+	[Version (since = "0.2")]
-+	public enum InitError {
-+		SUCCESS,
-+		ERROR_UNKNOWN,
-+		ERROR_THREADS,
-+		ERROR_BACKEND,
-+		ERROR_INTERNAL;
-+		public static GLib.Quark quark ();
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_INPUT_AXIS_", type_id = "clutter_input_axis_get_type ()")]
-+	[Version (since = "1.6")]
-+	public enum InputAxis {
-+		IGNORE,
-+		X,
-+		Y,
-+		PRESSURE,
-+		XTILT,
-+		YTILT,
-+		WHEEL,
-+		DISTANCE,
-+		ROTATION,
-+		SLIDER,
-+		LAST
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_INPUT_AXIS_FLAG_", type_id = "clutter_input_axis_flags_get_type ()")]
-+	[Flags]
-+	public enum InputAxisFlags {
-+		NONE,
-+		X,
-+		Y,
-+		PRESSURE,
-+		XTILT,
-+		YTILT,
-+		WHEEL,
-+		DISTANCE,
-+		ROTATION,
-+		SLIDER
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_INPUT_CONTENT_HINT_", type_id = "clutter_input_content_hint_flags_get_type ()")]
-+	[Flags]
-+	public enum InputContentHintFlags {
-+		COMPLETION,
-+		SPELLCHECK,
-+		AUTO_CAPITALIZATION,
-+		LOWERCASE,
-+		UPPERCASE,
-+		TITLECASE,
-+		HIDDEN_TEXT,
-+		SENSITIVE_DATA,
-+		LATIN,
-+		MULTILINE
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_INPUT_CONTENT_PURPOSE_", type_id = "clutter_input_content_purpose_get_type ()")]
-+	public enum InputContentPurpose {
-+		NORMAL,
-+		ALPHA,
-+		DIGITS,
-+		NUMBER,
-+		PHONE,
-+		URL,
-+		EMAIL,
-+		NAME,
-+		PASSWORD,
-+		DATE,
-+		TIME,
-+		DATETIME,
-+		TERMINAL
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_PAD_FEATURE_", type_id = "clutter_input_device_pad_feature_get_type ()")]
-+	public enum InputDevicePadFeature {
-+		BUTTON,
-+		RING,
-+		STRIP
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_INPUT_DEVICE_PAD_SOURCE_", type_id = "clutter_input_device_pad_source_get_type ()")]
-+	public enum InputDevicePadSource {
-+		UNKNOWN,
-+		FINGER
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_INPUT_DEVICE_TOOL_", type_id = "clutter_input_device_tool_type_get_type ()")]
-+	[Version (since = "1.28")]
-+	public enum InputDeviceToolType {
-+		NONE,
-+		PEN,
-+		ERASER,
-+		BRUSH,
-+		PENCIL,
-+		AIRBRUSH,
-+		MOUSE,
-+		LENS
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_", type_id = "clutter_input_device_type_get_type ()")]
-+	[Version (since = "1.0")]
-+	public enum InputDeviceType {
-+		POINTER_DEVICE,
-+		KEYBOARD_DEVICE,
-+		EXTENSION_DEVICE,
-+		JOYSTICK_DEVICE,
-+		TABLET_DEVICE,
-+		TOUCHPAD_DEVICE,
-+		TOUCHSCREEN_DEVICE,
-+		PEN_DEVICE,
-+		ERASER_DEVICE,
-+		CURSOR_DEVICE,
-+		PAD_DEVICE,
-+		N_DEVICE_TYPES
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_INPUT_MODE_", type_id = "clutter_input_mode_get_type ()")]
-+	[Version (since = "1.6")]
-+	public enum InputMode {
-+		LOGICAL,
-+		PHYSICAL,
-+		FLOATING
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_INPUT_PANEL_STATE_", type_id = "clutter_input_panel_state_get_type ()")]
-+	public enum InputPanelState {
-+		OFF,
-+		ON,
-+		TOGGLE
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_INTERPOLATION_", type_id = "clutter_interpolation_get_type ()")]
-+	[Version (deprecated = true, deprecated_since = "1.22", since = "1.2")]
-+	public enum Interpolation {
-+		LINEAR,
-+		CUBIC
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_KEY_STATE_", type_id = "clutter_key_state_get_type ()")]
-+	public enum KeyState {
-+		RELEASED,
-+		PRESSED
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_LONG_PRESS_", type_id = "clutter_long_press_state_get_type ()")]
-+	[Version (since = "1.8")]
-+	public enum LongPressState {
-+		QUERY,
-+		ACTIVATE,
-+		CANCEL
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_", type_id = "clutter_modifier_type_get_type ()")]
-+	[Flags]
-+	[Version (since = "0.4")]
-+	public enum ModifierType {
-+		SHIFT_MASK,
-+		LOCK_MASK,
-+		CONTROL_MASK,
-+		MOD1_MASK,
-+		MOD2_MASK,
-+		MOD3_MASK,
-+		MOD4_MASK,
-+		MOD5_MASK,
-+		BUTTON1_MASK,
-+		BUTTON2_MASK,
-+		BUTTON3_MASK,
-+		BUTTON4_MASK,
-+		BUTTON5_MASK,
-+		MODIFIER_RESERVED_13_MASK,
-+		MODIFIER_RESERVED_14_MASK,
-+		MODIFIER_RESERVED_15_MASK,
-+		MODIFIER_RESERVED_16_MASK,
-+		MODIFIER_RESERVED_17_MASK,
-+		MODIFIER_RESERVED_18_MASK,
-+		MODIFIER_RESERVED_19_MASK,
-+		MODIFIER_RESERVED_20_MASK,
-+		MODIFIER_RESERVED_21_MASK,
-+		MODIFIER_RESERVED_22_MASK,
-+		MODIFIER_RESERVED_23_MASK,
-+		MODIFIER_RESERVED_24_MASK,
-+		MODIFIER_RESERVED_25_MASK,
-+		SUPER_MASK,
-+		HYPER_MASK,
-+		META_MASK,
-+		MODIFIER_RESERVED_29_MASK,
-+		RELEASE_MASK,
-+		MODIFIER_MASK
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_OFFSCREEN_REDIRECT_", type_id = "clutter_offscreen_redirect_get_type ()")]
-+	[Flags]
-+	[Version (since = "1.8")]
-+	public enum OffscreenRedirect {
-+		AUTOMATIC_FOR_OPACITY,
-+		ALWAYS,
-+		ON_IDLE
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_ORIENTATION_", type_id = "clutter_orientation_get_type ()")]
-+	[Version (since = "1.12")]
-+	public enum Orientation {
-+		HORIZONTAL,
-+		VERTICAL
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_PAINT_FLAG_", type_id = "clutter_paint_flag_get_type ()")]
-+	[Flags]
-+	public enum PaintFlag {
-+		NONE,
-+		NO_CURSORS,
-+		FORCE_CURSORS,
-+		CLEAR
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_PAN_", type_id = "clutter_pan_axis_get_type ()")]
-+	[Version (since = "1.12")]
-+	public enum PanAxis {
-+		AXIS_NONE,
-+		X_AXIS,
-+		Y_AXIS,
-+		AXIS_AUTO
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_PATH_", type_id = "clutter_path_node_type_get_type ()")]
-+	[Version (since = "1.0")]
-+	public enum PathNodeType {
-+		MOVE_TO,
-+		LINE_TO,
-+		CURVE_TO,
-+		CLOSE,
-+		REL_MOVE_TO,
-+		REL_LINE_TO,
-+		REL_CURVE_TO
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_DEBUG_NOP_", type_id = "clutter_pick_debug_flag_get_type ()")]
-+	[Flags]
-+	public enum PickDebugFlag {
-+		PICKING
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_PICK_", type_id = "clutter_pick_mode_get_type ()")]
-+	[Version (since = "1.0")]
-+	public enum PickMode {
-+		NONE,
-+		REACTIVE,
-+		ALL
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_A11Y_DWELL_CLICK_TYPE_", type_id = "clutter_pointer_a11y_dwell_click_type_get_type ()")]
-+	public enum PointerA11yDwellClickType {
-+		NONE,
-+		PRIMARY,
-+		SECONDARY,
-+		MIDDLE,
-+		DOUBLE,
-+		DRAG
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_A11Y_DWELL_DIRECTION_", type_id = "clutter_pointer_a11y_dwell_direction_get_type ()")]
-+	public enum PointerA11yDwellDirection {
-+		NONE,
-+		LEFT,
-+		RIGHT,
-+		UP,
-+		DOWN
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_A11Y_DWELL_MODE_", type_id = "clutter_pointer_a11y_dwell_mode_get_type ()")]
-+	public enum PointerA11yDwellMode {
-+		WINDOW,
-+		GESTURE
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_A11Y_", type_id = "clutter_pointer_a11y_flags_get_type ()")]
-+	[Flags]
-+	public enum PointerA11yFlags {
-+		SECONDARY_CLICK_ENABLED,
-+		DWELL_ENABLED
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_A11Y_TIMEOUT_TYPE_", type_id = "clutter_pointer_a11y_timeout_type_get_type ()")]
-+	public enum PointerA11yTimeoutType {
-+		SECONDARY_CLICK,
-+		DWELL,
-+		GESTURE
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_REPAINT_FLAGS_", type_id = "clutter_repaint_flags_get_type ()")]
-+	[Flags]
-+	[Version (since = "1.10")]
-+	public enum RepaintFlags {
-+		PRE_PAINT,
-+		POST_PAINT
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_REQUEST_", type_id = "clutter_request_mode_get_type ()")]
-+	[Version (since = "0.8")]
-+	public enum RequestMode {
-+		HEIGHT_FOR_WIDTH,
-+		WIDTH_FOR_HEIGHT,
-+		CONTENT_SIZE
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_", type_id = "clutter_rotate_axis_get_type ()")]
-+	[Version (since = "0.4")]
-+	public enum RotateAxis {
-+		X_AXIS,
-+		Y_AXIS,
-+		Z_AXIS
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_ROTATE_", type_id = "clutter_rotate_direction_get_type ()")]
-+	[Version (deprecated = true, deprecated_since = "1.22", since = "0.4")]
-+	public enum RotateDirection {
-+		CW,
-+		CCW
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_SCALING_FILTER_", type_id = "clutter_scaling_filter_get_type ()")]
-+	[Version (since = "1.10")]
-+	public enum ScalingFilter {
-+		LINEAR,
-+		NEAREST,
-+		TRILINEAR
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_SCROLL_", type_id = "clutter_scroll_direction_get_type ()")]
-+	[Version (since = "0.4")]
-+	public enum ScrollDirection {
-+		UP,
-+		DOWN,
-+		LEFT,
-+		RIGHT,
-+		SMOOTH
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_SCROLL_FINISHED_", type_id = "clutter_scroll_finish_flags_get_type ()")]
-+	[Flags]
-+	[Version (since = "1.26")]
-+	public enum ScrollFinishFlags {
-+		NONE,
-+		HORIZONTAL,
-+		VERTICAL
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_SCROLL_", type_id = "clutter_scroll_mode_get_type ()")]
-+	[Flags]
-+	[Version (since = "1.12")]
-+	public enum ScrollMode {
-+		NONE,
-+		HORIZONTALLY,
-+		VERTICALLY,
-+		BOTH
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_SCROLL_SOURCE_", type_id = "clutter_scroll_source_get_type ()")]
-+	[Version (since = "1.26")]
-+	public enum ScrollSource {
-+		UNKNOWN,
-+		WHEEL,
-+		FINGER,
-+		CONTINUOUS
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_", type_id = "clutter_shader_type_get_type ()")]
-+	[Version (since = "1.4")]
-+	public enum ShaderType {
-+		VERTEX_SHADER,
-+		FRAGMENT_SHADER
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_SNAP_EDGE_", type_id = "clutter_snap_edge_get_type ()")]
-+	[Version (since = "1.6")]
-+	public enum SnapEdge {
-+		TOP,
-+		RIGHT,
-+		BOTTOM,
-+		LEFT
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_COLOR_", type_id = "clutter_static_color_get_type ()")]
-+	[Version (since = "1.6")]
-+	public enum StaticColor {
-+		WHITE,
-+		BLACK,
-+		RED,
-+		DARK_RED,
-+		GREEN,
-+		DARK_GREEN,
-+		BLUE,
-+		DARK_BLUE,
-+		CYAN,
-+		DARK_CYAN,
-+		MAGENTA,
-+		DARK_MAGENTA,
-+		YELLOW,
-+		DARK_YELLOW,
-+		GRAY,
-+		DARK_GRAY,
-+		LIGHT_GRAY,
-+		BUTTER,
-+		BUTTER_LIGHT,
-+		BUTTER_DARK,
-+		ORANGE,
-+		ORANGE_LIGHT,
-+		ORANGE_DARK,
-+		CHOCOLATE,
-+		CHOCOLATE_LIGHT,
-+		CHOCOLATE_DARK,
-+		CHAMELEON,
-+		CHAMELEON_LIGHT,
-+		CHAMELEON_DARK,
-+		SKY_BLUE,
-+		SKY_BLUE_LIGHT,
-+		SKY_BLUE_DARK,
-+		PLUM,
-+		PLUM_LIGHT,
-+		PLUM_DARK,
-+		SCARLET_RED,
-+		SCARLET_RED_LIGHT,
-+		SCARLET_RED_DARK,
-+		ALUMINIUM_1,
-+		ALUMINIUM_2,
-+		ALUMINIUM_3,
-+		ALUMINIUM_4,
-+		ALUMINIUM_5,
-+		ALUMINIUM_6,
-+		TRANSPARENT
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_STEP_MODE_", type_id = "clutter_step_mode_get_type ()")]
-+	[Version (since = "1.12")]
-+	public enum StepMode {
-+		START,
-+		END
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_SWIPE_DIRECTION_", type_id = "clutter_swipe_direction_get_type ()")]
-+	[Flags]
-+	[Version (since = "1.8")]
-+	public enum SwipeDirection {
-+		UP,
-+		DOWN,
-+		LEFT,
-+		RIGHT
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_TEXT_DIRECTION_", type_id = "clutter_text_direction_get_type ()")]
-+	[Version (since = "1.2")]
-+	public enum TextDirection {
-+		DEFAULT,
-+		LTR,
-+		RTL
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_TEXTURE_", type_id = "clutter_texture_flags_get_type ()")]
-+	[Flags]
-+	[Version (deprecated = true, deprecated_since = "1.22", since = "0.4")]
-+	public enum TextureFlags {
-+		NONE,
-+		RGB_FLAG_BGR,
-+		RGB_FLAG_PREMULT,
-+		YUV_FLAG_YUV2
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_TEXTURE_QUALITY_", type_id = "clutter_texture_quality_get_type ()")]
-+	[Version (deprecated = true, deprecated_since = "1.22", since = "0.8")]
-+	public enum TextureQuality {
-+		LOW,
-+		MEDIUM,
-+		HIGH
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_TIMELINE_", type_id = "clutter_timeline_direction_get_type ()")]
-+	[Version (since = "0.6")]
-+	public enum TimelineDirection {
-+		FORWARD,
-+		BACKWARD
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_TOUCHPAD_GESTURE_PHASE_", type_id = "clutter_touchpad_gesture_phase_get_type ()")]
-+	[Version (since = "1.24")]
-+	public enum TouchpadGesturePhase {
-+		BEGIN,
-+		UPDATE,
-+		END,
-+		CANCEL
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_UNIT_", type_id = "clutter_unit_type_get_type ()")]
-+	[Version (since = "1.0")]
-+	public enum UnitType {
-+		PIXEL,
-+		EM,
-+		MM,
-+		POINT,
-+		CM
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_VIRTUAL_DEVICE_TYPE_", type_id = "clutter_virtual_device_type_get_type ()")]
-+	[Flags]
-+	public enum VirtualDeviceType {
-+		NONE,
-+		KEYBOARD,
-+		POINTER,
-+		TOUCHSCREEN
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_ZOOM_", type_id = "clutter_zoom_axis_get_type ()")]
-+	[Version (since = "1.12")]
-+	public enum ZoomAxis {
-+		X_AXIS,
-+		Y_AXIS,
-+		BOTH
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_IMAGE_ERROR_INVALID_")]
-+	[Version (since = "1.10")]
-+	public errordomain ImageError {
-+		DATA;
-+		public static GLib.Quark quark ();
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_SCRIPT_ERROR_INVALID_")]
-+	[Version (since = "0.6")]
-+	public errordomain ScriptError {
-+		TYPE_FUNCTION,
-+		PROPERTY,
-+		VALUE;
-+		public static GLib.Quark quark ();
-+	}
-+	[CCode (cheader_filename = "clutter/clutter.h", instance_pos = 1.9)]
-+	[Version (since = "1.24")]
-+	public delegate Clutter.Actor ActorCreateChildFunc (GLib.Object item);
-+	[CCode (cheader_filename = "clutter/clutter.h", instance_pos = 4.9)]
-+	[Version (since = "1.0")]
-+	public delegate bool BindingActionFunc (GLib.Object gobject, string action_name, uint key_val, Clutter.ModifierType modifiers);
-+	[CCode (cheader_filename = "clutter/clutter.h", instance_pos = 1.9)]
-+	public delegate void Callback (Clutter.Actor actor);
-+	[CCode (cheader_filename = "clutter/clutter.h", instance_pos = 1.9)]
-+	[Version (since = "1.18")]
-+	public delegate bool EventFilterFunc (Clutter.Event event);
-+	[CCode (cheader_filename = "clutter/clutter.h", instance_pos = 1.9)]
-+	[Version (since = "1.0")]
-+	public delegate void PathCallback (Clutter.PathNode node);
-+	[CCode (cheader_filename = "clutter/clutter.h", has_target = false)]
-+	[Version (since = "1.0")]
-+	public delegate bool ProgressFunc (GLib.Value a, GLib.Value b, double progress, GLib.Value retval);
-+	[CCode (cheader_filename = "clutter/clutter.h", instance_pos = 6.9)]
-+	[Version (since = "0.6")]
-+	public delegate void ScriptConnectFunc (Clutter.Script script, GLib.Object object, string signal_name, string handler_name, GLib.Object connect_object, GLib.ConnectFlags flags);
-+	[CCode (cheader_filename = "clutter/clutter.h", instance_pos = 3.9)]
-+	[Version (since = "1.10")]
-+	public delegate double TimelineProgressFunc (Clutter.Timeline timeline, double elapsed, double total);
-+	[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_COGL")]
-+	[Version (deprecated = true, deprecated_since = "1.10", since = "0.4")]
-+	public const string COGL;
-+	[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_CURRENT_TIME")]
-+	[Version (since = "0.4")]
-+	public const int CURRENT_TIME;
-+	[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_FLAVOUR")]
-+	[Version (deprecated = true, deprecated_since = "1.10", since = "0.4")]
-+	public const string FLAVOUR;
-+	[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_PATH_RELATIVE")]
-+	public const int PATH_RELATIVE;
-+	[CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_PRIORITY_REDRAW")]
-+	[Version (since = "0.8")]
-+	public const int PRIORITY_REDRAW;
-+	[CCode (cheader_filename = "clutter/clutter.h")]
-+	public static void base_init ();
-+	[CCode (cheader_filename = "clutter/clutter.h")]
-+	[Version (since = "1.12")]
-+	public static void cairo_clear (Cairo.Context cr);
-+	[CCode (cheader_filename = "clutter/clutter.h")]
-+	[Version (since = "1.0")]
-+	public static void cairo_set_source_color (Cairo.Context cr, Clutter.Color color);
-+	[CCode (cheader_filename = "clutter/clutter.h")]
-+	[Version (since = "1.6")]
-+	public static unowned Clutter.Color? color_get_static (Clutter.StaticColor color);
-+	[CCode (cheader_filename = "clutter/clutter.h")]
-+	[Version (since = "1.14")]
-+	public static void disable_accessibility ();
-+	[CCode (cheader_filename = "clutter/clutter.h")]
-+	[Version (since = "0.4")]
-+	public static void do_event (Clutter.Event event);
-+	[CCode (cheader_filename = "clutter/clutter.h")]
-+	[Version (since = "0.4")]
-+	public static bool events_pending ();
-+	[CCode (cheader_filename = "clutter/clutter.h")]
-+	[Version (since = "1.4")]
-+	public static bool get_accessibility_enabled ();
-+	[CCode (cheader_filename = "clutter/clutter.h")]
-+	[Version (since = "1.2")]
-+	public static unowned Clutter.Event get_current_event ();
-+	[CCode (cheader_filename = "clutter/clutter.h")]
-+	[Version (since = "1.0")]
-+	public static uint32 get_current_event_time ();
-+	[CCode (cheader_filename = "clutter/clutter.h")]
-+	[Version (since = "0.4")]
-+	public static unowned Clutter.Backend get_default_backend ();
-+	[CCode (cheader_filename = "clutter/clutter.h")]
-+	[Version (since = "0.6")]
-+	public static uint get_default_frame_rate ();
-+	[CCode (cheader_filename = "clutter/clutter.h")]
-+	[Version (since = "1.2")]
-+	public static Clutter.TextDirection get_default_text_direction ();
-+	[CCode (cheader_filename = "clutter/clutter.h")]
-+	[Version (since = "1.0")]
-+	public static unowned Pango.FontMap get_font_map ();
-+	[CCode (cheader_filename = "clutter/clutter.h")]
-+	[Version (since = "0.2")]
-+	public static GLib.OptionGroup get_option_group ();
-+	[CCode (cheader_filename = "clutter/clutter.h")]
-+	[Version (since = "0.8")]
-+	public static GLib.OptionGroup get_option_group_without_init ();
-+	[CCode (cheader_filename = "clutter/clutter.h")]
-+	[Version (since = "0.6")]
-+	public static unowned string get_script_id (GLib.Object gobject);
-+	[CCode (cheader_filename = "clutter/clutter.h")]
-+	public static Clutter.InitError init ([CCode (array_length_cname = "argc", array_length_pos = 0.5)] ref unowned string[]? argv);
-+	[CCode (cheader_filename = "clutter/clutter.h")]
-+	[Version (since = "0.2")]
-+	public static Clutter.InitError init_with_args ([CCode (array_length_cname = "argc", array_length_pos = 0.5)] ref unowned string[]? argv, string? parameter_string, [CCode (array_length = false)] GLib.OptionEntry[]? entries, string? translation_domain) throws GLib.Error;
-+	[CCode (cheader_filename = "clutter/clutter.h")]
-+	public static uint32 keysym_to_unicode (uint keyval);
-+	[CCode (cheader_filename = "clutter/clutter.h")]
-+	public static void set_custom_backend_func (void* func);
-+	[CCode (cheader_filename = "clutter/clutter.h")]
-+	[Version (since = "1.10")]
-+	public static uint unicode_to_keysym (uint32 wc);
-+}
-diff --git vapi/mutter-cogl-7.vapi vapi/mutter-cogl-7.vapi
-index 620c2317..1aae97d5 100644
---- vapi/mutter-cogl-7.vapi
-+++ vapi/mutter-cogl-7.vapi
-@@ -32,7 +32,9 @@ namespace Cogl {
- 	public class Context : Cogl.Object {
- 		[CCode (has_construct_function = false)]
- 		protected Context ();
-+		public unowned Cogl.Pipeline get_named_pipeline (Cogl.PipelineKey key);
- 		public bool is_hardware_accelerated ();
-+		public void set_named_pipeline (Cogl.PipelineKey key, Cogl.Pipeline? pipeline);
- 	}
- 	[CCode (cheader_filename = "cogl/cogl.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "cogl_frame_closure_get_gtype ()")]
- 	[Compact]
-@@ -270,6 +272,10 @@ namespace Cogl {
- 		[Version (since = "2.0")]
- 		public void set_user_program (Cogl.Handle program);
- 	}
-+	[CCode (cheader_filename = "cogl/cogl.h", type_id = "G_TYPE_STRING")]
-+	[Compact]
-+	public class PipelineKey : string {
-+	}
- 	[CCode (cheader_filename = "cogl/cogl.h")]
- 	[Compact]
- 	public class PixelBuffer : Cogl.Handle {
-diff --git vapi/mutter-cogl-8-custom.vala vapi/mutter-cogl-8-custom.vala
-new file mode 100644
-index 00000000..c4d4b93a
---- /dev/null
-+++ vapi/mutter-cogl-8-custom.vala
-@@ -0,0 +1,119 @@
-+namespace Cogl {
-+	[Compact]
-+	[CCode (cname = "CoglHandle")]
-+	public class Buffer: Handle {
-+		public uint get_size ();
-+		public bool set_data (size_t offset, [CCode (array_length_type = "size_t")] uint8[] data);
-+		public void unmap ();
-+	}
-+
-+	[CCode (has_type_id = false)]
-+	public struct Color {
-+		public Color.from_4f (float red, float green, float blue, float alpha);
-+		public Color.from_4ub (uint8 red, uint8 green, uint8 blue, uint8 alpha);
-+	}
-+
-+	[Compact]
-+	[CCode (ref_function = "cogl_handle_ref", unref_function = "cogl_handle_unref")]
-+	public class Handle {
-+		[CCode (cname = "cogl_is_bitmap")]
-+		public bool is_bitmap ();
-+		[CCode (cname = "cogl_is_buffer")]
-+		public bool is_buffer ();
-+		[CCode (cname = "cogl_is_material")]
-+		public bool is_material ();
-+		[CCode (cname = "cogl_is_offscreen")]
-+		public bool is_offscreen ();
-+		[CCode (cname = "cogl_is_pixel_buffer")]
-+		public bool is_pixel_buffer ();
-+		[CCode (cname = "cogl_is_program")]
-+		public bool is_program ();
-+		[CCode (cname = "cogl_is_shader")]
-+		public bool is_shader ();
-+		[CCode (cname = "cogl_is_texture")]
-+		public bool is_texture ();
-+		[CCode (cname = "cogl_is_vertex_buffer")]
-+		public bool is_vertex_buffer ();
-+	}
-+
-+	[CCode (cheader_filename = "cogl/cogl.h", copy_function = "cogl_path_copy")]
-+	[Compact]
-+	public class Path {
-+		public static void @new ();
-+	}
-+
-+	[Compact]
-+	public class PixelBuffer: Handle {
-+		public PixelBuffer (uint size);
-+		public PixelBuffer.for_size (uint width, uint height, Cogl.PixelFormat format, uint stride);
-+	}
-+
-+	[Compact]
-+	[CCode (cname = "CoglHandle", ref_function = "cogl_program_ref", unref_function = "cogl_program_unref")]
-+	public class Program: Handle {
-+		[CCode (cname = "cogl_create_program", type = "CoglHandle*", has_construct_function = false)]
-+		public Program ();
-+		public void attach_shader (Cogl.Shader shader_handle);
-+		public int get_uniform_location (string uniform_name);
-+		public void link ();
-+		public static void uniform_1f (int uniform_no, float value);
-+		public static void uniform_1i (int uniform_no, int value);
-+		public static void uniform_float (int uniform_no, int size, [CCode (array_length_pos = 2.9)] float[] value);
-+		public static void uniform_int (int uniform_no, int size, [CCode (array_length_pos = 2.9)] int[] value);
-+		public static void uniform_matrix (int uniform_no, int size, bool transpose, [CCode (array_length_pos = 2.9)] float[] value);
-+		public void use ();
-+	}
-+
-+	[Compact]
-+	[CCode (cname = "CoglHandle", ref_function = "cogl_shader_ref", unref_function = "cogl_shader_unref")]
-+	public class Shader: Handle {
-+		[CCode (cname = "cogl_create_shader", type = "CoglHandle*", has_construct_function = false)]
-+		public Shader (Cogl.ShaderType shader_type);
-+		public void compile ();
-+		public string get_info_log ();
-+		public Cogl.ShaderType get_type ();
-+		public bool is_compiled ();
-+		public void source (string source);
-+	}
-+
-+	[Compact]
-+	[CCode (cname = "CoglHandle", ref_function = "cogl_vertex_buffer_ref", unref_function = "cogl_vertex_buffer_unref")]
-+	public class VertexBuffer: Handle {
-+		[CCode (type = "CoglHandle*", has_construct_function = false)]
-+		public VertexBuffer (uint n_vertices);
-+		public void add (string attribute_name, uchar n_components, Cogl.AttributeType type, bool normalized, uint16 stride, void* pointer);
-+		public void delete (string attribute_name);
-+		public void disable (string attribute_name);
-+		public void draw (Cogl.VerticesMode mode, int first, int count);
-+		public void draw_elements (Cogl.VerticesMode mode, VertexBufferIndices indices, int min_index, int max_index, int indices_offset, int count);
-+		public void enable (string attribute_name);
-+		public uint get_n_vertices ();
-+		public void submit ();
-+	}
-+
-+	[Compact]
-+	[CCode (cname = "CoglHandle")]
-+	public class VertexBufferIndices: Handle {
-+		public VertexBufferIndices (Cogl.IndicesType indices_type, void* indices_array, int indices_len);
-+		public static unowned Cogl.VertexBufferIndices get_for_quads (uint n_indices);
-+		public Cogl.IndicesType get_type ();
-+	}
-+
-+	[CCode (type_id = "COGL_TYPE_MATRIX", cheader_filename = "cogl/cogl.h")]
-+	public struct Matrix {
-+		[CCode (cname = "cogl_matrix_init_from_array", array_length = false, array_null_terminated = false)]
-+		public Matrix.from_array ([CCode (array_length = false)] float[] array);
-+		[CCode (cname = "cogl_matrix_init_identity")]
-+		public Matrix.identity ();
-+		[CCode (cname = "cogl_matrix_multiply")]
-+		public Matrix.multiply (Cogl.Matrix a, Cogl.Matrix b);
-+	}
-+
-+	[SimpleType]
-+	[GIR (name = "Bool")]
-+	[BooleanType]
-+	public struct Bool : bool {
-+	}
-+
-+	public static GLib.Callback get_proc_address(string s);
-+}
-diff --git vapi/mutter-cogl-8.deps vapi/mutter-cogl-8.deps
-new file mode 100644
-index 00000000..98ccac5b
---- /dev/null
-+++ vapi/mutter-cogl-8.deps
-@@ -0,0 +1 @@
-+pango
-diff --git vapi/mutter-cogl-8.vapi vapi/mutter-cogl-8.vapi
-new file mode 100644
-index 00000000..c17c124e
---- /dev/null
-+++ vapi/mutter-cogl-8.vapi
-@@ -0,0 +1,1091 @@
-+/* mutter-cogl-8.vapi generated by vapigen, do not modify. */
-+
-+[CCode (cprefix = "Cogl", gir_namespace = "Cogl", gir_version = "8", lower_case_cprefix = "cogl_")]
-+namespace Cogl {
-+	[CCode (cheader_filename = "cogl/cogl.h", type_id = "cogl_bitmap_get_gtype ()")]
-+	public class Bitmap : Cogl.Object {
-+		[CCode (has_construct_function = false)]
-+		protected Bitmap ();
-+		public static uint32 error_quark ();
-+		[CCode (has_construct_function = false)]
-+		[Version (since = "1.0")]
-+		public Bitmap.from_file (string filename) throws GLib.Error;
-+		[Version (since = "1.10")]
-+		public Cogl.PixelFormat get_format ();
-+		[Version (since = "1.10")]
-+		public int get_height ();
-+		[Version (since = "1.10")]
-+		public int get_rowstride ();
-+		[Version (since = "1.0")]
-+		public static bool get_size_from_file (string filename, out int width, out int height);
-+		[Version (since = "1.10")]
-+		public int get_width ();
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", cname = "CoglHandle")]
-+	[Compact]
-+	public class Buffer : Cogl.Handle {
-+		public uint get_size ();
-+		public bool set_data (size_t offset, [CCode (array_length_type = "size_t")] uint8[] data);
-+		public void unmap ();
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", type_id = "cogl_context_get_gtype ()")]
-+	public class Context : Cogl.Object {
-+		[CCode (has_construct_function = false)]
-+		protected Context ();
-+		public unowned Cogl.Pipeline get_named_pipeline (Cogl.PipelineKey key);
-+		public bool is_hardware_accelerated ();
-+		public void set_named_pipeline (Cogl.PipelineKey key, Cogl.Pipeline? pipeline);
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "cogl_frame_closure_get_gtype ()")]
-+	[Compact]
-+	[Version (since = "1.14")]
-+	public class FrameClosure {
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", type_id = "cogl_frame_info_get_gtype ()")]
-+	public class FrameInfo : Cogl.Object {
-+		[CCode (has_construct_function = false)]
-+		protected FrameInfo ();
-+		[Version (since = "1.14")]
-+		public int64 get_frame_counter ();
-+		public bool get_is_symbolic ();
-+		[Version (since = "1.14")]
-+		public int64 get_presentation_time ();
-+		[Version (since = "1.14")]
-+		public float get_refresh_rate ();
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", type_id = "cogl_framebuffer_get_type ()")]
-+	public abstract class Framebuffer : GLib.Object {
-+		[CCode (has_construct_function = false)]
-+		protected Framebuffer ();
-+		[Version (since = "1.8")]
-+		public virtual bool allocate () throws GLib.Error;
-+		[Version (since = "1.8")]
-+		public void clear (ulong buffers, Cogl.Color color);
-+		[Version (since = "1.8")]
-+		public void clear4f (ulong buffers, float red, float green, float blue, float alpha);
-+		[Version (since = "1.8")]
-+		public void discard_buffers (ulong buffers);
-+		[Version (since = "1.10")]
-+		public void draw_multitextured_rectangle (Cogl.Pipeline pipeline, float x_1, float y_1, float x_2, float y_2, [CCode (array_length = false)] float[] tex_coords, int tex_coords_len);
-+		[Version (since = "1.10")]
-+		public void draw_rectangle (Cogl.Pipeline pipeline, float x_1, float y_1, float x_2, float y_2);
-+		[Version (since = "1.10")]
-+		public void draw_rectangles (Cogl.Pipeline pipeline, [CCode (array_length = false)] float[] coordinates, uint n_rectangles);
-+		[Version (since = "1.10")]
-+		public void draw_textured_rectangle (Cogl.Pipeline pipeline, float x_1, float y_1, float x_2, float y_2, float s_1, float t_1, float s_2, float t_2);
-+		[Version (since = "1.10")]
-+		public void draw_textured_rectangles (Cogl.Pipeline pipeline, [CCode (array_length = false)] float[] coordinates, uint n_rectangles);
-+		public static uint32 error_quark ();
-+		[Version (since = "1.10")]
-+		public void finish ();
-+		public void flush ();
-+		[Version (since = "1.10")]
-+		public void frustum (float left, float right, float bottom, float top, float z_near, float z_far);
-+		[Version (since = "1.8")]
-+		public int get_alpha_bits ();
-+		[Version (since = "1.8")]
-+		public int get_blue_bits ();
-+		[Version (since = "1.8")]
-+		public unowned Cogl.Context get_context ();
-+		[Version (since = "2.0")]
-+		public int get_depth_bits ();
-+		[Version (since = "1.18")]
-+		public bool get_depth_write_enabled ();
-+		[Version (since = "1.8")]
-+		public bool get_dither_enabled ();
-+		[Version (since = "1.8")]
-+		public int get_green_bits ();
-+		[Version (since = "1.8")]
-+		public int get_height ();
-+		public bool get_is_stereo ();
-+		[Version (since = "1.10")]
-+		public void get_modelview_matrix (out unowned Graphene.Matrix matrix);
-+		[Version (since = "1.10")]
-+		public void get_projection_matrix (out unowned Graphene.Matrix matrix);
-+		[Version (since = "1.8")]
-+		public int get_red_bits ();
-+		[Version (since = "1.10")]
-+		public int get_samples_per_pixel ();
-+		[Version (since = "1.20")]
-+		public Cogl.StereoMode get_stereo_mode ();
-+		[Version (since = "1.8")]
-+		public void get_viewport4fv ([CCode (array_length = false)] out unowned float viewport[4]);
-+		[Version (since = "1.8")]
-+		public float get_viewport_height ();
-+		[Version (since = "1.8")]
-+		public float get_viewport_width ();
-+		[Version (since = "1.8")]
-+		public float get_viewport_x ();
-+		[Version (since = "1.8")]
-+		public float get_viewport_y ();
-+		[Version (since = "1.8")]
-+		public int get_width ();
-+		[Version (since = "1.10")]
-+		public void identity_matrix ();
-+		[NoWrapper]
-+		public virtual bool is_y_flipped ();
-+		[Version (since = "1.10")]
-+		public void orthographic (float x_1, float y_1, float x_2, float y_2, float near, float far);
-+		[Version (since = "1.10")]
-+		public void perspective (float fov_y, float aspect, float z_near, float z_far);
-+		[Version (since = "1.10")]
-+		public void pop_clip ();
-+		[Version (since = "1.10")]
-+		public void pop_matrix ();
-+		[Version (since = "1.10")]
-+		public void push_matrix ();
-+		[Version (since = "1.10")]
-+		public void push_rectangle_clip (float x_1, float y_1, float x_2, float y_2);
-+		public void push_region_clip (Cairo.Region region);
-+		[Version (since = "1.10")]
-+		public void push_scissor_clip (int x, int y, int width, int height);
-+		[Version (since = "1.10")]
-+		public bool read_pixels (int x, int y, int width, int height, Cogl.PixelFormat format, uint8 pixels);
-+		[Version (since = "1.10")]
-+		public bool read_pixels_into_bitmap (int x, int y, Cogl.ReadPixelsFlags source, Cogl.Bitmap bitmap);
-+		[Version (since = "1.8")]
-+		public void resolve_samples ();
-+		[Version (since = "1.8")]
-+		public void resolve_samples_region (int x, int y, int width, int height);
-+		[Version (since = "1.10")]
-+		public void rotate (float angle, float x, float y, float z);
-+		[Version (since = "2.0")]
-+		public void rotate_euler (Graphene.Euler euler);
-+		[Version (since = "1.10")]
-+		public void scale (float x, float y, float z);
-+		[Version (since = "1.18")]
-+		public void set_depth_write_enabled (bool depth_write_enabled);
-+		[Version (since = "1.8")]
-+		public void set_dither_enabled (bool dither_enabled);
-+		[Version (since = "1.10")]
-+		public void set_modelview_matrix (Graphene.Matrix matrix);
-+		[Version (since = "1.10")]
-+		public void set_projection_matrix (Graphene.Matrix matrix);
-+		[Version (since = "1.8")]
-+		public void set_samples_per_pixel (int samples_per_pixel);
-+		[Version (since = "1.20")]
-+		public void set_stereo_mode (Cogl.StereoMode stereo_mode);
-+		[Version (since = "1.8")]
-+		public void set_viewport (float x, float y, float width, float height);
-+		[Version (since = "1.10")]
-+		public void transform (Graphene.Matrix matrix);
-+		[Version (since = "1.10")]
-+		public void translate (float x, float y, float z);
-+		[NoAccessorMethod]
-+		public void* driver_config { get; construct; }
-+		[NoAccessorMethod]
-+		public int height { get; set construct; }
-+		[NoAccessorMethod]
-+		public int width { get; set construct; }
-+		public signal void destroy ();
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", has_type_id = false)]
-+	[Compact]
-+	public class FramebufferDriverConfig {
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", ref_function = "cogl_handle_ref", unref_function = "cogl_handle_unref")]
-+	[Compact]
-+	public class Handle {
-+		[CCode (cname = "cogl_is_bitmap")]
-+		public bool is_bitmap ();
-+		[CCode (cname = "cogl_is_buffer")]
-+		public bool is_buffer ();
-+		[CCode (cname = "cogl_is_material")]
-+		public bool is_material ();
-+		[CCode (cname = "cogl_is_offscreen")]
-+		public bool is_offscreen ();
-+		[CCode (cname = "cogl_is_pixel_buffer")]
-+		public bool is_pixel_buffer ();
-+		[CCode (cname = "cogl_is_program")]
-+		public bool is_program ();
-+		[CCode (cname = "cogl_is_shader")]
-+		public bool is_shader ();
-+		[CCode (cname = "cogl_is_texture")]
-+		public bool is_texture ();
-+		[CCode (cname = "cogl_is_vertex_buffer")]
-+		public bool is_vertex_buffer ();
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "cogl_material_get_type ()")]
-+	[Compact]
-+	public class Material {
-+		[CCode (has_construct_function = false)]
-+		[Version (deprecated = true, deprecated_since = "1.16")]
-+		public Material ();
-+		[Version (deprecated = true, deprecated_since = "1.16", since = "1.0")]
-+		public void set_alpha_test_function (Cogl.MaterialAlphaFunc alpha_func, float alpha_reference);
-+		[Version (deprecated = true, deprecated_since = "1.16", since = "1.0")]
-+		public bool set_blend (string blend_string) throws GLib.Error;
-+		[Version (deprecated = true, deprecated_since = "1.16", since = "1.0")]
-+		public void set_blend_constant (Cogl.Color constant_color);
-+		[Version (deprecated = true, deprecated_since = "1.16", since = "1.0")]
-+		public void set_color (Cogl.Color color);
-+		[Version (deprecated = true, deprecated_since = "1.16", since = "1.0")]
-+		public void set_color4ub (uint8 red, uint8 green, uint8 blue, uint8 alpha);
-+		[Version (deprecated = true, deprecated_since = "1.16", since = "1.0")]
-+		public void set_layer (int layer_index, Cogl.Handle texture);
-+		[Version (deprecated = true, deprecated_since = "1.16", since = "1.0")]
-+		public bool set_layer_combine (int layer_index, string blend_string) throws GLib.Error;
-+		[Version (deprecated = true, deprecated_since = "1.16", since = "1.0")]
-+		public void set_layer_combine_constant (int layer_index, Cogl.Color constant);
-+		[Version (deprecated = true, deprecated_since = "1.16")]
-+		public void set_layer_filters (int layer_index, Cogl.MaterialFilter min_filter, Cogl.MaterialFilter mag_filter);
-+		[Version (deprecated = true, deprecated_since = "1.16")]
-+		public void set_layer_matrix (int layer_index, Graphene.Matrix matrix);
-+		[Version (deprecated = true, deprecated_since = "1.16", since = "1.4")]
-+		public bool set_layer_point_sprite_coords_enabled (int layer_index, bool enable) throws GLib.Error;
-+		[Version (deprecated = true, deprecated_since = "1.16", since = "1.4")]
-+		public void set_point_size (float point_size);
-+		[Version (deprecated = true, deprecated_since = "1.16", since = "1.4")]
-+		public void set_user_program (Cogl.Handle program);
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", has_type_id = false)]
-+	[Compact]
-+	public class MaterialLayer {
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", type_id = "cogl_object_get_gtype ()")]
-+	public abstract class Object {
-+		[CCode (has_construct_function = false)]
-+		protected Object ();
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", type_id = "cogl_offscreen_get_type ()")]
-+	public class Offscreen : Cogl.Framebuffer {
-+		[CCode (has_construct_function = false)]
-+		protected Offscreen ();
-+		[CCode (has_construct_function = false)]
-+		public Offscreen.with_texture (Cogl.Texture texture);
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", type_id = "cogl_onscreen_get_type ()")]
-+	public class Onscreen : Cogl.Framebuffer {
-+		[CCode (has_construct_function = false)]
-+		protected Onscreen ();
-+		[Version (since = "1.16")]
-+		public Cogl.OnscreenDirtyClosure add_dirty_callback ([CCode (delegate_target_pos = 1.5)] Cogl.OnscreenDirtyCallback callback, Cogl.UserDataDestroyCallback? destroy);
-+		[Version (since = "1.14")]
-+		public Cogl.FrameClosure add_frame_callback ([CCode (delegate_target_pos = 1.5)] Cogl.FrameCallback callback, Cogl.UserDataDestroyCallback? destroy);
-+		[NoWrapper]
-+		public virtual void bind ();
-+		[Version (since = "1.14")]
-+		public virtual int get_buffer_age ();
-+		[Version (since = "1.14")]
-+		public int64 get_frame_counter ();
-+		[Version (since = "2.0")]
-+		public void hide ();
-+		[Version (since = "1.16")]
-+		public void remove_dirty_callback (Cogl.OnscreenDirtyClosure closure);
-+		[Version (since = "1.14")]
-+		public void remove_frame_callback (Cogl.FrameClosure closure);
-+		[Version (since = "2.0")]
-+		public void show ();
-+		[Version (since = "1.10")]
-+		public void swap_buffers (Cogl.FrameInfo frame_info, void* user_data);
-+		[Version (since = "1.16")]
-+		public virtual void swap_buffers_with_damage (int rectangles, int n_rectangles, Cogl.FrameInfo info);
-+		[Version (since = "1.10")]
-+		public virtual void swap_region (int rectangles, int n_rectangles, Cogl.FrameInfo info);
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "cogl_onscreen_dirty_closure_get_gtype ()")]
-+	[Compact]
-+	[Version (since = "1.16")]
-+	public class OnscreenDirtyClosure {
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", copy_function = "cogl_path_copy")]
-+	[Compact]
-+	public class Path {
-+		public static void @new ();
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", type_id = "cogl_pipeline_get_gtype ()")]
-+	public class Pipeline : Cogl.Object {
-+		[CCode (has_construct_function = false)]
-+		[Version (since = "2.0")]
-+		public Pipeline (Cogl.Context context);
-+		[Version (since = "2.0")]
-+		public Cogl.Pipeline copy ();
-+		[Version (since = "2.0")]
-+		public void foreach_layer (Cogl.PipelineLayerCallback callback);
-+		[Version (since = "2.0")]
-+		public Cogl.PipelineAlphaFunc get_alpha_test_function ();
-+		[Version (since = "2.0")]
-+		public float get_alpha_test_reference ();
-+		[Version (since = "2.0")]
-+		public Cogl.Color get_color ();
-+		[Version (since = "2.0")]
-+		public Cogl.PipelineCullFaceMode get_cull_face_mode ();
-+		[Version (since = "2.0")]
-+		public Cogl.Winding get_front_face_winding ();
-+		[Version (since = "1.10")]
-+		public Cogl.PipelineFilter get_layer_mag_filter (int layer_index);
-+		[Version (since = "1.10")]
-+		public Cogl.PipelineFilter get_layer_min_filter (int layer_index);
-+		[Version (since = "2.0")]
-+		public bool get_layer_point_sprite_coords_enabled (int layer_index);
-+		[Version (since = "1.10")]
-+		public unowned Cogl.Texture get_layer_texture (int layer_index);
-+		[Version (since = "1.6")]
-+		public Cogl.PipelineWrapMode get_layer_wrap_mode_s (int layer_index);
-+		[Version (since = "1.6")]
-+		public Cogl.PipelineWrapMode get_layer_wrap_mode_t (int layer_index);
-+		[Version (since = "2.0")]
-+		public int get_n_layers ();
-+		[Version (since = "2.0")]
-+		public bool get_per_vertex_point_size ();
-+		[Version (since = "2.0")]
-+		public float get_point_size ();
-+		[Version (since = "2.0")]
-+		public int get_uniform_location (string uniform_name);
-+		[Version (since = "2.0")]
-+		public unowned Cogl.Handle get_user_program ();
-+		[Version (since = "1.10")]
-+		public void remove_layer (int layer_index);
-+		[Version (since = "2.0")]
-+		public void set_alpha_test_function (Cogl.PipelineAlphaFunc alpha_func, float alpha_reference);
-+		[Version (since = "2.0")]
-+		public bool set_blend (string blend_string) throws GLib.Error;
-+		[Version (since = "2.0")]
-+		public void set_blend_constant (Cogl.Color constant_color);
-+		[Version (since = "2.0")]
-+		public void set_color (Cogl.Color color);
-+		[Version (since = "2.0")]
-+		public void set_color4f (float red, float green, float blue, float alpha);
-+		[Version (since = "2.0")]
-+		public void set_color4ub (uint8 red, uint8 green, uint8 blue, uint8 alpha);
-+		[Version (since = "2.0")]
-+		public void set_cull_face_mode (Cogl.PipelineCullFaceMode cull_face_mode);
-+		[Version (since = "2.0")]
-+		public void set_front_face_winding (Cogl.Winding front_winding);
-+		[Version (since = "2.0")]
-+		public bool set_layer_combine (int layer_index, string blend_string) throws GLib.Error;
-+		[Version (since = "2.0")]
-+		public void set_layer_combine_constant (int layer_index, Cogl.Color constant);
-+		[Version (since = "1.10")]
-+		public void set_layer_filters (int layer_index, Cogl.PipelineFilter min_filter, Cogl.PipelineFilter mag_filter);
-+		[Version (since = "1.10")]
-+		public void set_layer_matrix (int layer_index, Graphene.Matrix matrix);
-+		public void set_layer_max_mipmap_level (int layer, int max_level);
-+		[Version (since = "1.10")]
-+		public void set_layer_null_texture (int layer_index);
-+		[Version (since = "2.0")]
-+		public bool set_layer_point_sprite_coords_enabled (int layer_index, bool enable) throws GLib.Error;
-+		public void set_layer_texture (int layer_index, Cogl.Texture texture);
-+		[Version (since = "2.0")]
-+		public void set_layer_wrap_mode (int layer_index, Cogl.PipelineWrapMode mode);
-+		[Version (since = "2.0")]
-+		public void set_layer_wrap_mode_s (int layer_index, Cogl.PipelineWrapMode mode);
-+		[Version (since = "2.0")]
-+		public void set_layer_wrap_mode_t (int layer_index, Cogl.PipelineWrapMode mode);
-+		[Version (since = "2.0")]
-+		public bool set_per_vertex_point_size (bool enable) throws GLib.Error;
-+		[Version (since = "2.0")]
-+		public void set_point_size (float point_size);
-+		[Version (since = "2.0")]
-+		public void set_uniform_1f (int uniform_location, float value);
-+		[Version (since = "2.0")]
-+		public void set_uniform_1i (int uniform_location, int value);
-+		[Version (since = "2.0")]
-+		public void set_uniform_float (int uniform_location, int n_components, int count, float value);
-+		[Version (since = "2.0")]
-+		public void set_uniform_int (int uniform_location, int n_components, int count, int value);
-+		[Version (since = "2.0")]
-+		public void set_uniform_matrix (int uniform_location, int dimensions, int count, bool transpose, float value);
-+		[Version (since = "2.0")]
-+		public void set_user_program (Cogl.Handle program);
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", type_id = "G_TYPE_STRING")]
-+	[Compact]
-+	public class PipelineKey : string {
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h")]
-+	[Compact]
-+	public class PixelBuffer : Cogl.Handle {
-+		public PixelBuffer (uint size);
-+		public PixelBuffer.for_size (uint width, uint height, Cogl.PixelFormat format, uint stride);
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", cname = "CoglHandle", ref_function = "cogl_program_ref", unref_function = "cogl_program_unref")]
-+	[Compact]
-+	public class Program : Cogl.Handle {
-+		[CCode (cname = "cogl_create_program", has_construct_function = false, type = "CoglHandle*")]
-+		public Program ();
-+		public void attach_shader (Cogl.Shader shader_handle);
-+		public int get_uniform_location (string uniform_name);
-+		public void link ();
-+		public static void uniform_1f (int uniform_no, float value);
-+		public static void uniform_1i (int uniform_no, int value);
-+		public static void uniform_float (int uniform_no, int size, [CCode (array_length_pos = 2.9)] float[] value);
-+		public static void uniform_int (int uniform_no, int size, [CCode (array_length_pos = 2.9)] int[] value);
-+		public static void uniform_matrix (int uniform_no, int size, bool transpose, [CCode (array_length_pos = 2.9)] float[] value);
-+		public void use ();
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", has_type_id = false)]
-+	[Compact]
-+	public class Scanout {
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", cname = "CoglHandle", ref_function = "cogl_shader_ref", unref_function = "cogl_shader_unref")]
-+	[Compact]
-+	public class Shader : Cogl.Handle {
-+		[CCode (cname = "cogl_create_shader", has_construct_function = false, type = "CoglHandle*")]
-+		public Shader (Cogl.ShaderType shader_type);
-+		public void compile ();
-+		public string get_info_log ();
-+		public Cogl.ShaderType get_type ();
-+		public bool is_compiled ();
-+		public void source (string source);
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", lower_case_csuffix = "texture_2d", type_id = "cogl_texture_2d_get_gtype ()")]
-+	public class Texture2D : Cogl.Object, Cogl.Texture {
-+		[CCode (has_construct_function = false)]
-+		protected Texture2D ();
-+		public void egl_image_external_alloc_finish (void* user_data, GLib.DestroyNotify destroy);
-+		public void egl_image_external_bind ();
-+		[CCode (has_construct_function = false)]
-+		[Version (since = "2.0")]
-+		public Texture2D.from_bitmap (Cogl.Bitmap bitmap);
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", lower_case_csuffix = "texture_2d_sliced", type_id = "cogl_texture_2d_sliced_get_gtype ()")]
-+	public class Texture2DSliced : Cogl.Object, Cogl.Texture {
-+		[CCode (has_construct_function = false)]
-+		protected Texture2DSliced ();
-+		[CCode (has_construct_function = false)]
-+		[Version (since = "1.16")]
-+		public Texture2DSliced.from_bitmap (Cogl.Bitmap bmp, int max_waste);
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", cname = "CoglHandle", ref_function = "cogl_vertex_buffer_ref", unref_function = "cogl_vertex_buffer_unref")]
-+	[Compact]
-+	public class VertexBuffer : Cogl.Handle {
-+		[CCode (has_construct_function = false, type = "CoglHandle*")]
-+		public VertexBuffer (uint n_vertices);
-+		public void add (string attribute_name, uchar n_components, Cogl.AttributeType type, bool normalized, uint16 stride, void* pointer);
-+		public void @delete (string attribute_name);
-+		public void disable (string attribute_name);
-+		public void draw (Cogl.VerticesMode mode, int first, int count);
-+		public void draw_elements (Cogl.VerticesMode mode, Cogl.VertexBufferIndices indices, int min_index, int max_index, int indices_offset, int count);
-+		public void enable (string attribute_name);
-+		public uint get_n_vertices ();
-+		public void submit ();
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", cname = "CoglHandle")]
-+	[Compact]
-+	public class VertexBufferIndices : Cogl.Handle {
-+		public VertexBufferIndices (Cogl.IndicesType indices_type, void* indices_array, int indices_len);
-+		public static unowned Cogl.VertexBufferIndices get_for_quads (uint n_indices);
-+		public Cogl.IndicesType get_type ();
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", type_id = "cogl_texture_get_gtype ()")]
-+	public interface Texture : Cogl.Object {
-+		public bool allocate () throws GLib.Error;
-+		public static uint32 error_quark ();
-+		[Version (since = "1.18")]
-+		public Cogl.TextureComponents get_components ();
-+		public int get_data (Cogl.PixelFormat format, uint rowstride, [CCode (array_length = false)] uint8[]? data);
-+		public bool get_gl_texture (out uint out_gl_handle, out uint out_gl_target);
-+		public uint get_height ();
-+		public int get_max_waste ();
-+		[Version (since = "1.18")]
-+		public bool get_premultiplied ();
-+		public uint get_width ();
-+		public bool is_sliced ();
-+		[Version (deprecated = true, deprecated_since = "1.18", since = "1.0")]
-+		public static Cogl.Texture new_from_bitmap (Cogl.Bitmap bitmap, Cogl.TextureFlags flags, Cogl.PixelFormat internal_format);
-+		[Version (deprecated = true, deprecated_since = "1.18", since = "0.8")]
-+		public static Cogl.Texture new_from_data (int width, int height, Cogl.TextureFlags flags, Cogl.PixelFormat format, Cogl.PixelFormat internal_format, int rowstride, [CCode (array_length = false)] uint8[] data);
-+		[Version (deprecated = true, deprecated_since = "1.18", since = "0.8")]
-+		public static Cogl.Texture new_from_file (string filename, Cogl.TextureFlags flags, Cogl.PixelFormat internal_format) throws GLib.Error;
-+		[Version (deprecated = true, deprecated_since = "1.18", since = "1.2")]
-+		public Cogl.Texture new_from_sub_texture (int sub_x, int sub_y, int sub_width, int sub_height);
-+		[Version (deprecated = true, deprecated_since = "1.18", since = "0.8")]
-+		public static Cogl.Texture new_with_size (uint width, uint height, Cogl.TextureFlags flags, Cogl.PixelFormat internal_format);
-+		[Version (since = "1.18")]
-+		public void set_components (Cogl.TextureComponents components);
-+		public bool set_data (Cogl.PixelFormat format, int rowstride, [CCode (array_length = false)] uint8[] data, int level) throws GLib.Error;
-+		[Version (since = "1.18")]
-+		public void set_premultiplied (bool premultiplied);
-+		public bool set_region (int src_x, int src_y, int dst_x, int dst_y, uint dst_width, uint dst_height, int width, int height, Cogl.PixelFormat format, uint rowstride, [CCode (array_length = false)] uint8[] data);
-+		[Version (since = "1.8")]
-+		public bool set_region_from_bitmap (int src_x, int src_y, int dst_x, int dst_y, uint dst_width, uint dst_height, Cogl.Bitmap bitmap);
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h")]
-+	[SimpleType]
-+	public struct Angle : int32 {
-+	}
-+	[BooleanType]
-+	[CCode (cheader_filename = "cogl/cogl.h")]
-+	[GIR (name = "Bool")]
-+	[SimpleType]
-+	public struct Bool : bool {
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", has_type_id = false)]
-+	[Version (since = "1.0")]
-+	public struct Color {
-+		[CCode (has_construct_function = false, type = "CoglColor*")]
-+		public Color ();
-+		public Cogl.Color? copy ();
-+		public void free ();
-+		public Color.from_4f (float red, float green, float blue, float alpha);
-+		public Color.from_4ub (uint8 red, uint8 green, uint8 blue, uint8 alpha);
-+		public float get_alpha ();
-+		public uint8 get_alpha_byte ();
-+		public float get_alpha_float ();
-+		public float get_blue ();
-+		public uint8 get_blue_byte ();
-+		public float get_blue_float ();
-+		public float get_green ();
-+		public uint8 get_green_byte ();
-+		public float get_green_float ();
-+		public float get_red ();
-+		public uint8 get_red_byte ();
-+		public float get_red_float ();
-+		[Version (since = "1.4")]
-+		public void init_from_4f (float red, float green, float blue, float alpha);
-+		[Version (since = "1.4")]
-+		public void init_from_4fv (float color_array);
-+		[Version (since = "1.4")]
-+		public void init_from_4ub (uint8 red, uint8 green, uint8 blue, uint8 alpha);
-+		public void premultiply ();
-+		[Version (since = "1.4")]
-+		public void set_alpha (float alpha);
-+		[Version (since = "1.4")]
-+		public void set_alpha_byte (uint8 alpha);
-+		[Version (since = "1.4")]
-+		public void set_alpha_float (float alpha);
-+		[Version (since = "1.4")]
-+		public void set_blue (float blue);
-+		[Version (since = "1.4")]
-+		public void set_blue_byte (uint8 blue);
-+		[Version (since = "1.4")]
-+		public void set_blue_float (float blue);
-+		[Version (since = "1.4")]
-+		public void set_green (float green);
-+		[Version (since = "1.4")]
-+		public void set_green_byte (uint8 green);
-+		[Version (since = "1.4")]
-+		public void set_green_float (float green);
-+		[Version (since = "1.4")]
-+		public void set_red (float red);
-+		[Version (since = "1.4")]
-+		public void set_red_byte (uint8 red);
-+		[Version (since = "1.4")]
-+		public void set_red_float (float red);
-+		[Version (since = "1.16")]
-+		public void to_hsl (out float hue, out float saturation, out float luminance);
-+		[Version (since = "1.4")]
-+		public void unpremultiply ();
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", has_type_id = false)]
-+	[Version (since = "1.8")]
-+	public struct DebugObjectTypeInfo {
-+		public weak string name;
-+		public ulong instance_count;
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", type_id = "COGL_TYPE_MATRIX")]
-+	public struct Matrix {
-+		[CCode (array_length = false, array_null_terminated = false, cname = "cogl_matrix_init_from_array")]
-+		public Matrix.from_array ([CCode (array_length = false)] float[] array);
-+		[CCode (cname = "cogl_matrix_init_identity")]
-+		public Matrix.identity ();
-+		[CCode (cname = "cogl_matrix_multiply")]
-+		public Matrix.multiply (Cogl.Matrix a, Cogl.Matrix b);
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", has_type_id = false)]
-+	[Version (since = "1.16")]
-+	public struct OnscreenDirtyInfo {
-+		public int x;
-+		public int y;
-+		public int width;
-+		public int height;
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", has_type_id = false)]
-+	public struct TextureVertex {
-+		public float x;
-+		public float y;
-+		public float z;
-+		public float tx;
-+		public float ty;
-+		public Cogl.Color color;
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", has_type_id = false)]
-+	[Version (since = "1.4")]
-+	public struct UserDataKey {
-+		public int unused;
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", cname = "_CoglColorSizeCheck", has_type_id = false)]
-+	public struct _ColorSizeCheck {
-+		[CCode (array_length = false)]
-+		public weak char[] compile_time_assert_CoglColor_size;
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", cname = "_CoglTextureVertexSizeCheck", has_type_id = false)]
-+	public struct _TextureVertexSizeCheck {
-+		[CCode (array_length = false)]
-+		public weak char[] compile_time_assert_CoglTextureVertex_size;
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_ATTRIBUTE_TYPE_", has_type_id = false)]
-+	[Version (since = "1.0")]
-+	public enum AttributeType {
-+		BYTE,
-+		UNSIGNED_BYTE,
-+		SHORT,
-+		UNSIGNED_SHORT,
-+		FLOAT
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_BITMAP_ERROR_", has_type_id = false)]
-+	[Version (since = "1.4")]
-+	public enum BitmapError {
-+		FAILED,
-+		UNKNOWN_TYPE,
-+		CORRUPT_IMAGE
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_BLEND_STRING_ERROR_", has_type_id = false)]
-+	[Version (since = "1.0")]
-+	public enum BlendStringError {
-+		PARSE_ERROR,
-+		ARGUMENT_PARSE_ERROR,
-+		INVALID_ERROR,
-+		GPU_UNSUPPORTED_ERROR;
-+		public static uint32 quark ();
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_BUFFER_BIT_", has_type_id = false)]
-+	[Flags]
-+	[Version (since = "1.0")]
-+	public enum BufferBit {
-+		COLOR,
-+		DEPTH,
-+		STENCIL
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_", has_type_id = false)]
-+	[Flags]
-+	[Version (since = "0.8")]
-+	public enum BufferTarget {
-+		WINDOW_BUFFER,
-+		OFFSCREEN_BUFFER
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_DEPTH_TEST_FUNCTION_", has_type_id = false)]
-+	public enum DepthTestFunction {
-+		NEVER,
-+		LESS,
-+		EQUAL,
-+		LEQUAL,
-+		GREATER,
-+		NOTEQUAL,
-+		GEQUAL,
-+		ALWAYS
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_EGL_IMAGE_FLAG_", has_type_id = false)]
-+	[Flags]
-+	public enum EglImageFlags {
-+		NONE,
-+		NO_GET_DATA
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_FEATURE_ID_", has_type_id = false)]
-+	[Version (since = "1.10")]
-+	public enum FeatureID {
-+		[CCode (cname = "COGL_FEATURE_ID_UNSIGNED_INT_INDICES")]
-+		OGL_FEATURE_ID_UNSIGNED_INT_INDICES,
-+		[CCode (cname = "COGL_FEATURE_ID_MAP_BUFFER_FOR_READ")]
-+		OGL_FEATURE_ID_MAP_BUFFER_FOR_READ,
-+		[CCode (cname = "COGL_FEATURE_ID_MAP_BUFFER_FOR_WRITE")]
-+		OGL_FEATURE_ID_MAP_BUFFER_FOR_WRITE,
-+		[CCode (cname = "COGL_FEATURE_ID_FENCE")]
-+		OGL_FEATURE_ID_FENCE,
-+		[CCode (cname = "COGL_FEATURE_ID_TEXTURE_RG")]
-+		OGL_FEATURE_ID_TEXTURE_RG,
-+		[CCode (cname = "COGL_FEATURE_ID_BUFFER_AGE")]
-+		OGL_FEATURE_ID_BUFFER_AGE,
-+		[CCode (cname = "COGL_FEATURE_ID_TEXTURE_EGL_IMAGE_EXTERNAL")]
-+		OGL_FEATURE_ID_TEXTURE_EGL_IMAGE_EXTERNAL,
-+		[CCode (cname = "COGL_FEATURE_ID_BLIT_FRAMEBUFFER")]
-+		OGL_FEATURE_ID_BLIT_FRAMEBUFFER
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_FILTER_", has_type_id = false)]
-+	public enum FilterReturn {
-+		CONTINUE,
-+		REMOVE
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_FRAME_EVENT_", has_type_id = false)]
-+	[Version (since = "1.14")]
-+	public enum FrameEvent {
-+		SYNC,
-+		COMPLETE
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_FRAMEBUFFER_ERROR_", has_type_id = false)]
-+	public enum FramebufferError {
-+		[CCode (cname = "COGL_FRAMEBUFFER_ERROR_ALLOCATE")]
-+		FRAMEBUFFER_ERROR_ALLOCATE
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_GRAPHICS_RESET_STATUS_", has_type_id = false)]
-+	public enum GraphicsResetStatus {
-+		NO_ERROR,
-+		GUILTY_CONTEXT_RESET,
-+		INNOCENT_CONTEXT_RESET,
-+		UNKNOWN_CONTEXT_RESET,
-+		PURGED_CONTEXT_RESET
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_INDICES_TYPE_UNSIGNED_", has_type_id = false)]
-+	public enum IndicesType {
-+		BYTE,
-+		SHORT,
-+		INT
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_MATERIAL_ALPHA_FUNC_", has_type_id = false)]
-+	public enum MaterialAlphaFunc {
-+		NEVER,
-+		LESS,
-+		EQUAL,
-+		LEQUAL,
-+		GREATER,
-+		NOTEQUAL,
-+		GEQUAL,
-+		ALWAYS
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_MATERIAL_FILTER_", has_type_id = false)]
-+	public enum MaterialFilter {
-+		NEAREST,
-+		LINEAR,
-+		NEAREST_MIPMAP_NEAREST,
-+		LINEAR_MIPMAP_NEAREST,
-+		NEAREST_MIPMAP_LINEAR,
-+		LINEAR_MIPMAP_LINEAR
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_MATERIAL_WRAP_MODE_", has_type_id = false)]
-+	[Version (since = "1.4")]
-+	public enum MaterialWrapMode {
-+		REPEAT,
-+		CLAMP_TO_EDGE,
-+		AUTOMATIC
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_PIPELINE_ALPHA_FUNC_", has_type_id = false)]
-+	public enum PipelineAlphaFunc {
-+		NEVER,
-+		LESS,
-+		EQUAL,
-+		LEQUAL,
-+		GREATER,
-+		NOTEQUAL,
-+		GEQUAL,
-+		ALWAYS
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_PIPELINE_CULL_FACE_MODE_", has_type_id = false)]
-+	public enum PipelineCullFaceMode {
-+		NONE,
-+		FRONT,
-+		BACK,
-+		BOTH
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_PIPELINE_FILTER_", has_type_id = false)]
-+	public enum PipelineFilter {
-+		NEAREST,
-+		LINEAR,
-+		NEAREST_MIPMAP_NEAREST,
-+		LINEAR_MIPMAP_NEAREST,
-+		NEAREST_MIPMAP_LINEAR,
-+		LINEAR_MIPMAP_LINEAR
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_PIPELINE_WRAP_MODE_", has_type_id = false)]
-+	[Version (since = "2.0")]
-+	public enum PipelineWrapMode {
-+		REPEAT,
-+		MIRRORED_REPEAT,
-+		CLAMP_TO_EDGE,
-+		AUTOMATIC
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_PIXEL_FORMAT_", has_type_id = false)]
-+	[Flags]
-+	[Version (since = "0.8")]
-+	public enum PixelFormat {
-+		ANY,
-+		A_8,
-+		RGB_565,
-+		RGBA_4444,
-+		RGBA_5551,
-+		YUV,
-+		G_8,
-+		RG_88,
-+		RGB_888,
-+		BGR_888,
-+		RGBA_8888,
-+		BGRA_8888,
-+		ARGB_8888,
-+		ABGR_8888,
-+		RGBA_1010102,
-+		BGRA_1010102,
-+		ARGB_2101010,
-+		ABGR_2101010,
-+		RGBA_FP_16161616,
-+		BGRA_FP_16161616,
-+		ARGB_FP_16161616,
-+		ABGR_FP_16161616,
-+		RGBA_8888_PRE,
-+		BGRA_8888_PRE,
-+		ARGB_8888_PRE,
-+		ABGR_8888_PRE,
-+		RGBA_4444_PRE,
-+		RGBA_5551_PRE,
-+		RGBA_1010102_PRE,
-+		BGRA_1010102_PRE,
-+		ARGB_2101010_PRE,
-+		ABGR_2101010_PRE,
-+		RGBA_FP_16161616_PRE,
-+		BGRA_FP_16161616_PRE,
-+		ARGB_FP_16161616_PRE,
-+		ABGR_FP_16161616_PRE,
-+		DEPTH_16,
-+		DEPTH_32,
-+		DEPTH_24_STENCIL_8;
-+		public int get_bytes_per_pixel (int plane);
-+		public int get_n_planes ();
-+		public unowned string to_string ();
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_READ_PIXELS_COLOR_", has_type_id = false)]
-+	[Flags]
-+	[Version (since = "1.0")]
-+	public enum ReadPixelsFlags {
-+		[CCode (cname = "COGL_READ_PIXELS_COLOR_BUFFER")]
-+		READ_PIXELS_COLOR_BUFFER
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_RENDERER_ERROR_", has_type_id = false)]
-+	public enum RendererError {
-+		XLIB_DISPLAY_OPEN,
-+		BAD_CONSTRAINT
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_SHADER_TYPE_", has_type_id = false)]
-+	[Version (since = "1.0")]
-+	public enum ShaderType {
-+		VERTEX,
-+		FRAGMENT
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_STEREO_", has_type_id = false)]
-+	public enum StereoMode {
-+		BOTH,
-+		LEFT,
-+		RIGHT
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_SYSTEM_ERROR_", has_type_id = false)]
-+	[Version (since = "1.4")]
-+	public enum SystemError {
-+		UNSUPPORTED,
-+		NO_MEMORY
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_TEXTURE_COMPONENTS_", has_type_id = false)]
-+	[Version (since = "1.18")]
-+	public enum TextureComponents {
-+		A,
-+		RG,
-+		RGB,
-+		RGBA,
-+		DEPTH
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_TEXTURE_ERROR_", has_type_id = false)]
-+	[Version (since = "1.8")]
-+	public enum TextureError {
-+		SIZE,
-+		FORMAT,
-+		BAD_PARAMETER,
-+		TYPE;
-+		public static uint32 quark ();
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_TEXTURE_", has_type_id = false)]
-+	[Flags]
-+	[Version (since = "1.0")]
-+	public enum TextureFlags {
-+		NONE,
-+		NO_AUTO_MIPMAP,
-+		NO_SLICING,
-+		NO_ATLAS
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_VERTICES_MODE_", has_type_id = false)]
-+	[Version (since = "1.0")]
-+	public enum VerticesMode {
-+		POINTS,
-+		LINES,
-+		LINE_LOOP,
-+		LINE_STRIP,
-+		TRIANGLES,
-+		TRIANGLE_STRIP,
-+		TRIANGLE_FAN
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_WINDING_", has_type_id = false)]
-+	public enum Winding {
-+		CLOCKWISE,
-+		COUNTER_CLOCKWISE
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_WINSYS_FEATURE_", has_type_id = false)]
-+	public enum WinsysFeature {
-+		MULTIPLE_ONSCREEN,
-+		VBLANK_COUNTER,
-+		VBLANK_WAIT,
-+		TEXTURE_FROM_PIXMAP,
-+		SWAP_BUFFERS_EVENT,
-+		SWAP_REGION,
-+		SWAP_REGION_THROTTLE,
-+		SWAP_REGION_SYNCHRONIZED,
-+		BUFFER_AGE,
-+		SYNC_AND_COMPLETE_EVENT,
-+		N_FEATURES
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_SCANOUT_ERROR_")]
-+	public errordomain ScanoutError {
-+		[CCode (cname = "COGL_SCANOUT_ERROR_INHIBITED")]
-+		SCANOUT_ERROR_INHIBITED;
-+		public static GLib.Quark quark ();
-+	}
-+	[CCode (cheader_filename = "cogl/cogl.h", instance_pos = 1.9)]
-+	[Version (since = "1.8")]
-+	public delegate void DebugObjectForeachTypeCallback (Cogl.DebugObjectTypeInfo info);
-+	[CCode (cheader_filename = "cogl/cogl.h", instance_pos = 1.9)]
-+	[Version (since = "0.10")]
-+	public delegate void FeatureCallback (Cogl.FeatureID feature);
-+	[CCode (cheader_filename = "cogl/cogl.h", instance_pos = 3.9)]
-+	[Version (since = "1.14")]
-+	public delegate void FrameCallback (Cogl.Onscreen onscreen, Cogl.FrameEvent event, Cogl.FrameInfo info);
-+	[CCode (cheader_filename = "cogl/cogl.h", instance_pos = 2.9)]
-+	[Version (since = "1.16")]
-+	public delegate void OnscreenDirtyCallback (Cogl.Onscreen onscreen, Cogl.OnscreenDirtyInfo info);
-+	[CCode (cheader_filename = "cogl/cogl.h", instance_pos = 2.9)]
-+	[Version (since = "2.0")]
-+	public delegate bool PipelineLayerCallback (Cogl.Pipeline pipeline, int layer_index);
-+	[CCode (cheader_filename = "cogl/cogl.h", instance_pos = 1.9)]
-+	public delegate bool Texture2DEGLImageExternalAlloc (Cogl.Texture2D tex_2d) throws GLib.Error;
-+	[CCode (cheader_filename = "cogl/cogl.h", has_target = false)]
-+	public delegate void UserDataDestroyCallback (void* data);
-+	[CCode (cheader_filename = "cogl/cogl.h", cname = "COGL_AFIRST_BIT")]
-+	public const int AFIRST_BIT;
-+	[CCode (cheader_filename = "cogl/cogl.h", cname = "COGL_A_BIT")]
-+	public const int A_BIT;
-+	[CCode (cheader_filename = "cogl/cogl.h", cname = "COGL_BGR_BIT")]
-+	public const int BGR_BIT;
-+	[CCode (cheader_filename = "cogl/cogl.h", cname = "COGL_DEPTH_BIT")]
-+	public const int DEPTH_BIT;
-+	[CCode (cheader_filename = "cogl/cogl.h", cname = "COGL_PIXEL_FORMAT_MAX_PLANES")]
-+	public const int PIXEL_FORMAT_MAX_PLANES;
-+	[CCode (cheader_filename = "cogl/cogl.h", cname = "COGL_PREMULT_BIT")]
-+	public const int PREMULT_BIT;
-+	[CCode (cheader_filename = "cogl/cogl.h", cname = "COGL_STENCIL_BIT")]
-+	public const int STENCIL_BIT;
-+	[CCode (cheader_filename = "cogl/cogl.h", cname = "COGL_TEXTURE_MAX_WASTE")]
-+	public const int TEXTURE_MAX_WASTE;
-+	[CCode (cheader_filename = "cogl/cogl.h")]
-+	public static bool blit_framebuffer (Cogl.Framebuffer framebuffer, Cogl.Framebuffer dst, int src_x, int src_y, int dst_x, int dst_y, int width, int height) throws GLib.Error;
-+	[CCode (cheader_filename = "cogl/cogl.h")]
-+	public static bool clutter_winsys_has_feature_CLUTTER (Cogl.WinsysFeature feature);
-+	[CCode (cheader_filename = "cogl/cogl.h")]
-+	[Version (since = "1.0")]
-+	public static bool color_equal (void* v1, void* v2);
-+	[CCode (cheader_filename = "cogl/cogl.h")]
-+	[Version (since = "1.16")]
-+	public static void color_init_from_hsl (out Cogl.Color color, float hue, float saturation, float luminance);
-+	[CCode (cheader_filename = "cogl/cogl.h")]
-+	[Version (deprecated = true, deprecated_since = "1.16")]
-+	public static unowned Cogl.Handle create_program ();
-+	[CCode (cheader_filename = "cogl/cogl.h")]
-+	[Version (deprecated = true, deprecated_since = "1.16")]
-+	public static unowned Cogl.Handle create_shader (Cogl.ShaderType shader_type);
-+	[CCode (cheader_filename = "cogl/cogl.h")]
-+	[Version (since = "1.8")]
-+	public static void debug_object_foreach_type (Cogl.DebugObjectForeachTypeCallback func);
-+	[CCode (cheader_filename = "cogl/cogl.h")]
-+	[Version (since = "1.8")]
-+	public static void debug_object_print_instances ();
-+	[CCode (cheader_filename = "cogl/cogl.h")]
-+	[Version (since = "1.0")]
-+	public static void flush ();
-+	[CCode (cheader_filename = "cogl/cogl.h")]
-+	[Version (since = "1.10")]
-+	public static void foreach_feature (Cogl.Context context, Cogl.FeatureCallback callback);
-+	[CCode (cheader_filename = "cogl/cogl.h")]
-+	[Version (deprecated = true, deprecated_since = "1.16")]
-+	public static bool get_backface_culling_enabled ();
-+	[CCode (cheader_filename = "cogl/cogl.h")]
-+	[Version (since = "1.14")]
-+	public static int64 get_clock_time (Cogl.Context context);
-+	[CCode (cheader_filename = "cogl/cogl.h")]
-+	[Version (deprecated = true, deprecated_since = "1.16")]
-+	public static bool get_depth_test_enabled ();
-+	[CCode (cheader_filename = "cogl/cogl.h")]
-+	public static Cogl.GraphicsResetStatus get_graphics_reset_status (Cogl.Context context);
-+	[CCode (cheader_filename = "cogl/cogl.h")]
-+	[Version (deprecated = true, deprecated_since = "1.16", since = "1.0")]
-+	public static GLib.OptionGroup get_option_group ();
-+	[CCode (cheader_filename = "cogl/cogl.h")]
-+	public static GLib.Callback get_proc_address (string s);
-+	[CCode (cheader_filename = "cogl/cogl.h")]
-+	[Version (since = "1.10")]
-+	public static bool has_feature (Cogl.Context context, Cogl.FeatureID feature);
-+	[CCode (cheader_filename = "cogl/cogl.h")]
-+	[Version (since = "1.0")]
-+	public static bool is_bitmap (void* object);
-+	[CCode (cheader_filename = "cogl/cogl.h")]
-+	[Version (since = "1.10")]
-+	public static bool is_context (void* object);
-+	[CCode (cheader_filename = "cogl/cogl.h")]
-+	[Version (since = "2.0")]
-+	public static bool is_frame_info (void* object);
-+	[CCode (cheader_filename = "cogl/cogl.h")]
-+	[Version (since = "1.10")]
-+	public static bool is_framebuffer (void* object);
-+	[CCode (cheader_filename = "cogl/cogl.h")]
-+	[Version (since = "2.0")]
-+	public static bool is_pipeline (void* object);
-+	[CCode (cheader_filename = "cogl/cogl.h")]
-+	[Version (deprecated = true, deprecated_since = "1.16")]
-+	public static bool is_program (Cogl.Handle handle);
-+	[CCode (cheader_filename = "cogl/cogl.h")]
-+	[Version (deprecated = true, deprecated_since = "1.16")]
-+	public static bool is_shader (Cogl.Handle handle);
-+	[CCode (cheader_filename = "cogl/cogl.h")]
-+	public static bool is_texture (void* object);
-+	[CCode (cheader_filename = "cogl/cogl.h")]
-+	public static bool is_texture_2d (void* object);
-+	[CCode (cheader_filename = "cogl/cogl.h")]
-+	[Version (since = "1.10")]
-+	public static bool is_texture_2d_sliced (void* object);
-+	[CCode (cheader_filename = "cogl/cogl.h")]
-+	[Version (deprecated = true, deprecated_since = "1.16")]
-+	public static void program_attach_shader (Cogl.Handle program_handle, Cogl.Handle shader_handle);
-+	[CCode (cheader_filename = "cogl/cogl.h")]
-+	[Version (deprecated = true, deprecated_since = "1.16")]
-+	public static int program_get_uniform_location (Cogl.Handle handle, string uniform_name);
-+	[CCode (cheader_filename = "cogl/cogl.h")]
-+	[Version (deprecated = true, deprecated_since = "1.16")]
-+	public static void program_link (Cogl.Handle handle);
-+	[CCode (cheader_filename = "cogl/cogl.h")]
-+	[Version (deprecated = true, deprecated_since = "1.16", since = "1.4")]
-+	public static void program_set_uniform_1f (Cogl.Handle program, int uniform_location, float value);
-+	[CCode (cheader_filename = "cogl/cogl.h")]
-+	[Version (deprecated = true, deprecated_since = "1.16", since = "1.4")]
-+	public static void program_set_uniform_1i (Cogl.Handle program, int uniform_location, int value);
-+	[CCode (cheader_filename = "cogl/cogl.h")]
-+	[Version (deprecated = true, deprecated_since = "1.16", since = "1.4")]
-+	public static void program_set_uniform_float (Cogl.Handle program, int uniform_location, int n_components, [CCode (array_length_cname = "count", array_length_pos = 3.5)] float[] value);
-+	[CCode (cheader_filename = "cogl/cogl.h")]
-+	[Version (deprecated = true, deprecated_since = "1.16", since = "1.4")]
-+	public static void program_set_uniform_int (Cogl.Handle program, int uniform_location, int n_components, [CCode (array_length_cname = "count", array_length_pos = 3.5)] int[] value);
-+	[CCode (cheader_filename = "cogl/cogl.h")]
-+	[Version (deprecated = true, deprecated_since = "1.16", since = "1.4")]
-+	public static void program_set_uniform_matrix (Cogl.Handle program, int uniform_location, int dimensions, bool transpose, [CCode (array_length_cname = "count", array_length_pos = 3.5)] float[] value);
-+	[CCode (cheader_filename = "cogl/cogl.h")]
-+	[Version (deprecated = true, deprecated_since = "1.16")]
-+	public static void set_backface_culling_enabled (bool setting);
-+	[CCode (cheader_filename = "cogl/cogl.h")]
-+	[Version (deprecated = true, deprecated_since = "1.16")]
-+	public static void set_depth_test_enabled (bool setting);
-+	[CCode (cheader_filename = "cogl/cogl.h")]
-+	public static void set_tracing_disabled_on_thread (void* data);
-+	[CCode (cheader_filename = "cogl/cogl.h")]
-+	public static void set_tracing_enabled_on_thread (void* data, string group, string filename);
-+	[CCode (cheader_filename = "cogl/cogl.h")]
-+	public static void set_tracing_enabled_on_thread_with_fd (void* data, string group, int fd);
-+	[CCode (cheader_filename = "cogl/cogl.h")]
-+	[Version (deprecated = true, deprecated_since = "1.16")]
-+	public static Cogl.ShaderType shader_get_type (Cogl.Handle handle);
-+	[CCode (cheader_filename = "cogl/cogl.h")]
-+	[Version (deprecated = true, deprecated_since = "1.16")]
-+	public static void shader_source (Cogl.Handle shader, string source);
-+	[CCode (cheader_filename = "cogl/cogl.h")]
-+	[Version (deprecated = true, deprecated_since = "1.18", since = "1.0")]
-+	public static Cogl.Texture texture_new_from_bitmap (Cogl.Bitmap bitmap, Cogl.TextureFlags flags, Cogl.PixelFormat internal_format);
-+	[CCode (cheader_filename = "cogl/cogl.h")]
-+	[Version (deprecated = true, deprecated_since = "1.18", since = "0.8")]
-+	public static Cogl.Texture texture_new_from_data (int width, int height, Cogl.TextureFlags flags, Cogl.PixelFormat format, Cogl.PixelFormat internal_format, int rowstride, [CCode (array_length = false)] uint8[] data);
-+	[CCode (cheader_filename = "cogl/cogl.h")]
-+	[Version (deprecated = true, deprecated_since = "1.18", since = "0.8")]
-+	public static Cogl.Texture texture_new_from_file (string filename, Cogl.TextureFlags flags, Cogl.PixelFormat internal_format) throws GLib.Error;
-+	[CCode (cheader_filename = "cogl/cogl.h")]
-+	[Version (deprecated = true, deprecated_since = "1.18", since = "0.8")]
-+	public static Cogl.Texture texture_new_with_size (uint width, uint height, Cogl.TextureFlags flags, Cogl.PixelFormat internal_format);
-+}
diff --git a/srcpkgs/budgie-desktop/template b/srcpkgs/budgie-desktop/template
index 4e9a7f63b3df..e3fa0d7b8dfa 100644
--- a/srcpkgs/budgie-desktop/template
+++ b/srcpkgs/budgie-desktop/template
@@ -1,23 +1,24 @@
 # Template file for 'budgie-desktop'
 pkgname=budgie-desktop
-version=10.5.2
-revision=3
+version=10.5.3
+revision=1
 build_style=meson
 build_helper=gir
 configure_args="-Dwith-gtk-doc=false"
-hostmakedepends="pkg-config intltool vala glib-devel gobject-introspection sassc"
+hostmakedepends="pkg-config intltool vala glib-devel gobject-introspection sassc
+ budgie-screensaver"
 makedepends="alsa-lib-devel libnotify-devel accountsservice-devel libpeas-devel
  libwnck-devel mutter-devel ibus-devel gnome-desktop-devel pulseaudio-devel
  upower-devel gtk+3-devel polkit-devel gnome-bluetooth-devel gnome-menus-devel
  gnome-settings-daemon-devel vala libuuid-devel libupower-glib3"
 depends="gnome-session gnome-settings-daemon gnome-control-center elogind
- gnome-themes-extra"
+ gnome-themes-extra budgie-screensaver"
 short_desc="Modern desktop environment from the Solus Project"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="GPL-2.0-only, LGPL-2.1-only"
 homepage="https://github.com/solus-project/budgie-desktop"
 distfiles="${homepage}/releases/download/v${version}/budgie-desktop-v${version}.tar.xz"
-checksum=d7219c1dc6d0e3fe54ac33062bfd420ab94158bcfe9409d09c85d7e7a21c67fa
+checksum=878f4e6460c29740bf633c3b11ba97bcb788068c1460f82569938af2f1633b25
 
 budgie-desktop-devel_package() {
 	short_desc+=" - development files"

From 89db3ae26e41b63e79146be1092c0e35df1f9488 Mon Sep 17 00:00:00 2001
From: Lorem <notloremipsum@protonmail.com>
Date: Wed, 28 Apr 2021 09:45:43 +0530
Subject: [PATCH 1824/2024] tweeny: update to 3.2.0.

---
 srcpkgs/tweeny/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tweeny/template b/srcpkgs/tweeny/template
index 4cbfce545a43..3302563b8740 100644
--- a/srcpkgs/tweeny/template
+++ b/srcpkgs/tweeny/template
@@ -1,6 +1,6 @@
 # Template file for 'tweeny'
 pkgname=tweeny
-version=3.1.1
+version=3.2.0
 revision=1
 build_style=cmake
 short_desc="Modern C++ tweening library"
@@ -9,7 +9,7 @@ license="MIT"
 homepage="https://github.com/mobius3/tweeny"
 changelog="https://github.com/mobius3/tweeny/blob/master/CHANGELOG.md"
 distfiles="https://github.com/mobius3/tweeny/archive/v${version}.tar.gz"
-checksum=33d2f439eec49bdd8464bd8017381d6e50af898342be217a254fd2cef2b3bb0f
+checksum=2be7db9e0354da31f020b77474e2d547dbbaa8999a6a4bea4b388e6d31e4ef07
 
 post_install() {
 	vlicense LICENSE

From bc14005cf492c48679e65c1f7b039a261f56c47e Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Wed, 28 Apr 2021 07:14:46 +0300
Subject: [PATCH 1825/2024] libva: update to 2.11.0.

---
 srcpkgs/libva/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libva/template b/srcpkgs/libva/template
index a66eebcb82c6..9bfac882945a 100644
--- a/srcpkgs/libva/template
+++ b/srcpkgs/libva/template
@@ -1,7 +1,7 @@
 # Template file for 'libva'
 # NOTE: keep this pkg synchronized with libva-glx
 pkgname=libva
-version=2.10.0
+version=2.11.0
 revision=1
 build_style=meson
 configure_args="-Dwith_glx=no $(vopt_if wayland -Dwith_wayland=yes)"
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://01.org/linuxmedia/vaapi"
 changelog="https://raw.githubusercontent.com/intel/libva/master/NEWS"
 distfiles="https://github.com/intel/libva/archive/${version}.tar.gz"
-checksum=f04d5c829da602690f9f098a6d92065507ec9d0c957c1a6df3dea4e2de1204c5
+checksum=ee2bd79bad5e2404143f089360685f5da63a32dd551b54ccd61d2d49c041178a
 
 build_options="wayland"
 build_options_default="wayland"

From 7a8d8f4ec73d9a825fb8d9cd279a72473b5009fe Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Wed, 28 Apr 2021 07:15:00 +0300
Subject: [PATCH 1826/2024] libva-glx: update to 2.11.0.

---
 srcpkgs/libva-glx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libva-glx/template b/srcpkgs/libva-glx/template
index 472694b56e13..9b4ab57933b9 100644
--- a/srcpkgs/libva-glx/template
+++ b/srcpkgs/libva-glx/template
@@ -7,7 +7,7 @@
 # KEEP THIS PACKAGE SYNCHRONIZED WITH "libva".
 #
 pkgname=libva-glx
-version=2.10.0
+version=2.11.0
 revision=1
 wrksrc="libva-${version}"
 build_style=meson
@@ -20,7 +20,7 @@ license="MIT"
 homepage="https://01.org/linuxmedia/vaapi"
 changelog="https://raw.githubusercontent.com/intel/libva/master/NEWS"
 distfiles="https://github.com/intel/libva/archive/${version}.tar.gz"
-checksum=f04d5c829da602690f9f098a6d92065507ec9d0c957c1a6df3dea4e2de1204c5
+checksum=ee2bd79bad5e2404143f089360685f5da63a32dd551b54ccd61d2d49c041178a
 
 post_install() {
 	# We are only interested in the glx component, remove everything else.

From 905d8801c687823d240a045fd101c5f9014ea366 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Wed, 28 Apr 2021 07:15:12 +0300
Subject: [PATCH 1827/2024] libva-utils: update to 2.11.0.

---
 srcpkgs/libva-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libva-utils/template b/srcpkgs/libva-utils/template
index 2e988e97674e..d4ad364df1b9 100644
--- a/srcpkgs/libva-utils/template
+++ b/srcpkgs/libva-utils/template
@@ -1,6 +1,6 @@
 # Template file for 'libva-utils'
 pkgname=libva-utils
-version=2.10.0
+version=2.11.0
 revision=1
 build_style=meson
 configure_args="-Ddrm=true -Dx11=true -Dwayland=true"
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://01.org/linuxmedia/vaapi"
 changelog="https://raw.githubusercontent.com/intel/libva-utils/master/NEWS"
 distfiles="https://github.com/intel/libva-utils/archive/${version}.tar.gz"
-checksum=cbb7f9f6eae21d772e31b67bc8c311be6e35fe9c65e63acc57f9b16d72bf8dc0
+checksum=4046dc73b498950e838d40ace46c82d034b04f81e4fcf7c5e3ebed5d2697e1ab
 
 post_install() {
 	vlicense COPYING

From 7ea0c4f5ab07cbc61893651f31e4d0e806530b7c Mon Sep 17 00:00:00 2001
From: biopsin <biopsin@teknik.io>
Date: Wed, 28 Apr 2021 10:31:57 +0000
Subject: [PATCH 1828/2024] New package: herbe-1.0.0

---
 srcpkgs/herbe/template | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 srcpkgs/herbe/template

diff --git a/srcpkgs/herbe/template b/srcpkgs/herbe/template
new file mode 100644
index 000000000000..000e2b1f444d
--- /dev/null
+++ b/srcpkgs/herbe/template
@@ -0,0 +1,22 @@
+# Template file for 'herbe'
+pkgname=herbe
+version=1.0.0
+revision=1
+build_style=gnu-makefile
+makedepends="libXft-devel"
+short_desc="Daemon-less notifications without D-Bus"
+maintainer="biopsin <biopsin@teknik.io>"
+license="MIT"
+homepage="https://github.com/dudik/herbe"
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=78e454159050c86e030fb5a6cf997ac914345210cdf5a4ca4d7600c5296b7f76
+
+do_build() {
+	# Patch Makefile to locate <ft2build.h>
+	vsed 's|-I/usr/include/freetype2|-I${XBPS_CROSS_BASE}/usr/include/freetype2|' \
+		-i ${wrksrc}/Makefile
+}
+
+post_install() {
+	vlicense LICENSE
+}

From 7f0d062a68eb23629a653fd94fd1025fea9601bf Mon Sep 17 00:00:00 2001
From: Morgan Thomas <m@m0rg.dev>
Date: Sun, 25 Apr 2021 09:25:46 -0700
Subject: [PATCH 1829/2024] nodejs: use system libuv

See https://github.com/void-linux/void-packages/issues/29034.

`shared-uv.patch` has been in the repo for a while but was slightly
broken.
---
 srcpkgs/nodejs/{ => patches}/shared-uv.patch | 2 +-
 srcpkgs/nodejs/template                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename srcpkgs/nodejs/{ => patches}/shared-uv.patch (97%)

diff --git a/srcpkgs/nodejs/shared-uv.patch b/srcpkgs/nodejs/patches/shared-uv.patch
similarity index 97%
rename from srcpkgs/nodejs/shared-uv.patch
rename to srcpkgs/nodejs/patches/shared-uv.patch
index 128e3a5ce06e..3e609a6c49a5 100644
--- a/srcpkgs/nodejs/shared-uv.patch
+++ b/srcpkgs/nodejs/patches/shared-uv.patch
@@ -16,7 +16,7 @@
          }],
 +        [ 'node_shared_libuv=="false"', {
 +          'dependencies': [ '../uv/uv.gyp:libuv' ],
-+        }]
++        }],
 +        [ 'node_shared_libuv=="true"', {
 +          'libraries': [ '-luv' ],
 +        }]
diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 450b59bbc7d0..bcfaaa73ac4c 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs'
 pkgname=nodejs
 version=14.16.0
-revision=1
+revision=2
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel

From 2517aad32586e71d0edc0b303740ee4a0086e04e Mon Sep 17 00:00:00 2001
From: Morgan Thomas <m@m0rg.dev>
Date: Sun, 25 Apr 2021 09:59:58 -0700
Subject: [PATCH 1830/2024] nodejs-lts: use system libuv

See 06410b655878fe8825f10da90b9cc34a5e05ccf9 and https://github.com/void-linux/void-packages/issues/29034.
---
 srcpkgs/nodejs-lts/patches/shared-uv.patch | 25 ++++++++++++++++++++++
 srcpkgs/nodejs-lts/template                |  2 +-
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/nodejs-lts/patches/shared-uv.patch

diff --git a/srcpkgs/nodejs-lts/patches/shared-uv.patch b/srcpkgs/nodejs-lts/patches/shared-uv.patch
new file mode 100644
index 000000000000..3e609a6c49a5
--- /dev/null
+++ b/srcpkgs/nodejs-lts/patches/shared-uv.patch
@@ -0,0 +1,25 @@
+--- deps/uvwasi/uvwasi.gyp.orig
++++ deps/uvwasi/uvwasi.gyp
+@@ -18,9 +18,6 @@
+         'src/wasi_rights.c',
+         'src/wasi_serdes.c',
+       ],
+-      'dependencies': [
+-        '../uv/uv.gyp:libuv',
+-      ],
+       'direct_dependent_settings': {
+         'include_dirs': ['include']
+       },
+@@ -31,6 +28,12 @@
+             '_POSIX_C_SOURCE=200112',
+           ],
+         }],
++        [ 'node_shared_libuv=="false"', {
++          'dependencies': [ '../uv/uv.gyp:libuv' ],
++        }],
++        [ 'node_shared_libuv=="true"', {
++          'libraries': [ '-luv' ],
++        }]
+       ],
+     }
+   ]
diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index f9326d337555..d3912ae2cf05 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs-lts'
 pkgname=nodejs-lts
 version=12.21.0
-revision=1
+revision=2
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="pkg-config python libatomic-devel zlib-devel which

From 9341527c9186c3bb41496353998e3d879c83f0bf Mon Sep 17 00:00:00 2001
From: Morgan Thomas <m@m0rg.dev>
Date: Mon, 26 Apr 2021 06:31:01 -0700
Subject: [PATCH 1831/2024] nodejs-lts-10: fix build for targets without native
 atomic8

patches/ppc32.patch used "host_arch" instead of "target_arch" to check
whether to link against -latomic, and didn't include 32-bit ARM in the
list of targets that might need it. This addresses build failures on
armv6l as well as some lesser-used architectures.

Additionally, libatomic-devel is now included in makedepends for all
architectures (not just when `XBPS_TARGET_NO_ATOMIC8` is set) because
the build system can't tell the difference between armv6l and
armv7l. This matches how it's done for `nodejs{,-lts}` and doesn't
cause the armv7l build to actually depend on libatomic at runtime.
---
 srcpkgs/nodejs-lts-10/patches/atomic8.patch | 14 ++++++++++++++
 srcpkgs/nodejs-lts-10/patches/ppc32.patch   | 14 --------------
 srcpkgs/nodejs-lts-10/template              | 21 ++++++++-------------
 3 files changed, 22 insertions(+), 27 deletions(-)
 create mode 100644 srcpkgs/nodejs-lts-10/patches/atomic8.patch

diff --git a/srcpkgs/nodejs-lts-10/patches/atomic8.patch b/srcpkgs/nodejs-lts-10/patches/atomic8.patch
new file mode 100644
index 000000000000..023cfad01239
--- /dev/null
+++ b/srcpkgs/nodejs-lts-10/patches/atomic8.patch
@@ -0,0 +1,14 @@
+--- node.gyp
++++ node.gyp
+@@ -479,6 +479,11 @@
+       'msvs_disabled_warnings!': [4244],
+ 
+       'conditions': [
++        [ 'target_arch=="mips" or target_arch=="mipsel" or target_arch=="ppc" or target_arch=="arm"', {
++	  'link_settings': {
++	    'libraries': [ '-latomic' ],
++	  },
++	}],
+         [ 'node_code_cache_path!=""', {
+           'sources': [ '<(node_code_cache_path)' ]
+         }, {
diff --git a/srcpkgs/nodejs-lts-10/patches/ppc32.patch b/srcpkgs/nodejs-lts-10/patches/ppc32.patch
index 343eff585123..4650b285c363 100644
--- a/srcpkgs/nodejs-lts-10/patches/ppc32.patch
+++ b/srcpkgs/nodejs-lts-10/patches/ppc32.patch
@@ -9,20 +9,6 @@
      '__x86_64__'  : 'x64',
      '__s390__'    : 's390',
      '__s390x__'   : 's390x',
---- node.gyp
-+++ node.gyp
-@@ -479,6 +479,11 @@
-       'msvs_disabled_warnings!': [4244],
- 
-       'conditions': [
-+        [ 'host_arch=="mips" or host_arch=="mipsel" or host_arch=="ppc"', {
-+	  'link_settings': {
-+	    'libraries': [ '-latomic' ],
-+	  },
-+	}],
-         [ 'node_code_cache_path!=""', {
-           'sources': [ '<(node_code_cache_path)' ]
-         }, {
 --- deps/v8/src/libsampler/sampler.cc
 +++ deps/v8/src/libsampler/sampler.cc
 @@ -418,9 +418,15 @@ void SignalHandler::FillRegisterState(void* context, RegisterState* state) {
diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
index 3944d359c673..300667cb9782 100644
--- a/srcpkgs/nodejs-lts-10/template
+++ b/srcpkgs/nodejs-lts-10/template
@@ -1,14 +1,16 @@
 # Template file for 'nodejs-lts-10'
 pkgname=nodejs-lts-10
 version=10.24.0
-revision=1
+revision=2
 wrksrc="node-v${version}"
-hostmakedepends="pkg-config python zlib-devel which $(vopt_if icu icu-devel)
- $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
+# atomic8.patch will pull in -latomic even for some architectures
+# not covered by XBPS_TARGET_NO_ATOMIC8.
+hostmakedepends="pkg-config python which zlib-devel libatomic-devel
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
-makedepends="zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
+makedepends="libatomic-devel zlib-devel python-devel
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel)"
 checkdepends="procps-ng"
@@ -18,7 +20,7 @@ license="MIT"
 homepage="https://nodejs.org/"
 distfiles="${homepage}/download/release/v${version}/node-v${version}.tar.xz"
 checksum=158273af66f891b2fca90aec7336c42f7574f467affad02c14e80ca163cb3acc
-python_version=2 #unverified
+python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
 desc_option_ssl="Enable shared openssl"
@@ -37,13 +39,6 @@ if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
 	nocross="host and target must have the same pointer size"
 fi
 
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	makedepends+=" libatomic-devel"
-fi
-if [ "$XBPS_NO_ATOMIC8" ]; then
-	hostmakedepends+=" libatomic-devel"
-fi
-
 CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
 CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
 

From 5c60918b1254290bcaefeb1596a0f3e795218c3c Mon Sep 17 00:00:00 2001
From: Morgan Thomas <m@m0rg.dev>
Date: Tue, 27 Apr 2021 11:03:36 -0700
Subject: [PATCH 1832/2024] http-parser: update to 2.9.4.20201223

This is a pseudo-version to integrate upstream changes that haven't
been given a version number, as well as a patch from nodejs to fix
CVE-2020-8287.
---
 .../http-parser/patches/cve_2020_8287.patch   | 56 +++++++++++++++++++
 srcpkgs/http-parser/template                  | 11 ++--
 2 files changed, 63 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/http-parser/patches/cve_2020_8287.patch

diff --git a/srcpkgs/http-parser/patches/cve_2020_8287.patch b/srcpkgs/http-parser/patches/cve_2020_8287.patch
new file mode 100644
index 000000000000..aa67b87b3744
--- /dev/null
+++ b/srcpkgs/http-parser/patches/cve_2020_8287.patch
@@ -0,0 +1,56 @@
+Upstream: no
+Patch from NodeJS's vendored version:
+https://github.com/nodejs/node/commit/fc70ce08f5818a286fb5899a1bc3aff5965a745e
+
+--- http_parser.c
++++ http_parser.c
+@@ -1344,6 +1344,13 @@ size_t http_parser_execute (http_parser *parser,
+               } else if (parser->index == sizeof(TRANSFER_ENCODING)-2) {
+                 parser->header_state = h_transfer_encoding;
+                 parser->uses_transfer_encoding = 1;
++
++                /* Multiple `Transfer-Encoding` headers should be treated as
++                 * one, but with values separate by a comma.
++                 *
++                 * See: https://tools.ietf.org/html/rfc7230#section-3.2.2
++                 */
++                parser->flags &= ~F_CHUNKED;
+               }
+               break;
+ 
+--- test.c
++++ test.c
+@@ -2154,6 +2154,32 @@ const struct message responses[] =
+   ,.body= "2\r\nOK\r\n0\r\n\r\n"
+   ,.num_chunks_complete= 0
+   }
++#define HTTP_200_DUPLICATE_TE_NOT_LAST_CHUNKED 30
++, {.name= "HTTP 200 response with `chunked` and duplicate Transfer-Encoding"
++  ,.type= HTTP_RESPONSE
++  ,.raw= "HTTP/1.1 200 OK\r\n"
++         "Transfer-Encoding: chunked\r\n"
++         "Transfer-Encoding: identity\r\n"
++         "\r\n"
++         "2\r\n"
++         "OK\r\n"
++         "0\r\n"
++         "\r\n"
++  ,.should_keep_alive= FALSE
++  ,.message_complete_on_eof= TRUE
++  ,.http_major= 1
++  ,.http_minor= 1
++  ,.status_code= 200
++  ,.response_status= "OK"
++  ,.content_length= -1
++  ,.num_headers= 2
++  ,.headers=
++    { { "Transfer-Encoding", "chunked" }
++    , { "Transfer-Encoding", "identity" }
++    }
++  ,.body= "2\r\nOK\r\n0\r\n\r\n"
++  ,.num_chunks_complete= 0
++  }
+ };
+ 
+ /* strnlen() is a POSIX.2008 addition. Can't rely on it being available so
+
diff --git a/srcpkgs/http-parser/template b/srcpkgs/http-parser/template
index 9a9e4a626dd2..a372064d4a79 100644
--- a/srcpkgs/http-parser/template
+++ b/srcpkgs/http-parser/template
@@ -1,15 +1,18 @@
 # Template file for 'http-parser'
 pkgname=http-parser
-version=2.9.4
+# 2.9.4, plus upstream commits through ec8b5ee, plus fc70ce0 from nodejs/node
+version=2.9.4.20201223
 revision=1
+_githash=ec8b5ee63f0e51191ea43bb0c6eac7bfbff3141d
+wrksrc="${pkgname}-${_githash}"
 build_style=gnu-makefile
 make_build_target=library
 short_desc="HTTP request/response parser for c"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
-homepage="https://github.com/joyent/http-parser"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=467b9e30fd0979ee301065e70f637d525c28193449e1b13fbcb1b1fab3ad224f
+homepage="https://github.com/nodejs/http-parser"
+distfiles="${homepage}/archive/${_githash}.tar.gz"
+checksum=765a21444322ea2476ca1e3cfeb74d280eeb37f4713cf52d2bf398dabf6e4128
 
 pre_install() {
 	vmkdir usr/lib/pkgconfig

From e65ad03e12eb5f6c5fa4747a0cea3bab04f32f8a Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 28 Apr 2021 12:30:28 -0500
Subject: [PATCH 1833/2024] ffuf: update to 1.3.1.

---
 srcpkgs/ffuf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ffuf/template b/srcpkgs/ffuf/template
index 122cd1949be9..5430e121a532 100644
--- a/srcpkgs/ffuf/template
+++ b/srcpkgs/ffuf/template
@@ -1,6 +1,6 @@
 # Template file for 'ffuf'
 pkgname=ffuf
-version=1.3.0
+version=1.3.1
 revision=1
 build_style=go
 go_import_path="github.com/ffuf/ffuf"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/ffuf/ffuf"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=f717ede958c16846c7f67c14fac2a9296fcb3ad249045d04ec97c2d1d30e83ea
+checksum=136df36154f17668fb726120f0c93059f696786a34e3c2047d61efc3a065c4ec
 
 post_install() {
 	vlicense LICENSE

From 98b7d5119763cab557a1f31351bb78707e89c5d9 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 28 Apr 2021 19:51:03 +0200
Subject: [PATCH 1834/2024] wlsunset: update to 0.2.0.

---
 srcpkgs/wlsunset/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wlsunset/template b/srcpkgs/wlsunset/template
index f7be282511ad..3c5cc4170a20 100644
--- a/srcpkgs/wlsunset/template
+++ b/srcpkgs/wlsunset/template
@@ -1,6 +1,6 @@
 # Template file for 'wlsunset'
 pkgname=wlsunset
-version=0.1.0
+version=0.2.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config wayland-devel"
@@ -10,7 +10,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MIT"
 homepage="https://sr.ht/~kennylevinsen/wlsunset/"
 distfiles="https://git.sr.ht/~kennylevinsen/wlsunset/archive/${version}.tar.gz"
-checksum=78ec889f74505aa2f9060eebdee05092bda5452104656c0d868b2f0a4998f53c
+checksum=88bce695722a09d79545f14d404cc0659f7176bb08d5db5f4f23228b6ba8bb03
 
 post_install() {
 	vlicense LICENSE

From 461e94493944ed28dc661033ab9bb951d4ce5ed0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sun, 7 Feb 2021 13:47:31 +0100
Subject: [PATCH 1835/2024] jack: update to 1.9.18.

Also add eigen back to makedepends as cross-builds seem to be fine.
---
 srcpkgs/jack/template | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/jack/template b/srcpkgs/jack/template
index 2358f9edc310..092d7292d343 100644
--- a/srcpkgs/jack/template
+++ b/srcpkgs/jack/template
@@ -1,29 +1,27 @@
 # Template file for 'jack'
 pkgname=jack
-version=1.9.16
+version=1.9.18
 revision=1
 wrksrc="jack2-${version}"
 build_style=waf3
 configure_args="--alsa --classic --dbus"
 hostmakedepends="pkg-config"
-makedepends="opus-devel libsamplerate-devel readline-devel
- dbus-devel db-devel celt-devel $(vopt_if ffado libffado-devel)"
+makedepends="eigen opus-devel libsamplerate-devel readline-devel
+ dbus-devel db-devel celt-devel $(vopt_if ffado libffado-devel)
+ $(vopt_if zalsa 'zita-alsa-pcmi-devel zita-resampler-devel')"
 depends="python3-dbus"
 short_desc="JACK Audio Connection Kit low-latency sound server (pro audio)"
 maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://jackaudio.org/"
 distfiles="https://github.com/jackaudio/jack2/archive/v${version}.tar.gz"
-checksum=e176d04de94dcaa3f9d32ca1825091e1b938783a78c84e7466abd06af7637d37
+checksum=5a1d64118034d58529d68a9af42710f9d4843536257c496118065ea3d3e4ae2c
 python_version=3
 
 # Package build options
-build_options="ffado"
+build_options="ffado zalsa"
 desc_option_ffado="Enable support for FireWire audio devices"
-
-if [ -z "CROSS_BUILD" ]; then
-	makedepends+=" eigen"
-fi
+desc_option_zalsa="Enable support for internal zita-a2j/j2a clients"
 
 post_install() {
 	# pam_limits(8) support
@@ -39,6 +37,7 @@ libjack_package() {
 		vmove usr/lib/jack
 	}
 }
+
 jack-devel_package() {
 	depends="libjack>=${version}_${revision}"
 	short_desc+=" - development files"

From 28d2907f907e5611634a4ab13bc49f9096544209 Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Wed, 28 Apr 2021 22:01:38 +0200
Subject: [PATCH 1836/2024] coin3: fix cmake support for crossbuild

CMAKE_INSTALL_INCLUDEDIR must be a relative path. This way, generated
coin-export.cmake will compute include path at runtime against installed path,
that is fine for crossbuild.
If full path is provided, generated coin-export.cmake use directly this full
path, that is wrong with of crossbuild usage.

Fine to crossbuild python3-pivy 0.6.6
---
 srcpkgs/coin3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/coin3/template b/srcpkgs/coin3/template
index 8f7218c2e8c3..2130c0b8b263 100644
--- a/srcpkgs/coin3/template
+++ b/srcpkgs/coin3/template
@@ -1,10 +1,10 @@
 # Template file for 'coin3'
 pkgname=coin3
 version=4.0.0
-revision=1
+revision=2
 wrksrc="coin-Coin-${version}"
 build_style=cmake
-configure_args="-DCMAKE_INSTALL_INCLUDEDIR=/usr/include/Coin3
+configure_args="-DCMAKE_INSTALL_INCLUDEDIR=include/Coin3
  -DCOIN_BUILD_TESTS=OFF -DCOIN_BUILD_DOCUMENTATION=ON"
 hostmakedepends="doxygen graphviz"
 makedepends="boost-devel glu-devel"

From 111c06d90079b4657b53e112c4b248da6c09f6ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Wed, 28 Apr 2021 21:07:09 +0200
Subject: [PATCH 1837/2024] sslscan: update to 2.0.10.

---
 srcpkgs/sslscan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sslscan/template b/srcpkgs/sslscan/template
index 0f4f07071ded..9d0be1812772 100644
--- a/srcpkgs/sslscan/template
+++ b/srcpkgs/sslscan/template
@@ -1,6 +1,6 @@
 # Template file for 'sslscan'
 pkgname=sslscan
-version=2.0.9
+version=2.0.10
 revision=1
 build_style=gnu-makefile
 makedepends="openssl-devel"
@@ -10,6 +10,6 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/rbsec/sslscan"
 changelog="https://github.com/rbsec/sslscan/raw/master/Changelog"
 distfiles="https://github.com/rbsec/sslscan/archive/refs/tags/${version}.tar.gz"
-checksum=22a3b0664cd12c06b716eee818fdcefa545803f5f52033723ce2f76743beb647
+checksum=bb7bb0ff037aa5579b3ee0cf91aa41ab04ac073592b5d95ad3fab820f5000f6e
 # No test suite
 make_check=no

From 515be58c89178beba35403f64174df2bda61a474 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 28 Apr 2021 15:02:57 +0200
Subject: [PATCH 1838/2024] linux5.10: update to 5.10.33.

---
 srcpkgs/linux5.10/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 3e9bffd46915..4e1423e09098 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.32
+version=5.10.33
 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=644f8e326e4cb8eac65f0874774c09ccf91cbe0b55eb8438c1e8711d3d07d7ba
+checksum=933fdbc36371c0f830b7a6a957a559fca2dad1cc0eaa852ef42fb168185b4315
 python_version=3
 patch_args="-Np1"
 

From db76d5267c66f95cf2141c3f17dfea45b0ab7004 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 29 Apr 2021 10:43:47 +0200
Subject: [PATCH 1839/2024] ugrep: update to 3.1.15.

---
 srcpkgs/ugrep/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index 7f1c9e0ba389..5c72c4d86d0b 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.1.12
+version=3.1.15
 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=f783b8bcc628f792ba418f073b38f089a14d709cbd0438ee27a0cc437e0543ac
+checksum=a34457751f1b99d12a98404d04bfe96c16fdf0960df7e9141b03e41ed0a62de8
 
 post_install() {
 	vlicense LICENSE.txt LICENSE

From 8bc5d711da9aaa194011b2e557a0c0ea7f5621ef Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 29 Apr 2021 10:46:16 +0200
Subject: [PATCH 1840/2024] fdk-aac: update to 2.0.2.

---
 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 a9f858050c93..e24461ed53e1 100644
--- a/srcpkgs/fdk-aac/template
+++ b/srcpkgs/fdk-aac/template
@@ -1,6 +1,6 @@
 # Template file for 'fdk-aac'
 pkgname=fdk-aac
-version=2.0.1
+version=2.0.2
 revision=2
 build_style=gnu-configure
 short_desc="Fraunhofer FDK AAC codec library"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 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
+checksum=c9e8630cf9d433f3cead74906a1520d2223f89bcd3fa9254861017440b8eb22f
 
 post_install() {
 	vlicense NOTICE LICENSE

From f763880df37db19325b92a4699eec1ae52c37714 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 29 Apr 2021 11:32:53 +0200
Subject: [PATCH 1841/2024] skaffold: update to 1.23.0.

---
 srcpkgs/skaffold/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index d7e9e4686dea..d8fe74f097d8 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,6 +1,6 @@
 # Template file for 'skaffold'
 pkgname=skaffold
-version=1.22.0
+version=1.23.0
 revision=1
 build_style=go
 go_import_path=github.com/GoogleContainerTools/skaffold
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://skaffold.dev/"
 changelog="https://github.com/GoogleContainerTools/skaffold/releases"
 distfiles="https://github.com/GoogleContainerTools/skaffold/archive/v${version}.tar.gz"
-checksum=d9cee2e079b32b289d0e8c2c64fe2b403822aa9a4127482339b88f3160805639
+checksum=1877bd2e52471e77f03b3b78c4740fb4880f462a3c345f006f9416bfe0f041c9

From 49a652f8b120ba8441473938e9eb68bfcc7a44ea Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 29 Apr 2021 11:34:49 +0200
Subject: [PATCH 1842/2024] python3-pipx: update to 0.16.2.1.

---
 srcpkgs/python3-pipx/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-pipx/template b/srcpkgs/python3-pipx/template
index b1b4454ec85d..84e207b127f8 100644
--- a/srcpkgs/python3-pipx/template
+++ b/srcpkgs/python3-pipx/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pipx'
 pkgname=python3-pipx
-version=0.16.1.0
-revision=2
+version=0.16.2.1
+revision=1
 wrksrc="pipx-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pipxproject.github.io/pipx/"
 changelog="https://pipxproject.github.io/pipx/changelog/"
 distfiles="${PYPI_SITE}/p/pipx/pipx-${version}.tar.gz"
-checksum=22b9a0f0536e6b4e7ae030d33cbe34528c3f7ad1615d0c3795f2e5ac4db9d76d
+checksum=805319eab100c0c36e349b76103bbe903445229a60ebb0010d7cf7590ff5ba20
 
 post_install() {
 	vlicense LICENSE

From cb19271aba355f7e3ead4d2b1a0aa8973832cc4c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 29 Apr 2021 13:26:30 +0200
Subject: [PATCH 1843/2024] less: update to 581.2.

---
 srcpkgs/less/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/less/template b/srcpkgs/less/template
index 945149838fc0..7051a2e8197f 100644
--- a/srcpkgs/less/template
+++ b/srcpkgs/less/template
@@ -1,6 +1,6 @@
 # Template file for 'less'
 pkgname=less
-version=581
+version=581.2
 revision=1
 build_style=gnu-configure
 configure_args="--with-regex=pcre"
@@ -10,4 +10,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.greenwoodsoftware.com/less"
 distfiles="http://www.greenwoodsoftware.com/less/less-${version}.tar.gz"
-checksum=1d077f83fe7867e0ecfd278eab3122326b21c22c9161366189c38e09b96a2c65
+checksum=ce34b47caf20a99740672bf560fc48d5d663c5e78e67bc254e616b9537d5d83b

From 307723cd39b8f2ba3f2b610489df95a901868f84 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 29 Apr 2021 10:15:57 +0200
Subject: [PATCH 1844/2024] telegram-desktop: update to 2.7.4.

---
 srcpkgs/telegram-desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 393bd2f178d7..275c91163861 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.7.2
+version=2.7.4
 revision=1
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
@@ -25,7 +25,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=b67acb650e72efb8f8d3eb9175f210f5820d9cabb7f12891a197da6a69f454de
+checksum=97526f0b4adf04cf86b605ae84f3efaacf58eb8f828bab8f4fe752a4fac62fb2
 
 build_options="spellcheck"
 build_options_default="spellcheck"

From 1e0ecf1ef5cb956351b33ed849df52e926b54e63 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 29 Apr 2021 15:17:11 +0200
Subject: [PATCH 1845/2024] New package: cawbird-1.3.2

---
 srcpkgs/cawbird/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/cawbird/template

diff --git a/srcpkgs/cawbird/template b/srcpkgs/cawbird/template
new file mode 100644
index 000000000000..651b7b32f5f5
--- /dev/null
+++ b/srcpkgs/cawbird/template
@@ -0,0 +1,17 @@
+# Template file for 'cawbird'
+pkgname=cawbird
+version=1.3.2
+revision=1
+build_style=meson
+hostmakedepends="glib-devel pkg-config vala"
+makedepends="gspell-devel gst-plugins-base1-devel gtk+3-devel
+ json-glib-devel libglib-devel liboauth-devel libsoup-devel rest-devel
+ sqlite-devel"
+short_desc="Native Gtk+ Twitter client for the Linux desktop"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="https://ibboard.co.uk/cawbird/"
+distfiles="https://github.com/IBBoard/cawbird/archive/refs/tags/v${version}.tar.gz"
+checksum=20dd01b1b93f2608bbf6a83d5e4589927f875eff111a11366283b121c6136de7
+
+make_check=no # needs xorg and installed schemas

From 50aa5f8d5e6ebca7c2b6aadd1ba013084af836c3 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Sat, 9 Jan 2021 23:18:23 +0100
Subject: [PATCH 1846/2024] cawbird: merge changes from PR

This merges and closes changes from the open PR I missed.

Closes #27799
---
 srcpkgs/cawbird/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cawbird/template b/srcpkgs/cawbird/template
index 651b7b32f5f5..a307ed212e54 100644
--- a/srcpkgs/cawbird/template
+++ b/srcpkgs/cawbird/template
@@ -1,17 +1,22 @@
 # Template file for 'cawbird'
 pkgname=cawbird
 version=1.3.2
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="glib-devel pkg-config vala"
 makedepends="gspell-devel gst-plugins-base1-devel gtk+3-devel
  json-glib-devel libglib-devel liboauth-devel libsoup-devel rest-devel
  sqlite-devel"
+checkdepends="xvfb-run"
 short_desc="Native Gtk+ Twitter client for the Linux desktop"
-maintainer="Duncaen <duncaen@voidlinux.org>"
+maintainer="Paper <paper@tilde.institute>"
 license="GPL-3.0-or-later"
 homepage="https://ibboard.co.uk/cawbird/"
 distfiles="https://github.com/IBBoard/cawbird/archive/refs/tags/v${version}.tar.gz"
 checksum=20dd01b1b93f2608bbf6a83d5e4589927f875eff111a11366283b121c6136de7
 
-make_check=no # needs xorg and installed schemas
+do_check() {
+	mkdir -p "$HOME/.config"
+	cd build
+	GSETTINGS_SCHEMA_DIR=data/ GSETTINGS_BACKEND='memory' xvfb-run meson test
+}

From 3ee93d55c2382437efd56789b0b308476d5022d9 Mon Sep 17 00:00:00 2001
From: Lorem <notloremipsum@protonmail.com>
Date: Thu, 29 Apr 2021 07:57:19 +0530
Subject: [PATCH 1847/2024] budgie-screensaver: build with elogind support

---
 srcpkgs/budgie-screensaver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/budgie-screensaver/template b/srcpkgs/budgie-screensaver/template
index e2b0d44f3b4e..971ebcdb4c28 100644
--- a/srcpkgs/budgie-screensaver/template
+++ b/srcpkgs/budgie-screensaver/template
@@ -1,11 +1,11 @@
 # Template file for 'budgie-screensaver'
 pkgname=budgie-screensaver
 version=4.0
-revision=1
+revision=2
 wrksrc=budgie-screensaver-v${version}
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool glib"
-makedepends="gnome-desktop-devel dbus-glib-devel pam-devel"
+makedepends="gnome-desktop-devel dbus-glib-devel pam-devel elogind-devel"
 short_desc="Fork of GNOME Screensaver for Budgie 10"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="GPL-2.0-only"

From e233bfb62a08d4c3210428a5f53558e058647872 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 29 Apr 2021 08:53:41 +0300
Subject: [PATCH 1848/2024] libwacom: update to 1.10.

---
 srcpkgs/libwacom/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libwacom/template b/srcpkgs/libwacom/template
index c8ab37bbf718..4961b46e951f 100644
--- a/srcpkgs/libwacom/template
+++ b/srcpkgs/libwacom/template
@@ -1,6 +1,6 @@
 # Template file for 'libwacom'
 pkgname=libwacom
-version=1.9
+version=1.10
 revision=1
 build_style=meson
 build_helper="qemu"
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://github.com/linuxwacom/libwacom"
 changelog="https://raw.githubusercontent.com/linuxwacom/libwacom/master/NEWS"
 distfiles="https://github.com/linuxwacom/libwacom/releases/download/${pkgname}-${version}/${pkgname}-${version}.tar.bz2"
-checksum=68b14d4e3b75fed9f590bf6eaea361a72dc23e933b7725094c779477acf665c7
+checksum=f6c98c4597a786f967b3c02b9c93e40932a162cc4e279daf7abd4316b4265291
 
 if [ -z "${XBPS_CHECK_PKGS}" ]; then
 	configure_args+=" -Dtests=disabled"

From c2e2c5bbd636c20ef7b68a61f3f1c627b3028d39 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Thu, 29 Apr 2021 15:21:08 +0200
Subject: [PATCH 1849/2024] bind: update to 9.16.15.

---
 common/shlibs         | 14 +++++++-------
 srcpkgs/bind/template |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index bbe55668e47c..d6f8690fe6a7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1006,13 +1006,13 @@ libobrender.so.32 libopenbox-3.6.1_1
 libgssglue.so.1 libgssglue-0.3_1
 libtirpc.so.3 libtirpc-1.0.2_1
 libnfsidmap.so.1 libnfsidmap-2.4.3_2
-libbind9-9.16.12.so bind-libs-9.16.12_2
-libdns-9.16.12.so bind-libs-9.16.12_2
-libirs-9.16.12.so bind-libs-9.16.12_2
-libisc-9.16.12.so bind-libs-9.16.12_2
-libisccc-9.16.12.so bind-libs-9.16.12_2
-libisccfg-9.16.12.so bind-libs-9.16.12_2
-libns-9.16.12.so bind-libs-9.16.12_2
+libbind9-9.16.15.so bind-libs-9.16.15_1
+libdns-9.16.15.so bind-libs-9.16.15_1
+libirs-9.16.15.so bind-libs-9.16.15_1
+libisc-9.16.15.so bind-libs-9.16.15_1
+libisccc-9.16.15.so bind-libs-9.16.15_1
+libisccfg-9.16.15.so bind-libs-9.16.15_1
+libns-9.16.15.so bind-libs-9.16.15_1
 libplist-2.0.so.3 libplist-2.2.0_1
 libplist++-2.0.so.3 libplist++-2.2.0_1
 libnsbmp.so.0 libnsbmp-0.0.3_1
diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template
index 37c2c3b5c3a1..81641dd20990 100644
--- a/srcpkgs/bind/template
+++ b/srcpkgs/bind/template
@@ -1,7 +1,7 @@
 # Template file for 'bind'
 pkgname=bind
-version=9.16.12
-revision=2
+version=9.16.15
+revision=1
 _fullver="${version}${_patchver:+-${_patchver}}"
 wrksrc="${pkgname}-${_fullver}"
 build_style=gnu-configure
@@ -19,7 +19,7 @@ license="MPL-2.0"
 homepage="https://www.isc.org/downloads/bind/"
 changelog="https://gitlab.isc.org/isc-projects/bind9/-/blob/v9_16/CHANGES"
 distfiles="https://ftp.isc.org/isc/bind9/${_fullver}/bind-${_fullver}.tar.xz"
-checksum=9914af9311fd349cab441097898d94fb28d0bfd9bf6ed04fe1f97f042644da7f
+checksum=98b6f432d878a7bf8f57eb7b3c28be27278cf6b9989154bfe6c81104b38e7839
 # guarantee subpackage ordering
 subpackages="bind-libs bind-utils bind-devel"
 # requires special network setup

From 3c722ef47d842d93a85d9377119e5ef451efc3de Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Thu, 29 Apr 2021 08:45:05 +0200
Subject: [PATCH 1850/2024] python3-pivy: update to 0.6.6

---
 srcpkgs/python3-pivy/template | 54 ++++-------------------------------
 1 file changed, 6 insertions(+), 48 deletions(-)

diff --git a/srcpkgs/python3-pivy/template b/srcpkgs/python3-pivy/template
index a0844f8b7e0b..9940fe5cce01 100644
--- a/srcpkgs/python3-pivy/template
+++ b/srcpkgs/python3-pivy/template
@@ -1,66 +1,24 @@
 # Template file for 'python3-pivy'
 pkgname=python3-pivy
-version=0.6.5
-revision=2
+version=0.6.6
+revision=1
 wrksrc="pivy-${version}"
-build_style=python3-module
-hostmakedepends="python3-devel swig cmake"
+build_style=cmake
+hostmakedepends="python3-devel swig"
 makedepends="python3-devel coin3-devel"
 short_desc="Python3 bindings for the high-level 3D graphics library Coin"
 maintainer="yopito <pierre.bourgin@free.fr>"
 license="ISC"
 homepage="https://github.com/coin3d/pivy"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=16f2e339e5c59a6438266abe491013a20f53267e596850efad1559564a2c1719
+checksum=27204574d894cc12aba5df5251770f731f326a3e7de4499e06b5f5809cc5659e
 
-# still relevant with pivy 0.6.5 ?
+# still relevant with pivy 0.6.6 ?
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*);;
 	ppc*) broken="{standard input}:3376761: Error: operand out of range";;
 esac
 
-# setup.py calls cmake directly, so can't rely on xbps's cmake crossbuild support:
-# let's recreate here. Upstream should switch to cmake on next release (0.6.6).
-
-pre_configure() {
-	[ -z "$CROSS_BUILD" ] && return 0
-	case "$XBPS_TARGET_MACHINE" in
-		x86_64*) _CMAKE_SYSTEM_PROCESSOR=x86_64 ;;
-		i686*) _CMAKE_SYSTEM_PROCESSOR=x86 ;;
-		aarch64*) _CMAKE_SYSTEM_PROCESSOR=aarch64 ;;
-		arm*) _CMAKE_SYSTEM_PROCESSOR=arm ;;
-		mips*) _CMAKE_SYSTEM_PROCESSOR=mips ;;
-		ppc64le*) _CMAKE_SYSTEM_PROCESSOR=ppc64le ;;
-		ppc64*) _CMAKE_SYSTEM_PROCESSOR=ppc64 ;;
-		ppcle*) _CMAKE_SYSTEM_PROCESSOR=ppcle ;;
-		ppc*) _CMAKE_SYSTEM_PROCESSOR=ppc ;;
-		*) _CMAKE_SYSTEM_PROCESSOR=generic ;;
-	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}/usr;${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)
-
-SET(wxWidgets_CONFIG_EXECUTABLE ${XBPS_WRAPPERDIR}/${wx_config:=wx-config})
-_EOF
-	cat >$XBPS_WRAPPERDIR/cmake <<_EOF
-#!/bin/sh
-/usr/bin/cmake -DCMAKE_TOOLCHAIN_FILE=$wrksrc/cross_${XBPS_CROSS_TRIPLET}.cmake "$@"
-_EOF
-	chmod +x $XBPS_WRAPPERDIR/cmake
-}
-
 post_install() {
 	vlicense LICENSE
 }

From b14271322b9f0176272bfbee6410dd2cd3bbbbf3 Mon Sep 17 00:00:00 2001
From: noarchwastaken <noarch@n0ar.ch>
Date: Thu, 29 Apr 2021 10:52:43 -0400
Subject: [PATCH 1851/2024] pulseaudio: split pulseaudio-utils, document
 optional dependency

---
 srcpkgs/pulseaudio-utils                  |  1 +
 srcpkgs/pulseaudio/files/README.voidlinux |  4 ++++
 srcpkgs/pulseaudio/template               | 18 ++++++++++++++++--
 3 files changed, 21 insertions(+), 2 deletions(-)
 create mode 120000 srcpkgs/pulseaudio-utils

diff --git a/srcpkgs/pulseaudio-utils b/srcpkgs/pulseaudio-utils
new file mode 120000
index 000000000000..0153a53dd727
--- /dev/null
+++ b/srcpkgs/pulseaudio-utils
@@ -0,0 +1 @@
+pulseaudio
\ No newline at end of file
diff --git a/srcpkgs/pulseaudio/files/README.voidlinux b/srcpkgs/pulseaudio/files/README.voidlinux
index 360e8c1c4ccb..68bcd10179c3 100644
--- a/srcpkgs/pulseaudio/files/README.voidlinux
+++ b/srcpkgs/pulseaudio/files/README.voidlinux
@@ -1,3 +1,7 @@
 The system service `/etc/sv/pulseaudio` provided by the pulseaudio package is
 only needed in rare cases and should be avoided in most setups for performance
 and security reasons.
+
+Optional dependencies:
+
+* `python3-PyQt5-dbus` for running `qpaeq`
diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index 554e241e73ab..ebd8d86f63a7 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -1,7 +1,7 @@
 # Template file for 'pulseaudio'
 pkgname=pulseaudio
 version=14.2
-revision=3
+revision=4
 build_style=meson
 # XXX: new version should be able to enable systemd functionality using elogind
 configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
@@ -15,7 +15,7 @@ makedepends="$(vopt_if avahi avahi-libs-devel) eudev-libudev-devel fftw-devel ja
  libcap-devel libcap-progs libglib-devel libltdl-devel openssl-devel
  libsndfile-devel libsoxr-devel orc-devel sbc-devel speex-devel tdb-devel
  webrtc-audio-processing-devel xcb-util-devel check-devel"
-depends="rtkit"
+depends="pulseaudio-utils>=${version}_${revision} rtkit"
 conf_files="/etc/pulse/*"
 short_desc="Featureful, general-purpose sound server"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -76,3 +76,17 @@ pulseaudio-devel_package() {
 		vmove usr/share/vala
 	}
 }
+
+pulseaudio-utils_package() {
+	short_desc+=" - utilities"
+	pkg_install() {
+		for b in pacat pacmd pactl padsp pamon paplay parec \
+				 parecord pasuspender pax11publish; do
+			vmove usr/bin/$b
+			vmove usr/share/man/man1/${b}.1
+		done
+		vmove usr/bin/pa-info
+		vmove usr/share/bash-completion
+		vmove usr/share/zsh
+	}
+}

From ce123e533231996352ef84bf1d631f942e54d84e Mon Sep 17 00:00:00 2001
From: Ramdziana F Y <ramdzian@gmail.com>
Date: Thu, 29 Apr 2021 23:12:00 +0700
Subject: [PATCH 1852/2024] vivaldi: update to 3.8.2259.37

---
 srcpkgs/vivaldi/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/vivaldi/template b/srcpkgs/vivaldi/template
index 3ea0ec4e7192..978bd5dd7e02 100644
--- a/srcpkgs/vivaldi/template
+++ b/srcpkgs/vivaldi/template
@@ -1,6 +1,6 @@
 # Template file for 'vivaldi'
 pkgname=vivaldi
-version=3.7.2218.52
+version=3.8.2259.37
 revision=1
 _release=1
 archs="i686 x86_64"
@@ -18,10 +18,10 @@ nostrip=yes
 
 if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 	_debarch=amd64
-	checksum=f131f182bc6dd6e735a83ffaa4ff2a3cca90184daa26e0996d1cb64ed765ab2a
+	checksum=47047ff8e2dfec6f3c21ed7fbd84e0a3188b84e670169ee1da5e5053e550f1d2
 else
 	_debarch=i386
-	checksum=6f93e285e1cd48103fbdc3266e1188556ed2a98b08f7c6420eeb07c05c559a08
+	checksum=2bc02df168cac09e0ae1d2084395e0236a9b6dd270cd4c4d4079e898a2c58b81
 fi
 
 distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-${_release}_${_debarch}.deb"

From e6f4ed218610c3603aa1b5ac947ed65ad59f090e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 28 Apr 2021 23:24:34 -0300
Subject: [PATCH 1853/2024] linux5.11: update to 5.11.17.

---
 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 aa98468325f5..2d3c7f571db3 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.16
+version=5.11.17
 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
- 5c3f42864b2c28393289560376c686a2d75bc8bdac6a9d7f2d00c7bd1441264e"
+ b30eb037f7225230cdc4c800fc19447ed0b45220138830c1f3f2c020214a4a0a"
 skip_extraction="patch-${version}.xz"
 python_version=3
 patch_args="-Np1"

From 4a1f895ebc8a82b6ebcf338cf85d09cd65d176eb Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Thu, 29 Apr 2021 10:19:09 +0200
Subject: [PATCH 1854/2024] sway: restore support for gtk-primary-selection

This reverts https://github.com/swaywm/sway/commit/5ad3990a6c9beae44392e1962223623c0a4e3fa9
and fixes clipboard issues with Firefox ESR 78
---
 srcpkgs/sway/patches/primary_selection.diff | 25 +++++++++++++++++++++
 srcpkgs/sway/template                       |  2 +-
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/sway/patches/primary_selection.diff

diff --git a/srcpkgs/sway/patches/primary_selection.diff b/srcpkgs/sway/patches/primary_selection.diff
new file mode 100644
index 000000000000..e1f02fa0ee2c
--- /dev/null
+++ b/srcpkgs/sway/patches/primary_selection.diff
@@ -0,0 +1,25 @@
+Sway 1.6 removed support for gtk-primary-selection, but some
+programs (e.g. Firefox ESR 78) still rely on it.
+Since wlroots will drop it in version 0.14, we can restore
+this feature on sway.
+https://github.com/swaywm/sway/pull/5788
+https://github.com/swaywm/wlroots/issues/2421
+https://github.com/swaywm/wlroots/pull/2460
+--- sway/server.c
++++ sway/server.c
+@@ -15,6 +15,7 @@
+ #include <wlr/types/wlr_data_control_v1.h>
+ #include <wlr/types/wlr_export_dmabuf_v1.h>
+ #include <wlr/types/wlr_gamma_control_v1.h>
++#include <wlr/types/wlr_gtk_primary_selection.h>
+ #include <wlr/types/wlr_idle.h>
+ #include <wlr/types/wlr_layer_shell_v1.h>
+ #include <wlr/types/wlr_pointer_constraints_v1.h>
+@@ -75,6 +76,7 @@ bool server_init(struct sway_server *server) {
+ 		wlr_data_device_manager_create(server->wl_display);
+ 
+ 	wlr_gamma_control_manager_v1_create(server->wl_display);
++	wlr_gtk_primary_selection_device_manager_create(server->wl_display);
+ 
+ 	server->new_output.notify = handle_new_output;
+ 	wl_signal_add(&server->backend->events.new_output, &server->new_output);
diff --git a/srcpkgs/sway/template b/srcpkgs/sway/template
index 3297f668adf4..4a77658518e8 100644
--- a/srcpkgs/sway/template
+++ b/srcpkgs/sway/template
@@ -1,7 +1,7 @@
 # Template file for 'sway'
 pkgname=sway
 version=1.6
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dwerror=false -Db_ndebug=false"
 conf_files="/etc/sway/config"

From ef930be4ba2a447a080d2bd74fea711f68a92422 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 30 Apr 2021 16:20:35 +0200
Subject: [PATCH 1855/2024] gtk3-nocsd: update to 3.0.5.

---
 srcpkgs/gtk3-nocsd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gtk3-nocsd/template b/srcpkgs/gtk3-nocsd/template
index f30ca0eab6e6..f9056486ef4a 100644
--- a/srcpkgs/gtk3-nocsd/template
+++ b/srcpkgs/gtk3-nocsd/template
@@ -1,6 +1,6 @@
 # Template file for 'gtk3-nocsd'
 pkgname=gtk3-nocsd
-version=3.0.4
+version=3.0.5
 revision=1
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/ZaWertun/gtk3-nocsd"
 distfiles="https://github.com/ZaWertun/gtk3-nocsd/archive/v${version}.tar.gz"
-checksum=ebbcee89d7992029feca08524c0fec749fb7eb73ca9d4a98ae71c8ee94220c9d
+checksum=c734d71bb474d805a36ef524021bdbadee63d3d24b8b7ff7c8aae99b4e687a70
 
 do_install() {
 	vbin gtk3-nocsd

From 762a14cf3847e86033814d260d9bf9f0671e5d61 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 30 Apr 2021 16:24:08 +0200
Subject: [PATCH 1856/2024] linux4.19: update to 4.19.189.

---
 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 ab02053dcd66..9bb0d3d2f705 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.188
+version=4.19.189
 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=b09cf1f026b1260bae6480d98c471958eff3ad64b65e59e64a6852f678050077
+checksum=717b0e5df07ebbc0575d834e0c15c0e45060e771baa15b705e391ba38bc54389
 python_version=2 #unverified
 patch_args="-Np1"
 

From 670c8ebd5ef9f3071699bc1dd240a5db347256ed Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 30 Apr 2021 17:00:45 +0200
Subject: [PATCH 1857/2024] vlc: update to 3.0.13.

---
 srcpkgs/vlc/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 59b55648245f..0892f5bd78f3 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
 # Template file for 'vlc'
 pkgname=vlc
-version=3.0.12
-revision=2
+version=3.0.13
+revision=1
 build_style=gnu-configure
 configure_args="--disable-gme --disable-libtar --enable-jack
  --enable-live555 --disable-fluidsynth --enable-dvdread
@@ -17,7 +17,7 @@ license="GPL-2.0-only, LGPL-2.1-only"
 homepage="https://www.videolan.org/vlc/"
 changelog="https://www.videolan.org/developers/vlc-branch/NEWS"
 distfiles="https://download.videolan.org/pub/videolan/vlc/${version}/vlc-${version}.tar.xz"
-checksum=eff458f38a92126094f44f2263c2bf2c7cdef271b48192d0fe7b1726388cf879
+checksum=d5b43aa354dbe40f28099995e037bcf78896aa9b60862b17c5b7a19419be1ce5
 
 lib32disabled=yes
 

From 27d06b1f437919a8d94a16f2eda29e058c69492f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 30 Apr 2021 09:39:57 -0400
Subject: [PATCH 1858/2024] opencl2-headers: update to 2021.04.29.

---
 srcpkgs/opencl2-headers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opencl2-headers/template b/srcpkgs/opencl2-headers/template
index 893800d8bae0..5af1c46284cc 100644
--- a/srcpkgs/opencl2-headers/template
+++ b/srcpkgs/opencl2-headers/template
@@ -1,6 +1,6 @@
 # Template file for 'opencl2-headers'
 pkgname=opencl2-headers
-version=2020.12.18
+version=2021.04.29
 revision=1
 wrksrc="OpenCL-Headers-${version}"
 short_desc="OpenCL 2.2 (Open Computing Language) header files"
@@ -8,7 +8,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Apache-2.0"
 homepage="https://github.com/KhronosGroup/OpenCL-Headers"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=5dad6d436c0d7646ef62a39ef6cd1f3eba0a98fc9157808dfc1d808f3705ebc2
+checksum=477e2b26125d99a9b2f20c68262f27ca3f3ca7899593a8af2b7fe077bdce18d1
 provides="opencl-headers-${version}_${revision}"
 replaces="opencl-headers>=0"
 

From b79192f7ffef10b2681eb60c98b0d10656fa903c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 30 Apr 2021 09:43:23 -0400
Subject: [PATCH 1859/2024] maturin: update to 0.10.4.

---
 srcpkgs/maturin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index daa38d23537e..45f161c5c1cb 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -1,6 +1,6 @@
 # Template file for 'maturin'
 pkgname=maturin
-version=0.10.3
+version=0.10.4
 revision=1
 build_style=cargo
 # Disable the 'rustls' feature, which leads to bad platform compatibility
@@ -16,7 +16,7 @@ homepage="https://github.com/PyO3/maturin"
 # bump platforms version if it changes in Cargo.lock
 distfiles="${homepage}/archive/v${version}.tar.gz
  https://github.com/RustSec/platforms-crate/archive/v1.1.0.tar.gz"
-checksum="48e42dc7b9da5d4aa523d6e6fb607434be4a3ac08639b9c278edf716255ed91b
+checksum="8280456fc3958fe02f09aa20671a33922a5e1d57a8312901e03906cbe12630fd
  2524984c2ef547bb54515828e4afad0e781a439d74cf0197cf168ec6c818594c"
 
 post_extract() {

From ab6c24522e4efbaa17dae3750c5f371e553c4a5c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 30 Apr 2021 09:51:53 -0400
Subject: [PATCH 1860/2024] python3-grpcio: update to 1.37.1.

---
 srcpkgs/python3-grpcio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-grpcio/template b/srcpkgs/python3-grpcio/template
index 2a71470d9e4c..d07c5a624384 100644
--- a/srcpkgs/python3-grpcio/template
+++ b/srcpkgs/python3-grpcio/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-grpcio'
 pkgname=python3-grpcio
-version=1.37.0
+version=1.37.1
 revision=1
 archs="x86_64* i686* aarch64* armv[67]* ppc64le*"
 wrksrc="${pkgname#*-}-${version}"
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Apache-2.0"
 homepage="https://grpc.io"
 distfiles="${PYPI_SITE}/g/grpcio/grpcio-${version}.tar.gz"
-checksum=b3ce16aa91569760fdabd77ca901b2288152eb16941d28edd9a3a75a0c4a8a85
+checksum=df8305806311d3fe913d4f7eb3ef28e2072159ea12f95baab5d447f1380a71e3
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From da3036a452c0952145c7d2a336385bc2005fcb85 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 30 Apr 2021 10:05:59 -0400
Subject: [PATCH 1861/2024] python3-grpcio-tools: update to 1.37.1.

---
 srcpkgs/python3-grpcio-tools/template | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-grpcio-tools/template b/srcpkgs/python3-grpcio-tools/template
index a23ba5554e78..321867c258fd 100644
--- a/srcpkgs/python3-grpcio-tools/template
+++ b/srcpkgs/python3-grpcio-tools/template
@@ -1,18 +1,19 @@
 # Template file for 'python3-grpcio-tools'
 pkgname=python3-grpcio-tools
-version=1.37.0
+version=1.37.1
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel"
 depends="python3-protobuf python3-grpcio"
+checkdepends="python3-pytest $depends"
 short_desc="Protobuf code generator for gRPC"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Apache-2.0"
 homepage="https://grpc.io"
 distfiles="${PYPI_SITE}/g/grpcio-tools/grpcio-tools-${version}.tar.gz"
-checksum=3ec510c1b6bfc32effc639acf9a055e72dab7a7b6757bf72f2132790d6a7cf1c
+checksum=d775fb07cc6561174d6c86d11727a156c4ade969f7bf5edf623ffe2a428bee4e
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
@@ -23,3 +24,9 @@ post_patch() {
 		vsed -i setup.py -e "s@['\"]cc['\"]@'${CC}'@g"
 	fi
 }
+
+pre_check() {
+	# Subprocesses fail to find the compiled extension when only
+	# PYTHONPATH is set, so copy the extension into to source tree
+	cp -f build/lib*/grpc_tools/*.so grpc_tools
+}

From d50809790c10fe0abaed7366ee4e4f878c0e6bd2 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Wed, 28 Apr 2021 15:14:58 +0300
Subject: [PATCH 1862/2024] python3-PyJWT: update to 2.1.0

Re-enable tests

Closes: #30559 [via git-merge-pr]
---
 srcpkgs/python3-PyJWT/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-PyJWT/template b/srcpkgs/python3-PyJWT/template
index 0fe2e97c019c..ad1703121e2d 100644
--- a/srcpkgs/python3-PyJWT/template
+++ b/srcpkgs/python3-PyJWT/template
@@ -1,19 +1,18 @@
 # Template file for 'python3-PyJWT'
 pkgname=python3-PyJWT
-version=2.0.1
+version=2.1.0
 revision=1
 wrksrc="pyjwt-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3"
+depends="python3-cryptography"
+checkdepends="python3-pytest python3-coverage $depends"
 short_desc="Python implementation of RFC 7519"
 maintainer="fosslinux <fosslinux@aussies.space>"
 license="MIT"
 homepage="https://pyjwt.readthedocs.io/"
 distfiles="https://github.com/jpadilla/pyjwt/archive/${version}.tar.gz"
-checksum=63f296b42b4107a9e3ba4994d2d575ee0d05b9a55f433a3f46febfc4ee381ad1
-# Re-enable when switching to OpenSSL
-make_check=no
+checksum=054d212924baff4052fc587d71b8d489082e675c22d86a035a133b119e79bb29
 
 post_install() {
 	vlicense LICENSE

From b9319a186a5e56c262d5062cdb7dc1e4e3c523ef Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Tue, 27 Apr 2021 12:17:33 +0200
Subject: [PATCH 1863/2024] gdb: update to 10.2.

Closes: #30545 [via git-merge-pr]
---
 srcpkgs/gdb/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template
index 7b302ad7331b..9648e927efad 100644
--- a/srcpkgs/gdb/template
+++ b/srcpkgs/gdb/template
@@ -1,7 +1,7 @@
 # Template file for 'gdb'
 pkgname=gdb
-version=10.1
-revision=4
+version=10.2
+revision=1
 build_style=gnu-configure
 pycompile_dirs="/usr/share/gdb/python"
 configure_args="--disable-werror --disable-nls --with-system-readline
@@ -19,7 +19,7 @@ maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/gdb/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=f82f1eceeec14a3afa2de8d9b0d3c91d5a3820e23e0a01bbb70ef9f0276b62c0
+checksum=aaa1223d534c9b700a8bec952d9748ee1977513f178727e1bee520ee000b4f29
 python_version=3
 patch_args="-Np1"
 

From 2d378d8f10f8c18847fc083539c7edc46e024435 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Tue, 27 Apr 2021 12:16:51 +0200
Subject: [PATCH 1864/2024] strace: update to 5.12.

Closes: #30544 [via git-merge-pr]
---
 srcpkgs/strace/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/strace/template b/srcpkgs/strace/template
index 658366d1bbf2..cfc17796a156 100644
--- a/srcpkgs/strace/template
+++ b/srcpkgs/strace/template
@@ -1,6 +1,6 @@
 # Template file for 'strace'
 pkgname=strace
-version=5.11
+version=5.12
 revision=1
 build_style=gnu-configure
 configure_args="--enable-silent-rules --with-libunwind"
@@ -11,7 +11,7 @@ license="LGPL-2.1-or-later"
 homepage="https://strace.io/"
 changelog="https://raw.githubusercontent.com/strace/strace/master/NEWS"
 distfiles="https://github.com/strace/strace/releases/download/v${version}/strace-${version}.tar.xz"
-checksum=ffe340b10c145a0f85734271e9cce56457d23f21a7ea5931ab32f8cf4e793879
+checksum=29171edf9d252f89c988a4c340dfdec662f458cb8c63d85431d64bab5911e7c4
 
 case "$XBPS_TARGET_MACHINE" in
 	aarch64*|ppc64*) configure_args+=" --enable-mpers=no" ;;

From bb95c8dbb89859671ad83372bb7bebda9c08cefc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Fri, 30 Apr 2021 17:02:47 +0200
Subject: [PATCH 1865/2024] doomretro: update to 4.0.9.

---
 srcpkgs/doomretro/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/doomretro/template b/srcpkgs/doomretro/template
index f944ddb3a0e1..6eb6979c00fa 100644
--- a/srcpkgs/doomretro/template
+++ b/srcpkgs/doomretro/template
@@ -1,6 +1,6 @@
 # Template file for 'doomretro'
 pkgname=doomretro
-version=4.0.8
+version=4.0.9
 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=074654bc626346e47968dbc261e876c6191cbc6374428a7d4bc0852d6b6beb03
+checksum=c555fdd01626859453e42d7c9ec665ae6efcb9dd89e2d99d5d051fe0143173d0

From ac1101f3a15aaa6220c607470a14ed771dc4ecc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Fri, 30 Apr 2021 17:11:39 +0200
Subject: [PATCH 1866/2024] croc: update to 9.1.1.

---
 srcpkgs/croc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template
index 41a1fae5b322..820730bfcda3 100644
--- a/srcpkgs/croc/template
+++ b/srcpkgs/croc/template
@@ -1,6 +1,6 @@
 # Template file for 'croc'
 pkgname=croc
-version=9.1.0
+version=9.1.1
 revision=1
 build_style=go
 go_import_path=github.com/schollz/croc/v${version%%.*}
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"
 homepage="https://github.com/schollz/croc"
 distfiles="https://github.com/schollz/croc/archive/v${version}.tar.gz"
-checksum=7a126933258f197edde16adfa2bfb6623021b6007bc9803cd7128830048fff90
+checksum=ca151e59d7a655f2f4cdb06669f568254c2c73f499c2f828055e142702a6a415
 
 post_install() {
 	vlicense LICENSE

From a7f583f0c7ed3e3271050310f1b886df9456b00d Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Fri, 30 Apr 2021 20:01:59 +1100
Subject: [PATCH 1867/2024] cglm: update to 0.8.2.

---
 srcpkgs/cglm/patches/fix-cflags.patch | 13 -------------
 srcpkgs/cglm/template                 |  5 ++---
 2 files changed, 2 insertions(+), 16 deletions(-)
 delete mode 100644 srcpkgs/cglm/patches/fix-cflags.patch

diff --git a/srcpkgs/cglm/patches/fix-cflags.patch b/srcpkgs/cglm/patches/fix-cflags.patch
deleted file mode 100644
index c74de6ea62d7..000000000000
--- a/srcpkgs/cglm/patches/fix-cflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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 311b4c79a7d3..193646c39302 100644
--- a/srcpkgs/cglm/template
+++ b/srcpkgs/cglm/template
@@ -1,6 +1,6 @@
 # Template file for 'cglm'
 pkgname=cglm
-version=0.7.6
+version=0.8.2
 revision=1
 build_style=cmake
 short_desc="Highly Optimized Graphics Math (glm) for C"
@@ -8,8 +8,7 @@ maintainer="Nicu Borta <nicuborta123@tutanota.com>"
 license="MIT"
 homepage="https://github.com/recp/cglm"
 distfiles="https://github.com/recp/cglm/archive/v${version}.tar.gz"
-checksum=29ff8af4edc03697e36d3e6f99a80b884a80ee09d46055ce45765e5d6b2456d9
-patch_args=-Np1
+checksum=b578e3c9d3d93d83001e59c2f1e412043089f05684836f7ea570e9cb8f60df22
 
 post_install() {
 	vlicense LICENSE

From 06e20ba582dffe8ec9706e57b6322c80d2c4458f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Fri, 30 Apr 2021 16:19:48 +0200
Subject: [PATCH 1868/2024] postfix: update to 3.6.0.

---
 srcpkgs/postfix/patches/libressl.patch | 139 -------------------------
 srcpkgs/postfix/template               |   6 +-
 2 files changed, 3 insertions(+), 142 deletions(-)
 delete mode 100644 srcpkgs/postfix/patches/libressl.patch

diff --git a/srcpkgs/postfix/patches/libressl.patch b/srcpkgs/postfix/patches/libressl.patch
deleted file mode 100644
index 14f659ecd186..000000000000
--- a/srcpkgs/postfix/patches/libressl.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-Source: https://svnweb.freebsd.org/ports/head/mail/postfix/files/?sortby=date#dirlist
-Upstream: no, upstream does not define a contribution workflow/platform
-Reason: fix compatibility with LibreSSL
-
---- src/posttls-finger/posttls-finger.c	2017-02-03 23:43:04.000000000 +0100
-+++ src/posttls-finger/posttls-finger.c	2018-11-29 11:20:05.850958411 +0100
-@@ -1513,7 +1513,8 @@
-     return (0);
- }
- 
--#if defined(USE_TLS) && OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if defined(USE_TLS) && \
-+    ( OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) )
- 
- /* ssl_cleanup - free memory allocated in the OpenSSL library */
- 
-@@ -1966,7 +1967,8 @@
-     cleanup(&state);
- 
-     /* OpenSSL 1.1.0 and later (de)initialization is implicit */
--#if defined(USE_TLS) && OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if defined(USE_TLS) && \
-+    ( OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) )
-     ssl_cleanup();
- #endif
- 
---- src/tls/tls_client.c	2018-11-17 23:33:15.000000000 +0100
-+++ src/tls/tls_client.c	2018-11-29 11:20:44.305963154 +0100
-@@ -299,7 +299,7 @@
-      */
-     tls_check_version();
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 
-     /*
-      * Initialize the OpenSSL library by the book! To start with, we must
-@@ -433,7 +433,7 @@
-     /*
-      * 2015-12-05: Ephemeral RSA removed from OpenSSL 1.1.0-dev
-      */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 
-     /*
-      * According to the OpenSSL documentation, temporary RSA key is needed
---- src/tls/tls_dane.c	2018-11-05 00:47:50.000000000 +0100
-+++ src/tls/tls_dane.c	2018-11-29 11:21:12.762966395 +0100
-@@ -2127,7 +2127,7 @@
-     tls_param_init();
-     tls_check_version();
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     SSL_load_error_strings();
-     SSL_library_init();
- #endif
---- src/tls/tls.h	2018-11-17 23:55:55.000000000 +0100
-+++ src/tls/tls.h	2018-11-29 11:21:38.228969112 +0100
-@@ -89,7 +89,7 @@
- #endif
- 
-  /* Backwards compatibility with OpenSSL < 1.1.0 */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- #define OpenSSL_version_num SSLeay
- #define OpenSSL_version SSLeay_version
- #define OPENSSL_VERSION SSLEAY_VERSION
---- src/tls/tls_rsa.c	2016-01-03 15:49:51.000000000 +0100
-+++ src/tls/tls_rsa.c	2018-11-29 11:22:05.178971819 +0100
-@@ -57,7 +57,7 @@
-  /*
-   * 2015-12-05: Ephemeral RSA removed from OpenSSL 1.1.0-dev
-   */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 
- /* tls_tmp_rsa_cb - call-back to generate ephemeral RSA key */
- 
-@@ -109,7 +109,7 @@
-     /*
-      * 2015-12-05: Ephemeral RSA removed from OpenSSL 1.1.0-dev
-      */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     RSA    *rsa;
- 
-     msg_vstream_init(argv[0], VSTREAM_ERR);
---- src/tls/tls_server.c	2018-11-17 23:33:15.000000000 +0100
-+++ src/tls/tls_server.c	2018-11-29 11:24:36.505984117 +0100
-@@ -174,7 +174,7 @@
- #endif					/* OPENSSL_VERSION_NUMBER */
- 
-  /* OpenSSL 1.1.0 bitrot */
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- typedef const unsigned char *session_id_t;
- 
- #else
-@@ -377,7 +377,7 @@
-      */
-     tls_check_version();
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 
-     /*
-      * Initialize the OpenSSL library by the book! To start with, we must
-@@ -595,7 +595,7 @@
-     /*
-      * 2015-12-05: Ephemeral RSA removed from OpenSSL 1.1.0-dev
-      */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 
-     /*
-      * According to OpenSSL documentation, a temporary RSA key is needed when
---- src/tls/tls_server.c
-+++ src/tls/tls_server.c
-@@ -487,7 +487,7 @@
-      * incomplete.
-      */
- #ifdef SSL_OP_NO_TICKET
--#ifndef OPENSSL_NO_TLSEXT
-+#if !defined(OPENSSL_NO_TLSEXT) && !defined(LIBRESSL_VERSION_NUMBER)
-     ticketable = (*var_tls_tkt_cipher && scache_timeout > 0
- 		  && !(off & SSL_OP_NO_TICKET));
-     if (ticketable) {
---- src/tls/tls_certkey.c.orig
-+++ src/tls/tls_certkey.c
-@@ -144,7 +144,7 @@
- 
- /* use_chain - load cert, key and chain into ctx or ssl */
- 
--#if OPENSSL_VERSION_NUMBER >= 0x1010100fUL
-+#if OPENSSL_VERSION_NUMBER >= 0x1010100fUL && !defined(LIBRESSL_VERSION_NUMBER)
- static int use_chain(pem_load_state_t *st)
- {
-     int     ret;
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 8cef3964841f..85942c781c18 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
-version=3.5.10
-revision=2
+version=3.6.0
+revision=1
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="IPL-1.0, EPL-2.0"
 homepage="http://www.postfix.org/"
 distfiles="http://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${version}.tar.gz"
-checksum=5bb4d7d72d7512b58f3a31426dcbd394fd354e0a43de21da89466b057a0228f8
+checksum=77462894d7671d63cbe5fc2733f941088515a6d67108b9f1808b7dae37e83c2e
 
 system_accounts="postfix"
 postfix_homedir="/var/spool/postfix"

From 1480a5e217a9861298111903e5e515de0b978ad3 Mon Sep 17 00:00:00 2001
From: Joseph Benden <joe@benden.us>
Date: Tue, 27 Apr 2021 19:14:49 -0700
Subject: [PATCH 1869/2024] virtualbox-ose: update to 6.1.20.

Signed-off-by: Joseph Benden <joe@benden.us>
---
 .../patches/018-vboxnetflt-linux5.11.patch             | 10 ----------
 srcpkgs/virtualbox-ose/template                        |  6 +++---
 2 files changed, 3 insertions(+), 13 deletions(-)
 delete mode 100644 srcpkgs/virtualbox-ose/patches/018-vboxnetflt-linux5.11.patch

diff --git a/srcpkgs/virtualbox-ose/patches/018-vboxnetflt-linux5.11.patch b/srcpkgs/virtualbox-ose/patches/018-vboxnetflt-linux5.11.patch
deleted file mode 100644
index 8d7a4e86f495..000000000000
--- a/srcpkgs/virtualbox-ose/patches/018-vboxnetflt-linux5.11.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c	2021-01-07 16:41:28.000000000 +0100
-+++ src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c	2021-02-26 17:02:45.083599418 +0100
-@@ -38,6 +38,7 @@
- #include <linux/nsproxy.h>
- #endif
- #include <linux/netdevice.h>
-+#include <linux/ethtool.h>
- #include <linux/etherdevice.h>
- #include <linux/rtnetlink.h>
- #include <linux/miscdevice.h>
diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index c56c5dc9ff1d..b686236e1b0e 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,7 +1,7 @@
 # Template file for 'virtualbox-ose'
 pkgname=virtualbox-ose
-version=6.1.18
-revision=3
+version=6.1.20
+revision=1
 wrksrc="VirtualBox-${version}"
 short_desc="General-purpose full virtualizer for x86 hardware"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -9,7 +9,7 @@ license="GPL-2.0-only, CDDL-1.0"
 homepage="https://www.virtualbox.org"
 changelog="https://www.virtualbox.org/wiki/Changelog"
 distfiles="http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"
-checksum=108d42b9b391b7a332a33df1662cf7b0e9d9a80f3079d16288d8b9487f427d40
+checksum=e690c91974a2e7a5aca2c0939ad514382f9a2136797a5e0b96aab778e42bc8a7
 
 nopie=yes
 lib32disabled=yes

From b9eac8bdb905be95ad8f67cf48e12f94bb9898df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 27 Apr 2021 13:56:41 -0300
Subject: [PATCH 1870/2024] atom: remove package.

- still depends on nodejs 10, which will be EOL starting May 2021
- template is very out of date (current version is 1.56.0), which shows
  lack of interest for the package
- as seen in [1], depends on outdated electron9 (which void no longer
  provides, if we wanted to use system electron), and that's a recent
  development

[1] https://github.com/atom/atom/pull/21777
---
 common/shlibs                             |   1 -
 srcpkgs/atom/patches/fixes.patch          | 181 ----------------------
 srcpkgs/atom/patches/git-utils.patch      |  23 ---
 srcpkgs/atom/patches/use-system-git.patch |  51 ------
 srcpkgs/atom/template                     |  54 -------
 srcpkgs/removed-packages/template         |   1 +
 6 files changed, 1 insertion(+), 310 deletions(-)
 delete mode 100644 srcpkgs/atom/patches/fixes.patch
 delete mode 100644 srcpkgs/atom/patches/git-utils.patch
 delete mode 100644 srcpkgs/atom/patches/use-system-git.patch
 delete mode 100644 srcpkgs/atom/template

diff --git a/common/shlibs b/common/shlibs
index d6f8690fe6a7..fdb5cd7eb335 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -114,7 +114,6 @@ libGLESv1_CM.so.1 libGLES-1.0_1
 libGLESv2.so.2 libGLES-1.0_1
 libEGL.so rpi-userland-0.0.0.0.20150907_1
 libGLESv2.so rpi-userland-0.0.0.0.20150907_1
-libGLESv2.so atom-1.41.0_1
 libGLESv2.so opera-55.0.2994.37_2
 libGLESv2.so discord-0.0.7_1
 libGLESv2.so keybase-desktop-3.1.2_1
diff --git a/srcpkgs/atom/patches/fixes.patch b/srcpkgs/atom/patches/fixes.patch
deleted file mode 100644
index 5bb7f9814ba2..000000000000
--- a/srcpkgs/atom/patches/fixes.patch
+++ /dev/null
@@ -1,181 +0,0 @@
-diff -Naurp0 a/atom.sh b/atom.sh
---- a/atom.sh	2019-11-08 22:04:23.210260827 +0300
-+++ b/atom.sh	2019-11-08 22:08:36.721968851 +0300
-@@ -2,25 +1,0 @@
--
--if [ "$(uname)" == 'Darwin' ]; then
--  OS='Mac'
--elif [ "$(expr substr $(uname -s) 1 5)" == 'Linux' ]; then
--  OS='Linux'
--else
--  echo "Your platform ($(uname -a)) is not supported."
--  exit 1
--fi
--
--case $(basename $0) in
--  atom-beta)
--    CHANNEL=beta
--    ;;
--  atom-nightly)
--    CHANNEL=nightly
--    ;;
--  atom-dev)
--    CHANNEL=dev
--    ;;
--  *)
--    CHANNEL=stable
--    ;;
--esac
--
-@@ -91,0 +67 @@ mkdir -p "$ATOM_HOME"
-+ATOM_PATH="/usr/libexec/atom/atom"
-@@ -93,9 +69,5 @@ mkdir -p "$ATOM_HOME"
--if [ $OS == 'Mac' ]; then
--  if [ -L "$0" ]; then
--    SCRIPT="$(readlink "$0")"
--  else
--    SCRIPT="$0"
--  fi
--  ATOM_APP="$(dirname "$(dirname "$(dirname "$(dirname "$SCRIPT")")")")"
--  if [ "$ATOM_APP" == . ]; then
--    unset ATOM_APP
-+if [ $EXPECT_OUTPUT ]; then
-+  "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@"
-+  ATOM_EXIT=$?
-+  if [ ${ATOM_EXIT} -eq 0 ] && [ -n "${EXIT_CODE_OVERRIDE}" ]; then
-+    exit "${EXIT_CODE_OVERRIDE}"
-@@ -103,2 +75 @@ if [ $OS == 'Mac' ]; then
--    ATOM_PATH="$(dirname "$ATOM_APP")"
--    ATOM_APP_NAME="$(basename "$ATOM_APP")"
-+    exit ${ATOM_EXIT}
-@@ -106,85 +77,6 @@ if [ $OS == 'Mac' ]; then
--
--  if [ ! -z "${ATOM_APP_NAME}" ]; then
--    # If ATOM_APP_NAME is known, use it as the executable name
--    ATOM_EXECUTABLE_NAME="${ATOM_APP_NAME%.*}"
--  else
--    # Else choose it from the inferred channel name
--    if [ "$CHANNEL" == 'beta' ]; then
--      ATOM_EXECUTABLE_NAME="Atom Beta"
--    elif [ "$CHANNEL" == 'nightly' ]; then
--      ATOM_EXECUTABLE_NAME="Atom Nightly"
--    elif [ "$CHANNEL" == 'dev' ]; then
--      ATOM_EXECUTABLE_NAME="Atom Dev"
--    else
--      ATOM_EXECUTABLE_NAME="Atom"
--    fi
--  fi
--
--  if [ -z "${ATOM_PATH}" ]; then
--    # If ATOM_PATH isn't set, check /Applications and then ~/Applications for Atom.app
--    if [ -x "/Applications/$ATOM_APP_NAME" ]; then
--      ATOM_PATH="/Applications"
--    elif [ -x "$HOME/Applications/$ATOM_APP_NAME" ]; then
--      ATOM_PATH="$HOME/Applications"
--    else
--      # We haven't found an Atom.app, use spotlight to search for Atom
--      ATOM_PATH="$(mdfind "kMDItemCFBundleIdentifier == 'com.github.atom'" | grep -v ShipIt | head -1 | xargs -0 dirname)"
--
--      # Exit if Atom can't be found
--      if [ ! -x "$ATOM_PATH/$ATOM_APP_NAME" ]; then
--        echo "Cannot locate ${ATOM_APP_NAME}, it is usually located in /Applications. Set the ATOM_PATH environment variable to the directory containing ${ATOM_APP_NAME}."
--        exit 1
--      fi
--    fi
--  fi
--
--  if [ $EXPECT_OUTPUT ]; then
--    "$ATOM_PATH/$ATOM_APP_NAME/Contents/MacOS/$ATOM_EXECUTABLE_NAME" --executed-from="$(pwd)" --pid=$$ "$@"
--    ATOM_EXIT=$?
--    if [ ${ATOM_EXIT} -eq 0 ] && [ -n "${EXIT_CODE_OVERRIDE}" ]; then
--      exit "${EXIT_CODE_OVERRIDE}"
--    else
--      exit ${ATOM_EXIT}
--    fi
--  else
--    open -a "$ATOM_PATH/$ATOM_APP_NAME" -n --args --executed-from="$(pwd)" --pid=$$ --path-environment="$PATH" "$@"
--  fi
--elif [ $OS == 'Linux' ]; then
--  SCRIPT=$(readlink -f "$0")
--  USR_DIRECTORY=$(readlink -f $(dirname $SCRIPT)/..)
--
--  case $CHANNEL in
--    beta)
--      ATOM_PATH="$USR_DIRECTORY/share/atom-beta/atom"
--      ;;
--    nightly)
--      ATOM_PATH="$USR_DIRECTORY/share/atom-nightly/atom"
--      ;;
--    dev)
--      ATOM_PATH="$USR_DIRECTORY/share/atom-dev/atom"
--      ;;
--    *)
--      ATOM_PATH="$USR_DIRECTORY/share/atom/atom"
--      ;;
--  esac
--
--  : ${TMPDIR:=/tmp}
--
--  [ -x "$ATOM_PATH" ] || ATOM_PATH="$TMPDIR/atom-build/Atom/atom"
--
--  if [ $EXPECT_OUTPUT ]; then
--    "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@"
--    ATOM_EXIT=$?
--    if [ ${ATOM_EXIT} -eq 0 ] && [ -n "${EXIT_CODE_OVERRIDE}" ]; then
--      exit "${EXIT_CODE_OVERRIDE}"
--    else
--      exit ${ATOM_EXIT}
--    fi
--  else
--    (
--    nohup "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@" > "$ATOM_HOME/nohup.out" 2>&1
--    if [ $? -ne 0 ]; then
--      cat "$ATOM_HOME/nohup.out"
--      exit $?
--    fi
--    ) &
-+else
-+  (
-+  nohup "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@" > "$ATOM_HOME/nohup.out" 2>&1
-+  if [ $? -ne 0 ]; then
-+    cat "$ATOM_HOME/nohup.out"
-+    exit $?
-@@ -191,0 +84 @@ elif [ $OS == 'Linux' ]; then
-+  ) &
-diff -Naurp0 a/resources/linux/atom.desktop.in b/resources/linux/atom.desktop.in
---- a/resources/linux/atom.desktop.in	2019-11-08 22:29:18.312985700 +0300
-+++ b/resources/linux/atom.desktop.in	2019-11-08 22:31:30.748437296 +0300
-@@ -2,2 +2,2 @@
--Name=<%= appName %>
--Comment=<%= description %>
-+Name=Atom
-+Comment=Chrome-based text editor from Github
-@@ -5,2 +5,2 @@ GenericName=Text Editor
--Exec=env ATOM_DISABLE_SHELLING_OUT_FOR_ENVIRONMENT=false <%= installDir %>/bin/<%= appFileName %> %F
--Icon=<%= iconPath %>
-+Exec=env ATOM_DISABLE_SHELLING_OUT_FOR_ENVIRONMENT=false /usr/bin/atom %F
-+Icon=atom
-diff -Naurp0 a/script/lib/install-application.js b/script/lib/install-application.js
---- a/script/lib/install-application.js	2019-11-08 22:32:22.593396868 +0300
-+++ b/script/lib/install-application.js	2019-11-08 22:58:19.347068485 +0300
-@@ -90 +90 @@ module.exports = function(packagedAppPat
--    const shareDirPath = path.join(prefixDirPath, 'share');
-+    const shareDirPath = path.join(prefixDirPath, 'libexec');
-@@ -103 +103 @@ module.exports = function(packagedAppPat
--      const baseIconThemeDirPath = findBaseIconThemeDirPath();
-+      const baseIconThemeDirPath = path.join(prefixDirPath, 'share/icons/hicolor')
-@@ -216 +216 @@ module.exports = function(packagedAppPat
--          'share',
-+          'libexec',
-diff -Naurp0 a/src/main-process/atom-application.js b/src/main-process/atom-application.js
---- a/src/main-process/atom-application.js	2019-11-08 22:12:01.212764247 +0300
-+++ b/src/main-process/atom-application.js	2019-11-08 22:16:34.637836128 +0300
-@@ -719 +719 @@ module.exports = class AtomApplication e
--      path.join(process.resourcesPath, 'LICENSE.md')
-+      '/usr/share/licenses/atom/LICENSE.md'
-diff -Naurp0 a/src/workspace.js b/src/workspace.js
---- a/src/workspace.js	2019-11-08 22:14:27.324474946 +0300
-+++ b/src/workspace.js	2019-11-08 22:15:49.853005612 +0300
-@@ -1303 +1303 @@ module.exports = class Workspace extends
--    return this.open(path.join(process.resourcesPath, 'LICENSE.md'));
-+    return this.open('/usr/share/licenses/atom/LICENSE.md');
diff --git a/srcpkgs/atom/patches/git-utils.patch b/srcpkgs/atom/patches/git-utils.patch
deleted file mode 100644
index afb56568bf7f..000000000000
--- a/srcpkgs/atom/patches/git-utils.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Naurp0 a/package.json b/package.json
---- a/package.json	2019-12-13 22:07:42.000000000 +0300
-+++ b/package.json	2019-12-19 13:26:20.083698872 +0300
-@@ -67 +67 @@
--    "git-utils": "5.6.1",
-+    "git-utils": "file:packages/git-utils",
-diff -Naurp0 a/package-lock.json b/package-lock.json
---- a/package-lock.json	2019-12-13 22:07:42.000000000 +0300
-+++ b/package-lock.json	2019-12-19 16:45:30.215685265 +0300
-@@ -3187,3 +3187 @@
--      "version": "5.6.1",
--      "resolved": "https://registry.npmjs.org/git-utils/-/git-utils-5.6.1.tgz",
--      "integrity": "sha512-wDF7vSbH940NupuMFC87As0x/VSke51P7xTnkdSlk96YN3tzOagXzBUNq5Nq16KOVuMSxcGj1l3qHF5VXl39Ng==",
-+      "version": "file:packages/git-utils",
-@@ -5761 +5759 @@
--        "git-utils": "^5.6.0",
-+        "git-utils": "file:packages/git-utils",
-diff -Naurp0 a/packages/git-utils/binding.gyp b/packages/git-utils/binding.gyp
---- a/packages/git-utils/binding.gyp	2019-06-20 18:40:36.000000000 +0300
-+++ b/packages/git-utils/binding.gyp	2019-12-19 13:28:15.623981924 +0300
-@@ -164,0 +165,2 @@
-+        'deps/libgit2/src/net.c',
-+        'deps/libgit2/src/net.h',
diff --git a/srcpkgs/atom/patches/use-system-git.patch b/srcpkgs/atom/patches/use-system-git.patch
deleted file mode 100644
index 246c80f7a02d..000000000000
--- a/srcpkgs/atom/patches/use-system-git.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -Naurp0 a/package.json b/package.json
---- a/package.json	2019-12-13 22:07:42.000000000 +0300
-+++ b/package.json	2019-12-19 17:00:25.029132872 +0300
-@@ -52,0 +53 @@
-+    "dugite": "file:packages/dugite",
-diff -Naurp0 a/package-lock.json b/package-lock.json
---- a/package-lock.json	2019-12-13 22:07:42.000000000 +0300
-+++ b/package-lock.json	2019-12-19 16:44:18.175132282 +0300
-@@ -2530,3 +2530 @@
--      "version": "1.87.5",
--      "resolved": "https://registry.npmjs.org/dugite/-/dugite-1.87.5.tgz",
--      "integrity": "sha512-Rfl1pJ7SaIk8kW9knOGFvVl/aRWAL7RnESs/0GMUCay/yOtVejkrDGlK8JciN5dluJbIg/4bMp0KeK3HGuQqEQ==",
-+      "version": "file:packages/dugite",
-@@ -3212 +3210 @@
--        "dugite": "1.87.5",
-+        "dugite": "file:packages/dugite",
-@@ -6992 +6990 @@
--        "dugite": "^1.86.0",
-+        "dugite": "file:packages/dugite",
-diff -Naurp0 a/packages/dugite/build/lib/git-environment.js b/packages/dugite/build/lib/git-environment.js
---- a/packages/dugite/build/lib/git-environment.js	1985-10-26 11:15:00.000000000 +0300
-+++ b/packages/dugite/build/lib/git-environment.js	2019-12-19 15:13:56.919818081 +0300
-@@ -4,12 +3,0 @@ const path = require("path");
--function resolveEmbeddedGitDir() {
--    if (process.platform === 'darwin' ||
--        process.platform === 'linux' ||
--        process.platform === 'android' ||
--        process.platform === 'win32') {
--        const s = path.sep;
--        return path
--            .resolve(__dirname, '..', '..', 'git')
--            .replace(/[\\\/]app.asar[\\\/]/, `${s}app.asar.unpacked${s}`);
--    }
--    throw new Error('Git not supported on platform: ' + process.platform);
--}
-@@ -27 +15 @@ function resolveGitDir() {
--        return resolveEmbeddedGitDir();
-+        return '/usr';
-@@ -108,7 +95,0 @@ function setupEnvironment(environmentVar
--        if (!env.GIT_SSL_CAINFO && !env.LOCAL_GIT_DIRECTORY) {
--            // use the SSL certificate bundle included in the distribution only
--            // when using embedded Git and not providing your own bundle
--            const distDir = resolveEmbeddedGitDir();
--            const sslCABundle = `${distDir}/ssl/cacert.pem`;
--            env.GIT_SSL_CAINFO = sslCABundle;
--        }
-diff -Naurp0 a/packages/dugite/package.json b/packages/dugite/package.json
---- a/packages/dugite/package.json	1985-10-26 11:15:00.000000000 +0300
-+++ b/packages/dugite/package.json	2019-12-19 15:19:07.645889964 +0300
-@@ -16 +15,0 @@
--    "postinstall": "node ./script/download-git.js",
diff --git a/srcpkgs/atom/template b/srcpkgs/atom/template
deleted file mode 100644
index 928ae28c373b..000000000000
--- a/srcpkgs/atom/template
+++ /dev/null
@@ -1,54 +0,0 @@
-# Template file for 'atom'
-_dugite_ver=1.88.1
-_git_utils_ver=5.6.2
-pkgname=atom
-version=1.44.0
-revision=1
-archs="x86_64"
-hostmakedepends="git pkg-config python-devel nodejs-lts-10 nodejs-lts-10-devel curl gtk+3
- libXtst libXScrnSaver nss python alsa-lib"
-makedepends="python-devel GConf-devel libgnome-keyring-devel gtk+3-devel
- libX11-devel libxkbfile-devel libsecret-devel"
-depends="git"
-short_desc="Chrome-based text editor from Github"
-maintainer="Wilson Birney <wpb@360scada.com>"
-license="MIT"
-homepage="https://atom.io"
-distfiles="
-	https://github.com/atom/atom/archive/v${version}.tar.gz
-	https://registry.npmjs.org/dugite/-/dugite-${_dugite_ver}.tgz
-	https://registry.npmjs.org/git-utils/-/git-utils-${_git_utils_ver}.tgz"
-checksum="
-	8d79697b0c969f22ee8dc2c1d27c608036e92deaf63574f8cd1509ea506eded9
-	ddb5479cc78cf863f05b1c35420d66dde55f2bfa66f30cd7bac484ffd5fd6782
-	b430ee53a09317df5b6677e5625950baefe840258f2e9d55cf4fc448c9d8576e"
-skip_extraction="
-	dugite-${_dugite_ver}.tgz
-	git-utils-${_git_utils_ver}.tgz"
-shlib_provides="libGLESv2.so"
-patch_args="-Np1"
-nocross=yes
-nostrip=yes
-python_version=2
-
-post_extract() {
-	mkdir -p packages/dugite packages/git-utils
-	bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/dugite-${_dugite_ver}.tgz \
-		--strip-components=1 -C packages/dugite
-	bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/git-utils-${_git_utils_ver}.tgz \
-		--strip-components=1 -C packages/git-utils
-}
-
-pre_build() {
-	npm install -g gyp
-	vmkdir /usr/share/icons/hicolor
-}
-
-do_build() {
-	script/build --install=$DESTDIR/usr
-}
-
-do_install() {
-	mv $DESTDIR/usr/libexec/applications $DESTDIR/usr/share
-	vlicense LICENSE.md
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index a13a60849e36..1850b4b5bfb8 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -17,6 +17,7 @@ replaces="
  appdata-tools<=0.1.8_2
  arm-mem-git<=20131108_2
  arptables<=0.0.4_3
+ atom<=1.44.0_1
  avogadro<=1.2.0_8
  avogadro-devel<=1.2.0_8
  bokken<=1.8_3

From 9c4f9e208761c09a845bca7682ee2cba16d5ee81 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 30 Apr 2021 08:42:26 +0300
Subject: [PATCH 1871/2024] libgcrypt: update to 1.9.3.

---
 .../hwf-x86-fix-wrong-operand-type.patch      | 46 +++++++++++++++++++
 srcpkgs/libgcrypt/template                    |  5 +-
 2 files changed, 49 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/libgcrypt/patches/hwf-x86-fix-wrong-operand-type.patch

diff --git a/srcpkgs/libgcrypt/patches/hwf-x86-fix-wrong-operand-type.patch b/srcpkgs/libgcrypt/patches/hwf-x86-fix-wrong-operand-type.patch
new file mode 100644
index 000000000000..51165dcb0022
--- /dev/null
+++ b/srcpkgs/libgcrypt/patches/hwf-x86-fix-wrong-operand-type.patch
@@ -0,0 +1,46 @@
+From ec87511d9cd2dc31434e939b6351d74a38d4ceaa Mon Sep 17 00:00:00 2001
+From: Jussi Kivilinna <jussi.kivilinna@iki.fi>
+Date: Wed, 28 Apr 2021 19:19:15 +0300
+Subject: [PATCH] hwf-x86: fix use of wrong operand type
+
+* src/hwf-x86.c (get_cpuid): Use xchg for swapping %ebx back
+and forth between operand register.
+--
+
+HW feature routine was giving wrong results with certain compiler &
+compiler flag combinations on i386. Issue was that "=g" operand was
+used which caused problem if compiler allocated %ebx register for
+this operand. CPUID assembly block attempts to save %ebx as in older
+GCC versions this register was fixed for GOT pointer use and could
+not be modified otherwise (could not be used as operand or clobber).
+
+Reported-by: Iru Cai <vimacs@disroot.org>
+Signed-off-by: Jussi Kivilinna <jussi.kivilinna@iki.fi>
+---
+ src/hwf-x86.c | 12 +++++-------
+ 1 file changed, 5 insertions(+), 7 deletions(-)
+
+diff --git a/src/hwf-x86.c b/src/hwf-x86.c
+index 91e4c411e..a1aa02e78 100644
+--- a/src/hwf-x86.c
++++ b/src/hwf-x86.c
+@@ -83,14 +83,12 @@ get_cpuid(unsigned int in, unsigned int *eax, unsigned int *ebx,
+   unsigned int regs[4];
+ 
+   asm volatile
+-    ("movl %%ebx, %%edi\n\t"     /* Save GOT register.  */
+-     "xorl %%ebx, %%ebx\n\t"
++    ("xchgl %%ebx, %1\n\t"     /* Save GOT register.  */
+      "cpuid\n\t"
+-     "movl %%ebx, %1\n\t"
+-     "movl %%edi, %%ebx\n\t"     /* Restore GOT register. */
+-     : "=a" (regs[0]), "=g" (regs[1]), "=c" (regs[2]), "=d" (regs[3])
+-     : "0" (in), "2" (0), "3" (0)
+-     : "cc", "edi"
++     "xchgl %%ebx, %1\n\t"     /* Restore GOT register. */
++     : "=a" (regs[0]), "=D" (regs[1]), "=c" (regs[2]), "=d" (regs[3])
++     : "0" (in), "1" (0), "2" (0), "3" (0)
++     : "cc"
+      );
+ 
+   if (eax)
diff --git a/srcpkgs/libgcrypt/template b/srcpkgs/libgcrypt/template
index da057a81fd85..3a6032d6cc6c 100644
--- a/srcpkgs/libgcrypt/template
+++ b/srcpkgs/libgcrypt/template
@@ -1,6 +1,6 @@
 # Template file for 'libgcrypt'
 pkgname=libgcrypt
-version=1.9.2
+version=1.9.3
 revision=1
 build_style=gnu-configure
 configure_args="--enable-static --without-capabilities"
@@ -10,7 +10,8 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gnupg.org"
 distfiles="https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-${version}.tar.bz2"
-checksum=b2c10d091513b271e47177274607b1ffba3d95b188bbfa8797f948aec9053c5a
+checksum=97ebe4f94e2f7e35b752194ce15a0f3c66324e0ff6af26659bbfb5ff2ec328fd
+patch_args="-Np1"
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" ac_cv_sys_symbol_underscore=no"

From f3322054dd2f21eb1e7c4bdac63aa084c011b67d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Thu, 29 Apr 2021 23:58:26 -0300
Subject: [PATCH 1872/2024] sbctl: update to 0.3.

---
 srcpkgs/sbctl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sbctl/template b/srcpkgs/sbctl/template
index 7f6b7e79bc55..e5c58a7e9dbb 100644
--- a/srcpkgs/sbctl/template
+++ b/srcpkgs/sbctl/template
@@ -1,6 +1,6 @@
 # Template file for 'sbctl'
 pkgname=sbctl
-version=0.1
+version=0.3
 revision=1
 build_style=go
 go_import_path="github.com/foxboron/sbctl"
@@ -11,7 +11,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://github.com/Foxboron/sbctl"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=ba460e362ec0aa47c934052c235e05e36e0d81f36e5e7b94992b04f7d8406563
+checksum=ad887d4085af8d0229757c9baff85dc49ba6fb701ce7acdedfc31e4ce872f0ff
 
 do_build() {
 	make

From fe3a629e9eec846634fce29eaa334026f894aafe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 30 Apr 2021 10:37:30 -0300
Subject: [PATCH 1873/2024] kstars: update to 3.5.3.

---
 srcpkgs/kstars/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kstars/template b/srcpkgs/kstars/template
index eac916757446..61c6bd85d628 100644
--- a/srcpkgs/kstars/template
+++ b/srcpkgs/kstars/template
@@ -1,6 +1,6 @@
 # Template file for 'kstars'
 pkgname=kstars
-version=3.5.2
+version=3.5.3
 revision=1
 build_style=cmake
 hostmakedepends="kdoctools gettext qt5-host-tools qt5-qmake kcoreaddons
@@ -18,4 +18,4 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-2.0-or-later"
 homepage="https://edu.kde.org/kstars/"
 distfiles="${KDE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=897eeb3106dcb5d2b701e1f866f1fe4f8aefd591f09f9e6eac9875e742a85d75
+checksum=92052c1b69366120001fb79adaa7c6c3880e379085754a10dc4c0e9c04d76798

From 6b8ea40d25be4933d40e36a9d67c99670f1afa28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 30 Apr 2021 12:58:44 -0300
Subject: [PATCH 1874/2024] aisleriot: update to 3.22.15.

---
 srcpkgs/aisleriot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aisleriot/template b/srcpkgs/aisleriot/template
index 5bd4e53483f8..55a716a56217 100644
--- a/srcpkgs/aisleriot/template
+++ b/srcpkgs/aisleriot/template
@@ -1,6 +1,6 @@
 # Template file for 'aisleriot'
 pkgname=aisleriot
-version=3.22.14
+version=3.22.15
 revision=1
 build_style=meson
 # build requires assertions to be turned on -> n_debug=false
@@ -15,5 +15,5 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Aisleriot"
 distfiles="https://gitlab.gnome.org/GNOME/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=23249cff1cad498a6c465a597d927ee4386bd0d9ecf0b189de84d6fc384f1160
+checksum=d5ace3e8d4a158f1e68cd3f5b5f22764b990647bb66ce4d7c6e787094e8dfe95
 replaces="aisleriot-data>=0"

From 0398f79de39df5ce0d52e0535914fa3d7d61c6eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 30 Apr 2021 13:32:01 -0300
Subject: [PATCH 1875/2024] kicad-packages3D: update to 5.1.10.

---
 srcpkgs/kicad-packages3D/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kicad-packages3D/template b/srcpkgs/kicad-packages3D/template
index 93b9241577a5..32ca47b5ac0d 100644
--- a/srcpkgs/kicad-packages3D/template
+++ b/srcpkgs/kicad-packages3D/template
@@ -1,6 +1,6 @@
 # Template file for 'kicad-packages3D'
 pkgname=kicad-packages3D
-version=5.1.9
+version=5.1.10
 revision=1
 build_style=cmake
 depends="kicad"
@@ -9,4 +9,4 @@ maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
 license="CC-BY-SA-4.0"
 homepage="http://kicad-pcb.org"
 distfiles="https://gitlab.com/kicad/libraries/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=efce7b0b65ece76b57002cd4b84152fb359f7c47fe0b3d71166e9255ffa5c5b0
+checksum=b79f8de319a463d12972253a125ece118a8000533061d443d5730e1498822bff

From 9952f207a00df0b94ab2a58d87e8c60000f23280 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 30 Apr 2021 13:32:01 -0300
Subject: [PATCH 1876/2024] kicad-footprints: update to 5.1.10.

---
 srcpkgs/kicad-footprints/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kicad-footprints/template b/srcpkgs/kicad-footprints/template
index e5bc62c420cb..38655e0d5ff7 100644
--- a/srcpkgs/kicad-footprints/template
+++ b/srcpkgs/kicad-footprints/template
@@ -1,6 +1,6 @@
 # Template file for 'kicad-footprints'
 pkgname=kicad-footprints
-version=5.1.9
+version=5.1.10
 revision=1
 build_style=cmake
 depends="kicad"
@@ -9,7 +9,7 @@ maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
 license="CC-BY-SA-4.0"
 homepage="http://kicad-pcb.org"
 distfiles="https://gitlab.com/kicad/libraries/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=415e014364d1c12584f115a4adfeec1b71e41e2cd7f4ae543237ee71b8ef41bd
+checksum=65de50a9669e5eb0f2e4eed433802432eee2bd98df1e898905a7dc117cdb3050
 
 post_install() {
 	# otherwise KiCad will complain about a missing library when launched

From 2f62e03bb573186126c7a85d03f7ed4d4c934c63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 30 Apr 2021 13:32:02 -0300
Subject: [PATCH 1877/2024] kicad-templates: update to 5.1.10.

---
 srcpkgs/kicad-templates/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kicad-templates/template b/srcpkgs/kicad-templates/template
index 9cc44f0c1394..8c680089bd98 100644
--- a/srcpkgs/kicad-templates/template
+++ b/srcpkgs/kicad-templates/template
@@ -1,6 +1,6 @@
 # Template file for 'kicad-templates'
 pkgname=kicad-templates
-version=5.1.9
+version=5.1.10
 revision=1
 build_style=cmake
 depends="kicad"
@@ -9,4 +9,4 @@ maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
 license="CC-BY-SA-4.0"
 homepage="http://kicad-pcb.org"
 distfiles="https://gitlab.com/kicad/libraries/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=0c1bf3d2e6d8d1056a5da6c1f7a173551c154b4bdaddb86b6a34155b18e65da6
+checksum=f2c44d6dc69fc3c7db05f57c5caf290721e0bba3fe686e4e3bc2765e3f314668

From 1ca16c670e1d00092b7dd49174aec9bd310f45b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 30 Apr 2021 13:32:03 -0300
Subject: [PATCH 1878/2024] kicad: update to 5.1.10.

---
 srcpkgs/kicad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index 4b10f28927e6..c56f7422dbed 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -1,6 +1,6 @@
 # Template file for 'kicad'
 pkgname=kicad
-version=5.1.9
+version=5.1.10
 revision=2
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
@@ -20,7 +20,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="http://kicad-pcb.org"
 distfiles="https://gitlab.com/kicad/code/${pkgname}/-/archive/${version}/kicad-${version}.tar.gz"
-checksum=841be864b9dc5c761193c3ee9cbdbed6729952d7b38451aa8e1977bdfdb6081b
+checksum=296341f30ada2c7f4a1c54720eab425835a93349527d4bf08f73f280d19695ed
 python_version=3
 
 build_options="spice occt"

From 66e8317d48458346ca2b8b4d464d005b61c2ee98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 30 Apr 2021 13:32:03 -0300
Subject: [PATCH 1879/2024] kicad-library: update to 5.1.10.

---
 srcpkgs/kicad-library/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kicad-library/template b/srcpkgs/kicad-library/template
index 1ebed610fa05..847613c34704 100644
--- a/srcpkgs/kicad-library/template
+++ b/srcpkgs/kicad-library/template
@@ -1,6 +1,6 @@
 # Template file for 'kicad-library'
 pkgname=kicad-library
-version=5.1.9
+version=5.1.10
 revision=1
 build_style=meta
 depends="kicad-footprints>=${version} kicad-packages3D>=${version}

From ef5c2dea19ae5dc0fd84abfbf1af6a642ca44c36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 30 Apr 2021 13:32:04 -0300
Subject: [PATCH 1880/2024] kicad-symbols: update to 5.1.10.

---
 srcpkgs/kicad-symbols/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kicad-symbols/template b/srcpkgs/kicad-symbols/template
index 9c699f97ff64..afb67fcb7805 100644
--- a/srcpkgs/kicad-symbols/template
+++ b/srcpkgs/kicad-symbols/template
@@ -1,6 +1,6 @@
 # Template file for 'kicad-symbols'
 pkgname=kicad-symbols
-version=5.1.9
+version=5.1.10
 revision=1
 build_style=cmake
 depends="kicad"
@@ -9,4 +9,4 @@ maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
 license="CC-BY-SA-4.0"
 homepage="http://kicad-pcb.org"
 distfiles="https://gitlab.com/kicad/libraries/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=cdb033cc755cc66a087b44fff1d2b77bf2dd44311a02c81a516b8ca1fbd242a7
+checksum=5e80c8420a563c76c884b2771792ce7ee69efbe67d11d9b025eeb16b75aee45e

From 10501ec84d48185b3a0c8d8187793786e2764a56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 30 Apr 2021 13:32:04 -0300
Subject: [PATCH 1881/2024] kicad-doc: update to 5.1.10.

---
 srcpkgs/kicad-doc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kicad-doc/template b/srcpkgs/kicad-doc/template
index 780a7db122e8..0c1ac8eaf8e7 100644
--- a/srcpkgs/kicad-doc/template
+++ b/srcpkgs/kicad-doc/template
@@ -1,13 +1,13 @@
 # Template file for 'kicad-doc'
 pkgname=kicad-doc
-version=5.1.9
+version=5.1.10
 revision=1
 short_desc="KiCad documentation"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later, CC-BY-3.0"
 homepage="http://kicad-pcb.org"
 distfiles="https://kicad-downloads.s3.cern.ch/docs/${pkgname}-${version}.tar.gz"
-checksum=61571f260bba67e26b9f7456ad6eb5da7c3b406412f506e7857d0ca70ca66393
+checksum=73d986b7a9d5d777e4bf9bc7594e43568e067cd33466940957b5a513d9affd03
 
 do_install() {
 	vmkdir usr/

From 5ca7caeb70abf60668908fa4f586c7088d36f2cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 30 Apr 2021 13:32:05 -0300
Subject: [PATCH 1882/2024] kicad-i18n: update to 5.1.10.

---
 srcpkgs/kicad-i18n/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kicad-i18n/template b/srcpkgs/kicad-i18n/template
index 46f6e9c5c793..828c31afd4ab 100644
--- a/srcpkgs/kicad-i18n/template
+++ b/srcpkgs/kicad-i18n/template
@@ -1,8 +1,8 @@
 # Template file for 'kicad-i18n'
 pkgname=kicad-i18n
-version=5.1.9
+version=5.1.10
 revision=1
-_commit=04f3231f60d55400cb81564b2cd465a57d5192d5
+_commit=0ad3d7e469e31c8868ad83f90e22a9c18f16aa1f
 wrksrc="${pkgname}-${version}-${_commit}"
 build_style=cmake
 hostmakedepends="gettext"
@@ -12,4 +12,4 @@ maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
 license="CC-BY-SA-4.0"
 homepage="http://kicad-pcb.org"
 distfiles="https://gitlab.com/kicad/code/${pkgname}/-/archive/${version}/kicad-${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=edd1ff381fc767c48270395b49156891c626eb7760768b4b082cd575b4038cce
+checksum=07053ec2fbef9307583a423afe8c7c47ed5ee0f8189ee37fc1b47e2f1e566671

From 351411331fcc500253e6ad761d351b36263ec1f0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 30 Apr 2021 10:41:27 +0200
Subject: [PATCH 1883/2024] sbcl: update to 2.1.4.

---
 srcpkgs/sbcl/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index 058bff20ccb1..14388c213a6a 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -1,6 +1,6 @@
 # Template file for 'sbcl'
 pkgname=sbcl
-version=2.1.3
+version=2.1.4
 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=a90d4a4150c5ec1e13f07aa67dff2bde3b3c8344eaf81f4e9a519c8ab41adac0
+checksum=99260e2346fcd22ae5546e15baf50899dcb3b75a6c74cc7cc849378899efbd11
 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+=" e202b27f98ab5e74e75482b1cd439d43ec87845cbb96ba07471117b7c6b8eafb"
+	checksum+=" 46b8deff7d498407c3d47e918e8b9b2851e77c479ed909c54a9ef7722d98314a"
 	;;
 i686)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.4.3-x86-linux-binary.tar.bz2"

From 3e7c256c2f9990c789c30dec22969c8c30793e07 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 30 Apr 2021 18:47:08 +0200
Subject: [PATCH 1884/2024] crash: update to 7.3.0.

---
 srcpkgs/crash/template | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/crash/template b/srcpkgs/crash/template
index 2326da52c3e1..c94a1e550a85 100644
--- a/srcpkgs/crash/template
+++ b/srcpkgs/crash/template
@@ -1,6 +1,6 @@
 # Template file for 'crash'
 pkgname=crash
-version=7.2.9
+version=7.3.0
 revision=1
 archs="i686 x86_64"  # broken on musl
 build_style=gnu-makefile
@@ -12,14 +12,10 @@ license="GPL-3.0-or-later"
 homepage="https://crash-utility.github.io/"
 changelog="https://crash-utility.github.io/crash.changelog.html"
 distfiles="https://github.com/crash-utility/crash/archive/${version}.tar.gz"
-checksum=6c07634f7357906dcb21ff3decd1760d7b0b1a11c01472cd17aba2e67f3ce16e
+checksum=98d4367ae0ea7d2eda547357a839f7bddee517b588b281574d58a15a418af5b9
 nocross=yes
 LDFLAGS=-llzo2
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*) nopie=yes;; # broken CPUID inline assembly
-esac
-
 post_extract() {
 	sed -i 's|arch|uname -a|g' extensions/snap.mk
 	sed -i 's|/usr/lib/debug/lib/modules|/usr/lib/debug/usr/lib/modules|g' defs.h

From 9c9ea350eff4336beff9a3fc58e7042a6d6c6da3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 30 Apr 2021 12:16:06 -0400
Subject: [PATCH 1885/2024] grpc: update to 1.37.1.

---
 common/shlibs                             | 14 +++++-----
 srcpkgs/grpc/patches/private-abseil.patch | 34 +++++++++++++++++++++++
 srcpkgs/grpc/template                     | 29 +++++++++----------
 3 files changed, 56 insertions(+), 21 deletions(-)
 create mode 100644 srcpkgs/grpc/patches/private-abseil.patch

diff --git a/common/shlibs b/common/shlibs
index fdb5cd7eb335..c39878238889 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3562,15 +3562,15 @@ libaal-minimal.so.0 libaal-1.0.7_1
 libcli.so.1.9 libcli-1.9.8.4_1
 libaddress_sorting.so.15 grpc-1.36.0_2
 libgpr.so.15 grpc-1.36.0_2
-libgrpc++.so.1 grpc-1.36.0_2
-libgrpc++_alts.so.1 grpc-1.36.0_2
-libgrpc++_error_details.so.1 grpc-1.36.0_2
-libgrpc++_reflection.so.1 grpc-1.36.0_2
-libgrpc++_unsecure.so.1 grpc-1.36.0_2
+libgrpc++.so.1.37 grpc-1.37.1_1
+libgrpc++_alts.so.1.37 grpc-1.37.1_1
+libgrpc++_error_details.so.1.37 grpc-1.37.1_1
+libgrpc++_reflection.so.1.37 grpc-1.37.1_1
+libgrpc++_unsecure.so.1.37 grpc-1.37.1_1
 libgrpc.so.15 grpc-1.36.0_2
-libgrpc_plugin_support.so.1 grpc-1.36.0_2
+libgrpc_plugin_support.so.1.37 grpc-1.37.1_1
 libgrpc_unsecure.so.15 grpc-1.36.0_2
-libgrpcpp_channelz.so.1 grpc-1.36.0_2
+libgrpcpp_channelz.so.1.37 grpc-1.37.1_1
 libupb.so.15 grpc-1.36.0_2
 libircclient.so.1 libircclient-1.10_5
 libFAudio.so.0 FAudio-19.05_1
diff --git a/srcpkgs/grpc/patches/private-abseil.patch b/srcpkgs/grpc/patches/private-abseil.patch
new file mode 100644
index 000000000000..382ae7e263fc
--- /dev/null
+++ b/srcpkgs/grpc/patches/private-abseil.patch
@@ -0,0 +1,34 @@
+gRPC requires abseil, but abseil can be statically linked to avoid installing
+and tracking a ton of extra shared libs. Unfortunately, grpcpp headers now
+include absl headers, so these need to be installed. Put them in a private
+location because the full abseil installation is not provided.
+
+diff -ur third_party/abseil-cpp/CMakeLists.txt third_party/abseil-cpp/CMakeLists.txt
+--- third_party/abseil-cpp/CMakeLists.txt
++++ third_party/abseil-cpp/CMakeLists.txt
+@@ -42,6 +42,7 @@
+ endif (POLICY CMP0077)
+ 
+ project(absl CXX)
++set(BUILD_SHARED_LIBS OFF)
+ 
+ # Output directory is correct by default for most build setups. However, when
+ # building Abseil as a DLL, it is important to have the DLL in the same
+@@ -52,7 +53,7 @@
+ # when absl is included as subproject (i.e. using add_subdirectory(abseil-cpp))
+ # in the source tree of a project that uses it, install rules are disabled.
+ if(NOT "^${CMAKE_SOURCE_DIR}$" STREQUAL "^${PROJECT_SOURCE_DIR}$")
+-  option(ABSL_ENABLE_INSTALL "Enable install rule" OFF)
++  option(ABSL_ENABLE_INSTALL "Enable install rule" ON)
+ else()
+   option(ABSL_ENABLE_INSTALL "Enable install rule" ON)
+ endif()
+@@ -167,7 +168,7 @@
+   endif()  # absl_VERSION
+ 
+   install(DIRECTORY absl
+-    DESTINATION ${ABSL_INSTALL_INCLUDEDIR}
++    DESTINATION ${ABSL_INSTALL_INCLUDEDIR}/grpc_absl
+     FILES_MATCHING
+       PATTERN "*.inc"
+       PATTERN "*.h"
diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index 7fbee33ef1c3..f7070a748c64 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,8 +1,7 @@
 # Template file for 'grpc'
 pkgname=grpc
-reverts="1.37.0_1"
-version=1.36.4
-revision=2
+version=1.37.1
+revision=1
 _abseilver=6f9d96a1f41439ac172ee2ef7ccd8edf0e5d068c
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON
@@ -19,7 +18,7 @@ license="Apache-2.0"
 homepage="https://github.com/grpc/grpc"
 distfiles="${homepage}/archive/v${version}/${pkgname}-${version}.tar.gz
  https://github.com/abseil/abseil-cpp/archive/${_abseilver}/abseil-cpp-${_abseilver}.tar.gz"
-checksum="8eb9d86649c4d4a7df790226df28f081b97a62bf12c5c5fe9b5d31a29cd6541a
+checksum="acf247ec3a52edaee5dee28644a4e485c5e5badf46bdb24a80ca1d76cb8f1174
  62c27e7a633e965a2f40ff16b487c3b778eae440bab64cad83b34ef1cbe3aa93"
 
 if [ "$CROSS_BUILD" ]; then
@@ -41,20 +40,22 @@ post_patch() {
 	# re2 doesn't install CMake config modules;
 	# key variables are set in configure_args
 	vsed -i CMakeLists.txt -e '/include(cmake\/re2\.cmake)/d'
+}
+
+post_build() {
+	# Clean up unneeded absl linker arguments from pkgconfig files
+	sed -e 's/-labsl_[^[:space:]]\+[[:space:]]*//g' \
+		-i build/libs/opt/pkgconfig/*.pc
 
-	# override building shared abseil libs
-	vsed -i third_party/abseil-cpp/CMakeLists.txt \
-		-e "/project(absl CXX)/a set(BUILD_SHARED_LIBS OFF)"
+	# Add custom absl include root to grpcpp cflags
+	sed -e 's,^Cflags:.*,& -I${includedir}/grpc_absl,' \
+		-i build/libs/opt/pkgconfig/grpc++*.pc
 }
 
 post_install() {
-	# CMake seems to install these no matter what.
-	# For now, they do not appear to be necessary, so scrub them.
-	rm ${DESTDIR}/usr/lib/libabsl*.a
-
-	# Remove hard-coded absl linker args from pkgconfig files
-	sed -e 's/-labsl_[^[:space:]]\+[[:space:]]*//g' \
-		-i ${DESTDIR}/usr/lib/pkgconfig/*.pc
+	# Remove unnecessary absl static libs and cmake modules
+	rm "${DESTDIR}"/usr/lib/libabsl*.a
+	rm -rf "${DESTDIR}/usr/lib/cmake/absl"
 }
 
 grpc-devel_package() {

From 5db415003dfaecb4464d2403d7633348ca6e6793 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 30 Apr 2021 12:15:37 -0400
Subject: [PATCH 1886/2024] sysdig: rebuild for grpc

---
 srcpkgs/sysdig/patches/grpc-abseil.patch | 11 +++++++++++
 srcpkgs/sysdig/template                  |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/sysdig/patches/grpc-abseil.patch

diff --git a/srcpkgs/sysdig/patches/grpc-abseil.patch b/srcpkgs/sysdig/patches/grpc-abseil.patch
new file mode 100644
index 000000000000..6d8f3d29e4b8
--- /dev/null
+++ b/srcpkgs/sysdig/patches/grpc-abseil.patch
@@ -0,0 +1,11 @@
+--- userspace/libsinsp/CMakeLists.txt
++++ userspace/libsinsp/CMakeLists.txt
+@@ -31,7 +31,7 @@
+ 	include_directories("${B64_INCLUDE}")
+ 	include_directories("${CURSES_INCLUDE_DIR}")
+ 	if(NOT MINIMAL_BUILD)
+-		include_directories("${GRPC_INCLUDE}")
++		include_directories("${GRPC_INCLUDE}" "${GRPC_INCLUDE}/grpc_absl")
+ 		include_directories("${PROTOBUF_INCLUDE}")
+ 		include_directories("${OPENSSL_INCLUDE_DIR}")
+ 		include_directories("${CURL_INCLUDE_DIR}")
diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template
index f3600394d405..b2b58ff1677e 100644
--- a/srcpkgs/sysdig/template
+++ b/srcpkgs/sysdig/template
@@ -1,7 +1,7 @@
 # Template file for 'sysdig'
 pkgname=sysdig
 version=0.27.1
-revision=8
+revision=9
 build_style=cmake
 configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
  -DUSE_BUNDLED_B64=ON -DUSE_BUNDLED_JQ=ON -DBUILD_DRIVER=OFF

From 2acf9bff45c2cf7bee5d93a8707f1d2505287feb Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Wed, 28 Apr 2021 11:56:02 +0200
Subject: [PATCH 1887/2024] busybox: du: use 1024 unit size

make -k the default (write the files sizes in units of 1024 bytes)
else it uses 512 which differs from coreutils-du and toybox-du

cleanup the template while at it
---
 srcpkgs/busybox/files/dotconfig |  2 +-
 srcpkgs/busybox/template        | 18 ++++++------------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/busybox/files/dotconfig b/srcpkgs/busybox/files/dotconfig
index b661bbda790c..c7d524cf1ba1 100644
--- a/srcpkgs/busybox/files/dotconfig
+++ b/srcpkgs/busybox/files/dotconfig
@@ -227,7 +227,7 @@ CONFIG_DIRNAME=y
 # CONFIG_DOS2UNIX is not set
 # CONFIG_UNIX2DOS is not set
 CONFIG_DU=y
-# CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K is not set
+CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y
 CONFIG_ECHO=y
 CONFIG_FEATURE_FANCY_ECHO=y
 CONFIG_ENV=y
diff --git a/srcpkgs/busybox/template b/srcpkgs/busybox/template
index 1d24e7ea1108..07377569ba5f 100644
--- a/srcpkgs/busybox/template
+++ b/srcpkgs/busybox/template
@@ -1,7 +1,7 @@
 # Template file for 'busybox'
 pkgname=busybox
 version=1.32.1
-revision=2
+revision=3
 hostmakedepends="perl"
 checkdepends="tar which zip"
 short_desc="Swiss Army Knife of Embedded Linux"
@@ -48,12 +48,12 @@ do_configure() {
 		cp -f ${FILESDIR}/dotconfig ${t}/.config
 
 		case "$XBPS_TARGET_MACHINE" in
-		*-musl) sed -i -e /CONFIG_FEATURE_VI_REGEX_SEARCH/s/y/n/ \
+		*-musl) vsed -i -e /CONFIG_FEATURE_VI_REGEX_SEARCH/s/y/n/ \
 				${t}/.config;;
 		esac
 
 		if [ "$CROSS_BUILD" ]; then
-			sed -i -e \
+			vsed -i -e \
 				"s,\(CONFIG_CROSS_COMPILER_PREFIX\).*,\1=\"${XBPS_CROSS_TRIPLET}-\",g" \
 				${t}/.config
 		fi
@@ -83,15 +83,9 @@ do_build() {
 
 do_check() {
 	for t in busybox-core busybox busybox-static busybox-huge; do
-		# Copy the testsuite over
-		cp -r src/testsuite "${t}"
-		# Required by the testsuite
-		cp src/scripts/echo.c "${t}/scripts"
-		# Run the testsuite
-		(
-		cd "${t}/testsuite"
-		SKIP_KNOWN_BUGS=yes ./runtest -v
-		)
+		make -C "${t}" "${makejobs}" \
+			SKIP_KNOWN_BUGS=yes SKIP_INTERNET_TESTS=yes \
+			check
 	done
 }
 

From 137515b6b03e86a405136cafec7957c5c2db53d3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 29 Apr 2021 12:24:04 -0400
Subject: [PATCH 1888/2024] dracut: update to 053.

Closes: #30584.
---
 .../patches/00bootchart-requirements.patch    | 14 -----------
 .../patches/99squash-no-systemd-error.patch   | 13 ----------
 srcpkgs/dracut/patches/force_poweroff.patch   |  4 +--
 srcpkgs/dracut/template                       | 25 ++++++-------------
 4 files changed, 8 insertions(+), 48 deletions(-)
 delete mode 100644 srcpkgs/dracut/patches/00bootchart-requirements.patch
 delete mode 100644 srcpkgs/dracut/patches/99squash-no-systemd-error.patch

diff --git a/srcpkgs/dracut/patches/00bootchart-requirements.patch b/srcpkgs/dracut/patches/00bootchart-requirements.patch
deleted file mode 100644
index a617565a0c17..000000000000
--- a/srcpkgs/dracut/patches/00bootchart-requirements.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- modules.d/00bootchart/module-setup.sh.orig	2021-01-24 16:00:46.529880095 +0700
-+++ modules.d/00bootchart/module-setup.sh	2021-01-24 16:00:56.134911133 +0700
-@@ -19,10 +19,8 @@
- 
-     inst_multiple bootchartd bash \
-         /lib/bootchart/bootchart-collector /etc/bootchartd.conf \
--        accton \
-         echo \
--        grep \
--        usleep
-+        grep
- 
-     inst /usr/bin/pkill /bin/pkill
-     inst /usr/bin/[  /bin/[
diff --git a/srcpkgs/dracut/patches/99squash-no-systemd-error.patch b/srcpkgs/dracut/patches/99squash-no-systemd-error.patch
deleted file mode 100644
index d93f6d895b17..000000000000
--- a/srcpkgs/dracut/patches/99squash-no-systemd-error.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git modules.d/99squash/module-setup.sh modules.d/99squash/module-setup.sh
-index 9a61a59d..96543a58 100644
---- modules.d/99squash/module-setup.sh
-+++ modules.d/99squash/module-setup.sh
-@@ -2,8 +2,7 @@
- 
- check() {
-     if ! dracut_module_included "systemd-initrd"; then
--        derror "dracut-squash only supports systemd bases initramfs"
-         return 1
-     fi
- 
-     if ! type -P mksquashfs >/dev/null || ! type -P unsquashfs >/dev/null ; then
diff --git a/srcpkgs/dracut/patches/force_poweroff.patch b/srcpkgs/dracut/patches/force_poweroff.patch
index b965b93bfc2e..6ffda53e31a6 100644
--- a/srcpkgs/dracut/patches/force_poweroff.patch
+++ b/srcpkgs/dracut/patches/force_poweroff.patch
@@ -1,8 +1,6 @@
-diff --git modules.d/99base/dracut-lib.sh modules.d/99base/dracut-lib.sh
-index 99cb9dbc..3df77257 100755
 --- modules.d/99base/dracut-lib.sh
 +++ modules.d/99base/dracut-lib.sh
-@@ -1159,11 +1159,11 @@
+@@ -1128,11 +1128,11 @@
  
      case "$_emergency_action" in
          reboot)
diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index 791591ae7c30..c8db2195c8a0 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -1,7 +1,7 @@
 # Template file for 'dracut'
 pkgname=dracut
-version=051
-revision=2
+version=053
+revision=1
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc"
 conf_files="/etc/dracut.conf"
@@ -13,18 +13,18 @@ maintainer="q66 <daniel@octaforge.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="http://www.kernel.org/pub/linux/utils/boot/dracut/dracut.html"
 distfiles="${KERNEL_SITE}/utils/boot/dracut/dracut-${version}.tar.xz"
-checksum=95bc2586b771e3f4ab5c8637201732a137bb682395d25ab496374241091906e3
+checksum=d5a1b47cdb07919d8225d5b5f538e6ae604988f3df0afbde99a8dc775277b726
 subpackages="dracut-network"
+# Checks require distfiles come from a git repository
+make_check=no
 
 make_dirs="
  /etc/dracut.conf.d 0755 root root
  /usr/lib/dracut/dracut.conf.d 0755 root root"
 
-case "$XBPS_TARGET_MACHINE" in
-*-musl) # Add musl-fts implementation
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-fts-devel"
-	;;
-esac
+fi
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) # archs supported by dracut for EFI bundle
@@ -32,17 +32,6 @@ case "$XBPS_TARGET_MACHINE" in
 	;;
 esac
 
-do_build() {
-	case "$XBPS_TARGET_MACHINE" in
-		*-musl) make ${makejobs} LDLIBS="-lfts" ;;
-	esac
-}
-
-do_check() {
-	# Requires the distfile to be a git repository
-	:
-}
-
 post_install() {
 	# kernel hooks.
 	vinstall ${FILESDIR}/kernel-hook-postinst 755 etc/kernel.d/post-install 20-dracut

From aaa419db44e5852ecef229093a1e8511b47f91d8 Mon Sep 17 00:00:00 2001
From: Isaac Freund <ifreund@ifreund.xyz>
Date: Fri, 30 Apr 2021 18:55:30 +0200
Subject: [PATCH 1889/2024] wayland-protocols: update to 1.21.

---
 srcpkgs/wayland-protocols/template | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/wayland-protocols/template b/srcpkgs/wayland-protocols/template
index 51d2513d8f2d..1cf1902a2ec8 100644
--- a/srcpkgs/wayland-protocols/template
+++ b/srcpkgs/wayland-protocols/template
@@ -1,22 +1,16 @@
 # Template file for 'wayland-protocols'
 pkgname=wayland-protocols
-version=1.20
-revision=4
-build_style=gnu-configure
-hostmakedepends="pkg-config wayland-devel automake"
-depends="libffi-devel"
+version=1.21
+revision=1
+build_style=meson
+hostmakedepends="pkg-config wayland-devel"
+makedepends="wayland-devel"
 short_desc="Protocols and extensions complementing the Wayland core protocol"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://wayland.freedesktop.org"
 distfiles="https://github.com/wayland-project/wayland-protocols/archive/${version}.tar.gz"
-checksum=b59cf0949aeb1f71f7db46b63b1c5a6705ffde8cb5bd194f843fbd9b41308dda
-
-pre_configure() {
-	export wayland_scanner=wayland-scanner
-
-	NOCONFIGURE=1 ./autogen.sh
-}
+checksum=4cb4cd8c94534faf95243be957cd6b739b1a2d068218dc8f0762eac3d4707c04
 
 post_install() {
 	vlicense COPYING

From cd485026cee35c76c749065d4090fd572b24dee5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 29 Apr 2021 16:12:47 -0400
Subject: [PATCH 1890/2024] openmpi: update to 4.1.1.

---
 srcpkgs/openmpi/patches/avx.patch             | 1682 -----------------
 srcpkgs/openmpi/patches/drop-orted-mpir.patch |   19 +
 srcpkgs/openmpi/template                      |    6 +-
 3 files changed, 22 insertions(+), 1685 deletions(-)
 delete mode 100644 srcpkgs/openmpi/patches/avx.patch
 create mode 100644 srcpkgs/openmpi/patches/drop-orted-mpir.patch

diff --git a/srcpkgs/openmpi/patches/avx.patch b/srcpkgs/openmpi/patches/avx.patch
deleted file mode 100644
index 7088fbd4636e..000000000000
--- a/srcpkgs/openmpi/patches/avx.patch
+++ /dev/null
@@ -1,1682 +0,0 @@
-From 6de8dfd236b7180b04c911d2306c3b805abf7182 Mon Sep 17 00:00:00 2001
-From: George Bosilca <bosilca@icl.utk.edu>
-Date: Mon, 28 Dec 2020 15:36:05 -0500
-Subject: [PATCH 1/3] Major update to the AVX* detection and support
-
-1. Consistent march flag order between configure and make.
-
-2. op/avx: give the option to skip some tests
-
-it is possible to skip some intrinsic tests by setting some environment variables to "no" before invoking configure:
- - ompi_cv_op_avx_check_avx512
- - ompi_cv_op_avx_check_avx2
- - ompi_cv_op_avx_check_avx
- - ompi_cv_op_avx_check_sse41
- - ompi_cv_op_avx_check_sse3
-
-3. op/avx: update AVX512 flags
-
-try
--mavx512f -mavx512bw -mavx512vl -mavx512dq
-instead of
--march=skylake-avx512
-
-since the former is less likely to conflict with user provided CFLAGS
-(e.g. -march=...)
-
-Thanks Bart Oldeman for pointing this.
-
-4. op/avx: have the op/avx library depend on libmpi.so
-
-Refs. open-mpi/ompi#8323
-
-Signed-off-by: Gilles Gouaillardet <gilles@rist.or.jp>
-Signed-off-by: George Bosilca <bosilca@icl.utk.edu>
----
- ompi/mca/op/avx/Makefile.am  |   4 +-
- ompi/mca/op/avx/configure.m4 | 325 ++++++++++++++++++-----------------
- 2 files changed, 174 insertions(+), 155 deletions(-)
-
-diff --git ompi/mca/op/avx/Makefile.am ompi/mca/op/avx/Makefile.am
-index 41dcf2e1834..b1d84d90b33 100644
---- ompi/mca/op/avx/Makefile.am
-+++ ompi/mca/op/avx/Makefile.am
-@@ -2,7 +2,7 @@
- # Copyright (c) 2019-2020 The University of Tennessee and The University
- #                         of Tennessee Research Foundation.  All rights
- #                         reserved.
--# Copyright (c) 2020      Research Organization for Information Science
-+# Copyright (c) 2020-2021 Research Organization for Information Science
- #                         and Technology (RIST).  All rights reserved.
- # $COPYRIGHT$
- #
-@@ -86,7 +86,7 @@ mcacomponentdir = $(ompilibdir)
- mcacomponent_LTLIBRARIES = $(component_install)
- mca_op_avx_la_SOURCES = $(sources)
- mca_op_avx_la_LIBADD = $(specialized_op_libs)
--mca_op_avx_la_LDFLAGS = -module -avoid-version
-+mca_op_avx_la_LDFLAGS = -module -avoid-version $(top_builddir)/ompi/lib@OMPI_LIBMPI_NAME@.la
- 
- 
- # Specific information for static builds.
-diff --git ompi/mca/op/avx/configure.m4 ompi/mca/op/avx/configure.m4
-index 09d8b374c8e..f61b7100ef4 100644
---- ompi/mca/op/avx/configure.m4
-+++ ompi/mca/op/avx/configure.m4
-@@ -29,6 +29,13 @@ AC_DEFUN([MCA_ompi_op_avx_CONFIG],[
-     op_avx_support=0
-     op_avx2_support=0
-     op_avx512_support=0
-+
-+    AS_VAR_PUSHDEF([op_avx_check_sse3], [ompi_cv_op_avx_check_sse3])
-+    AS_VAR_PUSHDEF([op_avx_check_sse41], [ompi_cv_op_avx_check_sse41])
-+    AS_VAR_PUSHDEF([op_avx_check_avx], [ompi_cv_op_avx_check_avx])
-+    AS_VAR_PUSHDEF([op_avx_check_avx2], [ompi_cv_op_avx_check_avx2])
-+    AS_VAR_PUSHDEF([op_avx_check_avx512], [ompi_cv_op_avx_check_avx512])
-+
-     OPAL_VAR_SCOPE_PUSH([op_avx_cflags_save])
- 
-     AS_IF([test "$opal_cv_asm_arch" = "X86_64"],
-@@ -37,21 +44,9 @@ AC_DEFUN([MCA_ompi_op_avx_CONFIG],[
-            #
-            # Check for AVX512 support
-            #
--           AC_MSG_CHECKING([for AVX512 support (no additional flags)])
--           AC_LINK_IFELSE(
--               [AC_LANG_PROGRAM([[#include <immintrin.h>]],
--                                [[
--    __m512 vA, vB;
--    _mm512_add_ps(vA, vB)
--                                ]])],
--               [op_avx512_support=1
--                AC_MSG_RESULT([yes])],
--               [AC_MSG_RESULT([no])])
--
--           AS_IF([test $op_avx512_support -eq 0],
--                 [AC_MSG_CHECKING([for AVX512 support (with -march=skylake-avx512)])
--                  op_avx_cflags_save="$CFLAGS"
--                  CFLAGS="$CFLAGS -march=skylake-avx512"
-+           AC_CACHE_CHECK([if we are checking for AVX512 support], op_avx_check_avx512, AS_VAR_SET(op_avx_check_avx512, yes))
-+           AS_IF([test "$op_avx_check_avx512" = "yes"],
-+                 [AC_MSG_CHECKING([for AVX512 support (no additional flags)])
-                   AC_LINK_IFELSE(
-                       [AC_LANG_PROGRAM([[#include <immintrin.h>]],
-                                        [[
-@@ -59,99 +54,115 @@ AC_DEFUN([MCA_ompi_op_avx_CONFIG],[
-     _mm512_add_ps(vA, vB)
-                                        ]])],
-                       [op_avx512_support=1
--                       MCA_BUILD_OP_AVX512_FLAGS="-march=skylake-avx512"
-                        AC_MSG_RESULT([yes])],
-                       [AC_MSG_RESULT([no])])
--                  CFLAGS="$op_avx_cflags_save"
--                 ])
--           #
--           # Some combination of gcc and older as would not correctly build the code generated by
--           # _mm256_loadu_si256. Screen them out.
--           #
--           AS_IF([test $op_avx512_support -eq 1],
--                 [AC_MSG_CHECKING([if _mm512_loadu_si512 generates code that can be compiled])
--                  op_avx_cflags_save="$CFLAGS"
--                  CFLAGS="$CFLAGS_WITHOUT_OPTFLAGS -O0 $MCA_BUILD_OP_AVX512_FLAGS"
--                  AC_LINK_IFELSE(
--                      [AC_LANG_PROGRAM([[#include <immintrin.h>]],
--                               [[
-+
-+                  AS_IF([test $op_avx512_support -eq 0],
-+                        [AC_MSG_CHECKING([for AVX512 support (with -mavx512f -mavx512bw -mavx512vl -mavx512dq)])
-+                         op_avx_cflags_save="$CFLAGS"
-+                         CFLAGS="-mavx512f -mavx512bw -mavx512vl -mavx512dq $CFLAGS"
-+                         AC_LINK_IFELSE(
-+                             [AC_LANG_PROGRAM([[#include <immintrin.h>]],
-+                                              [[
-+    __m512 vA, vB;
-+    _mm512_add_ps(vA, vB)
-+                                       ]])],
-+                             [op_avx512_support=1
-+                              MCA_BUILD_OP_AVX512_FLAGS="-mavx512f -mavx512bw -mavx512vl -mavx512dq"
-+                              AC_MSG_RESULT([yes])],
-+                             [AC_MSG_RESULT([no])])
-+                         CFLAGS="$op_avx_cflags_save"
-+                        ])
-+                  #
-+                  # Some combination of gcc and older as would not correctly build the code generated by
-+                  # _mm256_loadu_si256. Screen them out.
-+                  #
-+                  AS_IF([test $op_avx512_support -eq 1],
-+                        [AC_MSG_CHECKING([if _mm512_loadu_si512 generates code that can be compiled])
-+                         op_avx_cflags_save="$CFLAGS"
-+                         CFLAGS="$CFLAGS_WITHOUT_OPTFLAGS -O0 $MCA_BUILD_OP_AVX512_FLAGS"
-+                         AC_LINK_IFELSE(
-+                             [AC_LANG_PROGRAM([[#include <immintrin.h>]],
-+                                      [[
-     int A[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
-     __m512i vA = _mm512_loadu_si512((__m512i*)&(A[1]))
--                               ]])],
--                      [AC_MSG_RESULT([yes])],
--                      [op_avx512_support=0
--                       MCA_BUILD_OP_AVX512_FLAGS=""
--                       AC_MSG_RESULT([no])])
--                  CFLAGS="$op_avx_cflags_save"
--                 ])
--           #
--           # Some PGI compilers do not define _mm512_mullo_epi64. Screen them out.
--           #
--           AS_IF([test $op_avx512_support -eq 1],
--                 [AC_MSG_CHECKING([if _mm512_mullo_epi64 generates code that can be compiled])
--                  op_avx_cflags_save="$CFLAGS"
--                  CFLAGS="$CFLAGS_WITHOUT_OPTFLAGS -O0 $MCA_BUILD_OP_AVX512_FLAGS"
--                  AC_LINK_IFELSE(
--                      [AC_LANG_PROGRAM([[#include <immintrin.h>]],
--                               [[
-+                                      ]])],
-+                             [AC_MSG_RESULT([yes])],
-+                             [op_avx512_support=0
-+                              MCA_BUILD_OP_AVX512_FLAGS=""
-+                              AC_MSG_RESULT([no])])
-+                         CFLAGS="$op_avx_cflags_save"
-+                        ])
-+                  #
-+                  # Some PGI compilers do not define _mm512_mullo_epi64. Screen them out.
-+                  #
-+                  AS_IF([test $op_avx512_support -eq 1],
-+                        [AC_MSG_CHECKING([if _mm512_mullo_epi64 generates code that can be compiled])
-+                         op_avx_cflags_save="$CFLAGS"
-+                         CFLAGS="$CFLAGS_WITHOUT_OPTFLAGS -O0 $MCA_BUILD_OP_AVX512_FLAGS"
-+                         AC_LINK_IFELSE(
-+                             [AC_LANG_PROGRAM([[#include <immintrin.h>]],
-+                                      [[
-     __m512i vA, vB;
-     _mm512_mullo_epi64(vA, vB)
--                               ]])],
--                      [AC_MSG_RESULT([yes])],
--                      [op_avx512_support=0
--                       MCA_BUILD_OP_AVX512_FLAGS=""
--                       AC_MSG_RESULT([no])])
--                  CFLAGS="$op_avx_cflags_save"
--                 ])
-+                                      ]])],
-+                             [AC_MSG_RESULT([yes])],
-+                             [op_avx512_support=0
-+                              MCA_BUILD_OP_AVX512_FLAGS=""
-+                              AC_MSG_RESULT([no])])
-+                         CFLAGS="$op_avx_cflags_save"
-+                        ])])
-            #
-            # Check support for AVX2
-            #
--           AC_MSG_CHECKING([for AVX2 support (no additional flags)])
--           AC_LINK_IFELSE(
--               [AC_LANG_PROGRAM([[#include <immintrin.h>]],
--                       [[
-+           AC_CACHE_CHECK([if we are checking for AVX2 support], op_avx_check_avx2, AS_VAR_SET(op_avx_check_avx2, yes))
-+           AS_IF([test "$op_avx_check_avx2" = "yes"],
-+                 [AC_MSG_CHECKING([for AVX2 support (no additional flags)])
-+                  AC_LINK_IFELSE(
-+                      [AC_LANG_PROGRAM([[#include <immintrin.h>]],
-+                              [[
-     __m256 vA, vB;
-     _mm256_add_ps(vA, vB)
--                       ]])],
--               [op_avx2_support=1
--                AC_MSG_RESULT([yes])],
--               [AC_MSG_RESULT([no])])
--           AS_IF([test $op_avx2_support -eq 0],
--               [AC_MSG_CHECKING([for AVX2 support (with -mavx2)])
--                op_avx_cflags_save="$CFLAGS"
--                CFLAGS="$CFLAGS -mavx2"
--                AC_LINK_IFELSE(
--                    [AC_LANG_PROGRAM([[#include <immintrin.h>]],
--                            [[
-+                              ]])],
-+                      [op_avx2_support=1
-+                       AC_MSG_RESULT([yes])],
-+                      [AC_MSG_RESULT([no])])
-+                  AS_IF([test $op_avx2_support -eq 0],
-+                      [AC_MSG_CHECKING([for AVX2 support (with -mavx2)])
-+                       op_avx_cflags_save="$CFLAGS"
-+                       CFLAGS="-mavx2 $CFLAGS"
-+                       AC_LINK_IFELSE(
-+                           [AC_LANG_PROGRAM([[#include <immintrin.h>]],
-+                                   [[
-     __m256 vA, vB;
-     _mm256_add_ps(vA, vB)
--                            ]])],
--                    [op_avx2_support=1
--                     MCA_BUILD_OP_AVX2_FLAGS="-mavx2"
--                     AC_MSG_RESULT([yes])],
--                    [AC_MSG_RESULT([no])])
--                CFLAGS="$op_avx_cflags_save"
--                ])
--           #
--           # Some combination of gcc and older as would not correctly build the code generated by
--           # _mm256_loadu_si256. Screen them out.
--           #
--           AS_IF([test $op_avx2_support -eq 1],
--                 [AC_MSG_CHECKING([if _mm256_loadu_si256 generates code that can be compiled])
--                  op_avx_cflags_save="$CFLAGS"
--                  CFLAGS="$CFLAGS_WITHOUT_OPTFLAGS -O0 $MCA_BUILD_OP_AVX2_FLAGS"
--                  AC_LINK_IFELSE(
--                      [AC_LANG_PROGRAM([[#include <immintrin.h>]],
--                               [[
-+                                   ]])],
-+                           [op_avx2_support=1
-+                            MCA_BUILD_OP_AVX2_FLAGS="-mavx2"
-+                            AC_MSG_RESULT([yes])],
-+                           [AC_MSG_RESULT([no])])
-+                       CFLAGS="$op_avx_cflags_save"
-+                       ])
-+                  #
-+                  # Some combination of gcc and older as would not correctly build the code generated by
-+                  # _mm256_loadu_si256. Screen them out.
-+                  #
-+                  AS_IF([test $op_avx2_support -eq 1],
-+                        [AC_MSG_CHECKING([if _mm256_loadu_si256 generates code that can be compiled])
-+                         op_avx_cflags_save="$CFLAGS"
-+                         CFLAGS="$CFLAGS_WITHOUT_OPTFLAGS -O0 $MCA_BUILD_OP_AVX2_FLAGS"
-+                         AC_LINK_IFELSE(
-+                             [AC_LANG_PROGRAM([[#include <immintrin.h>]],
-+                                      [[
-     int A[8] = {0, 1, 2, 3, 4, 5, 6, 7};
-     __m256i vA = _mm256_loadu_si256((__m256i*)&A)
--                               ]])],
--                      [AC_MSG_RESULT([yes])],
--                      [op_avx2_support=0
--                       MCA_BUILD_OP_AVX2_FLAGS=""
--                       AC_MSG_RESULT([no])])
--                  CFLAGS="$op_avx_cflags_save"
--                 ])
-+                                      ]])],
-+                             [AC_MSG_RESULT([yes])],
-+                             [op_avx2_support=0
-+                              MCA_BUILD_OP_AVX2_FLAGS=""
-+                              AC_MSG_RESULT([no])])
-+                         CFLAGS="$op_avx_cflags_save"
-+                        ])])
-            #
-            # What about early AVX support. The rest of the logic is slightly different as
-            # we need to include some of the SSE4.1 and SSE3 instructions. So, we first check
-@@ -160,90 +171,92 @@ AC_DEFUN([MCA_ompi_op_avx_CONFIG],[
-            # the AVX flag, and then recheck if we have support for the SSE4.1 and SSE3
-            # instructions.
-            #
--           AC_MSG_CHECKING([for AVX support (no additional flags)])
--           AC_LINK_IFELSE(
--               [AC_LANG_PROGRAM([[#include <immintrin.h>]],
--                       [[
-+           AC_CACHE_CHECK([if we are checking for AVX support], op_avx_check_avx, AS_VAR_SET(op_avx_check_avx, yes))
-+           AS_IF([test "$op_avx_check_avx" = "yes"],
-+                 [AC_MSG_CHECKING([for AVX support (no additional flags)])
-+                  AC_LINK_IFELSE(
-+                      [AC_LANG_PROGRAM([[#include <immintrin.h>]],
-+                              [[
-     __m128 vA, vB;
-     _mm_add_ps(vA, vB)
--                       ]])],
--               [op_avx_support=1
--                AC_MSG_RESULT([yes])],
--               [AC_MSG_RESULT([no])])
-+                              ]])],
-+                      [op_avx_support=1
-+                       AC_MSG_RESULT([yes])],
-+                      [AC_MSG_RESULT([no])])])
-            #
-            # Check for SSE4.1 support
-            #
--           AS_IF([test $op_avx_support -eq 1],
--               [AC_MSG_CHECKING([for SSE4.1 support])
--                AC_LINK_IFELSE(
--                    [AC_LANG_PROGRAM([[#include <immintrin.h>]],
--                            [[
-+           AC_CACHE_CHECK([if we are checking for SSE4.1 support], op_avx_check_sse41, AS_VAR_SET(op_avx_check_sse41, yes))
-+           AS_IF([test $op_avx_support -eq 1 && test "$op_avx_check_sse41" = "yes"],
-+                 [AC_MSG_CHECKING([for SSE4.1 support])
-+                  AC_LINK_IFELSE(
-+                      [AC_LANG_PROGRAM([[#include <immintrin.h>]],
-+                              [[
-     __m128i vA, vB;
-     (void)_mm_max_epi8(vA, vB)
--                            ]])],
--                    [op_sse41_support=1
--                     AC_MSG_RESULT([yes])],
--                    [AC_MSG_RESULT([no])])
--                ])
-+                              ]])],
-+                      [op_sse41_support=1
-+                       AC_MSG_RESULT([yes])],
-+                      [AC_MSG_RESULT([no])])
-+                  ])
-            #
-            # Check for SSE3 support
-            #
--           AS_IF([test $op_avx_support -eq 1],
--               [AC_MSG_CHECKING([for SSE3 support])
--                AC_LINK_IFELSE(
--                    [AC_LANG_PROGRAM([[#include <immintrin.h>]],
--                            [[
-+           AC_CACHE_CHECK([if we are checking for SSE3 support], op_avx_check_sse3, AS_VAR_SET(op_avx_check_sse3, yes))
-+           AS_IF([test $op_avx_support -eq 1 && test "$op_avx_check_sse3" = "yes"],
-+                 [AC_MSG_CHECKING([for SSE3 support])
-+                  AC_LINK_IFELSE(
-+                      [AC_LANG_PROGRAM([[#include <immintrin.h>]],
-+                              [[
-     int A[4] = {0, 1, 2, 3};
-     __m128i vA = _mm_lddqu_si128((__m128i*)&A)
--                            ]])],
--                    [op_sse3_support=1
--                     AC_MSG_RESULT([yes])],
--                    [AC_MSG_RESULT([no])])
--                ])
-+                              ]])],
-+                      [op_sse3_support=1
-+                       AC_MSG_RESULT([yes])],
-+                      [AC_MSG_RESULT([no])])
-+                  ])
-            # Second pass, do we need to add the AVX flag ?
-            AS_IF([test $op_avx_support -eq 0 || test $op_sse41_support -eq 0 || test $op_sse3_support -eq 0],
--               [AC_MSG_CHECKING([for AVX support (with -mavx)])
--                op_avx_cflags_save="$CFLAGS"
--                CFLAGS="$CFLAGS -mavx"
--                AC_LINK_IFELSE(
--                    [AC_LANG_PROGRAM([[#include <immintrin.h>]],
--                            [[
-+                 [AS_IF([test "$op_avx_check_avx" = "yes"],
-+                        [AC_MSG_CHECKING([for AVX support (with -mavx)])
-+                         op_avx_cflags_save="$CFLAGS"
-+                         CFLAGS="-mavx $CFLAGS"
-+                         AC_LINK_IFELSE(
-+                             [AC_LANG_PROGRAM([[#include <immintrin.h>]],
-+                                   [[
-     __m128 vA, vB;
-     _mm_add_ps(vA, vB)
-                             ]])],
--                    [op_avx_support=1
--                     MCA_BUILD_OP_AVX_FLAGS="-mavx"
--                     op_sse41_support=0
--                     op_sse3_support=0
--                     AC_MSG_RESULT([yes])],
--                    [AC_MSG_RESULT([no])])
-+                             [op_avx_support=1
-+                              MCA_BUILD_OP_AVX_FLAGS="-mavx"
-+                              op_sse41_support=0
-+                              op_sse3_support=0
-+                              AC_MSG_RESULT([yes])],
-+                             [AC_MSG_RESULT([no])])])
- 
--                AS_IF([test $op_sse41_support -eq 0],
--                    [AC_MSG_CHECKING([for SSE4.1 support])
--                     AC_LINK_IFELSE(
--                         [AC_LANG_PROGRAM([[#include <immintrin.h>]],
--                                 [[
-+                  AS_IF([test "$op_avx_check_sse41" = "yes" && test $op_sse41_support -eq 0],
-+                        [AC_MSG_CHECKING([for SSE4.1 support])
-+                         AC_LINK_IFELSE(
-+                             [AC_LANG_PROGRAM([[#include <immintrin.h>]],
-+                                     [[
-     __m128i vA, vB;
-     (void)_mm_max_epi8(vA, vB)
--                                 ]])],
--                         [op_sse41_support=1
--                          AC_MSG_RESULT([yes])],
--                         [AC_MSG_RESULT([no])])
--                     ])
--                AS_IF([test $op_sse3_support -eq 0],
--                    [AC_MSG_CHECKING([for SSE3 support])
--                     AC_LINK_IFELSE(
--                         [AC_LANG_PROGRAM([[#include <immintrin.h>]],
-+                                     ]])],
-+                             [op_sse41_support=1
-+                              AC_MSG_RESULT([yes])],
-+                             [AC_MSG_RESULT([no])])])
-+                  AS_IF([test "$op_avx_check_sse3" = "yes" && test $op_sse3_support -eq 0],
-+                        [AC_MSG_CHECKING([for SSE3 support])
-+                         AC_LINK_IFELSE(
-+                             [AC_LANG_PROGRAM([[#include <immintrin.h>]],
-                                  [[
-     int A[4] = {0, 1, 2, 3};
-     __m128i vA = _mm_lddqu_si128((__m128i*)&A)
-                                  ]])],
--                         [op_sse3_support=1
--                          AC_MSG_RESULT([yes])],
--                         [AC_MSG_RESULT([no])])
--                     ])
--                CFLAGS="$op_avx_cflags_save"
--               ])
-+                             [op_sse3_support=1
-+                              AC_MSG_RESULT([yes])],
-+                             [AC_MSG_RESULT([no])])])
-+                  CFLAGS="$op_avx_cflags_save"])
- 
-            AC_LANG_POP([C])
-           ])
-@@ -276,6 +289,12 @@ AC_DEFUN([MCA_ompi_op_avx_CONFIG],[
-     AC_SUBST(MCA_BUILD_OP_AVX2_FLAGS)
-     AC_SUBST(MCA_BUILD_OP_AVX_FLAGS)
- 
-+    AS_VAR_POPDEF([op_avx_check_avx512])
-+    AS_VAR_POPDEF([op_avx_check_avx2])
-+    AS_VAR_POPDEF([op_avx_check_avx])
-+    AS_VAR_POPDEF([op_avx_check_sse41])
-+    AS_VAR_POPDEF([op_avx_check_sse3])
-+
-     OPAL_VAR_SCOPE_POP
-     # Enable this component iff we have at least the most basic form of support
-     # for vectorial ISA
-
-From 1c386327da5757632392aa6c967acfbebc85c7ff Mon Sep 17 00:00:00 2001
-From: George Bosilca <bosilca@icl.utk.edu>
-Date: Mon, 28 Dec 2020 12:18:07 -0500
-Subject: [PATCH 2/3] AVX code generation improvements
-
-1. Allow fallback to a lesser AVX support during make
-
-Due to the fact that some distro restrict the compiule architecture
-during make (while not setting any restrictions during configure) we
-need to detect the target architecture also during make in order to
-restrict the code we generate.
-
-2. Add comments and better protect the arch specific code.
-
-Identify all the vectorial functions used and clasify them according to
-the neccesary hardware capabilities.
-Use these requirements to protect the code for load and stores (the rest
-of the code being automatically generated it is more difficult to
-protect).
-
-3. Correctly check for AVX* support.
-
-Signed-off-by: George Bosilca <bosilca@icl.utk.edu>
----
- ompi/mca/op/avx/configure.m4       |  28 +--
- ompi/mca/op/avx/op_avx_functions.c | 322 ++++++++++++++++++++++++-----
- 2 files changed, 288 insertions(+), 62 deletions(-)
-
-diff --git ompi/mca/op/avx/configure.m4 ompi/mca/op/avx/configure.m4
-index f61b7100ef4..f3651f09d43 100644
---- ompi/mca/op/avx/configure.m4
-+++ ompi/mca/op/avx/configure.m4
-@@ -44,7 +44,7 @@ AC_DEFUN([MCA_ompi_op_avx_CONFIG],[
-            #
-            # Check for AVX512 support
-            #
--           AC_CACHE_CHECK([if we are checking for AVX512 support], op_avx_check_avx512, AS_VAR_SET(op_avx_check_avx512, yes))
-+           AC_CACHE_CHECK([for AVX512 support], op_avx_check_avx512, AS_VAR_SET(op_avx_check_avx512, yes))
-            AS_IF([test "$op_avx_check_avx512" = "yes"],
-                  [AC_MSG_CHECKING([for AVX512 support (no additional flags)])
-                   AC_LINK_IFELSE(
-@@ -115,14 +115,14 @@ AC_DEFUN([MCA_ompi_op_avx_CONFIG],[
-            #
-            # Check support for AVX2
-            #
--           AC_CACHE_CHECK([if we are checking for AVX2 support], op_avx_check_avx2, AS_VAR_SET(op_avx_check_avx2, yes))
-+           AC_CACHE_CHECK([for AVX2 support], op_avx_check_avx2, AS_VAR_SET(op_avx_check_avx2, yes))
-            AS_IF([test "$op_avx_check_avx2" = "yes"],
-                  [AC_MSG_CHECKING([for AVX2 support (no additional flags)])
-                   AC_LINK_IFELSE(
-                       [AC_LANG_PROGRAM([[#include <immintrin.h>]],
-                               [[
--    __m256 vA, vB;
--    _mm256_add_ps(vA, vB)
-+    __m256i vA, vB, vC;
-+    vC = _mm256_and_si256(vA, vB)
-                               ]])],
-                       [op_avx2_support=1
-                        AC_MSG_RESULT([yes])],
-@@ -134,8 +134,8 @@ AC_DEFUN([MCA_ompi_op_avx_CONFIG],[
-                        AC_LINK_IFELSE(
-                            [AC_LANG_PROGRAM([[#include <immintrin.h>]],
-                                    [[
--    __m256 vA, vB;
--    _mm256_add_ps(vA, vB)
-+    __m256i vA, vB, vC;
-+    vC = _mm256_and_si256(vA, vB)
-                                    ]])],
-                            [op_avx2_support=1
-                             MCA_BUILD_OP_AVX2_FLAGS="-mavx2"
-@@ -164,21 +164,21 @@ AC_DEFUN([MCA_ompi_op_avx_CONFIG],[
-                          CFLAGS="$op_avx_cflags_save"
-                         ])])
-            #
--           # What about early AVX support. The rest of the logic is slightly different as
-+           # What about early AVX support? The rest of the logic is slightly different as
-            # we need to include some of the SSE4.1 and SSE3 instructions. So, we first check
-            # if we can compile AVX code without a flag, then we validate that we have support
-            # for the SSE4.1 and SSE3 instructions we need. If not, we check for the usage of
-            # the AVX flag, and then recheck if we have support for the SSE4.1 and SSE3
-            # instructions.
-            #
--           AC_CACHE_CHECK([if we are checking for AVX support], op_avx_check_avx, AS_VAR_SET(op_avx_check_avx, yes))
-+           AC_CACHE_CHECK([for AVX support], op_avx_check_avx, AS_VAR_SET(op_avx_check_avx, yes))
-            AS_IF([test "$op_avx_check_avx" = "yes"],
-                  [AC_MSG_CHECKING([for AVX support (no additional flags)])
-                   AC_LINK_IFELSE(
-                       [AC_LANG_PROGRAM([[#include <immintrin.h>]],
-                               [[
--    __m128 vA, vB;
--    _mm_add_ps(vA, vB)
-+    __m256 vA, vB, vC;
-+    vC = _mm256_add_ps(vA, vB)
-                               ]])],
-                       [op_avx_support=1
-                        AC_MSG_RESULT([yes])],
-@@ -186,7 +186,7 @@ AC_DEFUN([MCA_ompi_op_avx_CONFIG],[
-            #
-            # Check for SSE4.1 support
-            #
--           AC_CACHE_CHECK([if we are checking for SSE4.1 support], op_avx_check_sse41, AS_VAR_SET(op_avx_check_sse41, yes))
-+           AC_CACHE_CHECK([for SSE4.1 support], op_avx_check_sse41, AS_VAR_SET(op_avx_check_sse41, yes))
-            AS_IF([test $op_avx_support -eq 1 && test "$op_avx_check_sse41" = "yes"],
-                  [AC_MSG_CHECKING([for SSE4.1 support])
-                   AC_LINK_IFELSE(
-@@ -202,7 +202,7 @@ AC_DEFUN([MCA_ompi_op_avx_CONFIG],[
-            #
-            # Check for SSE3 support
-            #
--           AC_CACHE_CHECK([if we are checking for SSE3 support], op_avx_check_sse3, AS_VAR_SET(op_avx_check_sse3, yes))
-+           AC_CACHE_CHECK([for SSE3 support], op_avx_check_sse3, AS_VAR_SET(op_avx_check_sse3, yes))
-            AS_IF([test $op_avx_support -eq 1 && test "$op_avx_check_sse3" = "yes"],
-                  [AC_MSG_CHECKING([for SSE3 support])
-                   AC_LINK_IFELSE(
-@@ -224,8 +224,8 @@ AC_DEFUN([MCA_ompi_op_avx_CONFIG],[
-                          AC_LINK_IFELSE(
-                              [AC_LANG_PROGRAM([[#include <immintrin.h>]],
-                                    [[
--    __m128 vA, vB;
--    _mm_add_ps(vA, vB)
-+    __m256 vA, vB, vC;
-+    vC = _mm256_add_ps(vA, vB)
-                             ]])],
-                              [op_avx_support=1
-                               MCA_BUILD_OP_AVX_FLAGS="-mavx"
-diff --git ompi/mca/op/avx/op_avx_functions.c ompi/mca/op/avx/op_avx_functions.c
-index c79a8b34506..575ebf95d6a 100644
---- ompi/mca/op/avx/op_avx_functions.c
-+++ ompi/mca/op/avx/op_avx_functions.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2019-2020 The University of Tennessee and The University
-+ * Copyright (c) 2019-2021 The University of Tennessee and The University
-  *                         of Tennessee Research Foundation.  All rights
-  *                         reserved.
-  * Copyright (c) 2020      Research Organization for Information Science
-@@ -24,16 +24,42 @@
- #include "ompi/mca/op/avx/op_avx.h"
- 
- #include <immintrin.h>
--
-+/**
-+ * The following logic is necessary to cope with distro maintainer's desire to change the compilation
-+ * flags after the configure step, leading to inconsistencies between what OMPI has detected and what
-+ * code can be generated during make. If we detect that the current code generation architecture has
-+ * been changed from our own setting and cannot generate the code we need (AVX512, AVX2) we fall back
-+ * to a lesser support (AVX512 -> AVX2, AVX2 -> AVX, AVX -> error out).
-+ */
- #if defined(GENERATE_AVX512_CODE)
--#define PREPEND _avx512
--#elif defined(GENERATE_AVX2_CODE)
--#define PREPEND _avx2
--#elif defined(GENERATE_AVX_CODE)
--#define PREPEND _avx
--#else
--#error This file should not be compiled in this conditions
--#endif
-+#  if defined(__AVX512BW__) && defined(__AVX512F__) && defined(__AVX512VL__)
-+#    define PREPEND _avx512
-+#  else
-+#    undef GENERATE_AVX512_CODE
-+#  endif  /* defined(__AVX512BW__) && defined(__AVX512F__) && defined(__AVX512VL__) */
-+#endif  /* defined(GENERATE_AVX512_CODE) */
-+
-+#if !defined(PREPEND) && defined(GENERATE_AVX2_CODE)
-+#  if defined(__AVX2__)
-+#    define PREPEND _avx2
-+#  else
-+#    undef GENERATE_AVX2_CODE
-+#  endif  /* defined(__AVX2__) */
-+#endif  /* !defined(PREPEND) && defined(GENERATE_AVX2_CODE) */
-+
-+#if !defined(PREPEND) && defined(GENERATE_AVX_CODE)
-+#  if defined(__AVX__)
-+#    define PREPEND _avx
-+#  endif
-+#endif  /* !defined(PREPEND) && defined(GENERATE_AVX_CODE) */
-+
-+#if !defined(PREPEND)
-+#  if OMPI_MCA_OP_HAVE_AVX512 || OMPI_MCA_OP_HAVE_AVX2
-+#    error The configure step has detected possible support for AVX512 and/or AVX2 but the compiler flags during make are too restrictive. Please disable the AVX component by adding --enable-mca-no-build=op-avx to your configure step.
-+#  else
-+#    error This file should not be compiled in this conditions. Please provide the config.log file to the OMPI developers.
-+#  endif  /* OMPI_MCA_OP_HAVE_AVX512 || OMPI_MCA_OP_HAVE_AVX2 */
-+#endif  /* !defined(PREPEND) */
- 
- /*
-  * Concatenate preprocessor tokens A and B without expanding macro definitions
-@@ -46,6 +72,102 @@
-  */
- #define OP_CONCAT(A, B) OP_CONCAT_NX(A, B)
- 
-+/*
-+ * grep -e "_mm[125][251][862]_.*(" avx512.c -o | sed 's/(//g' | sort | uniq
-+ *
-+ * https://software.intel.com/sites/landingpage/IntrinsicsGuide
-+ *
-+ * _mm_add_epi[8,16,32,64]         SSE2
-+ * _mm_add_pd                      SSE2
-+ * _mm_add_ps                      SSE
-+ * _mm_adds_epi[8,16]              SSE2
-+ * _mm_adds_epu[8,16]              SSE2
-+ * _mm_and_si128                   SSE2
-+ * _mm_lddqu_si128                 SSE3
-+ * _mm_loadu_pd                    SSE2
-+ * _mm_loadu_ps                    SSE
-+ * _mm_max_epi8                    SSE4.1
-+ * _mm_max_epi16                   SSE2
-+ * _mm_max_epi32                   SSE4.1
-+ * _mm_max_epi64                   AVX512VL + AVX512F
-+ * _mm_max_epu8                    SSE2
-+ * _mm_max_epu[16,32]              SSE4.1
-+ * _mm_max_epu64                   AVX512VL + AVX512F
-+ * _mm_max_pd                      SSE2
-+ * _mm_max_ps                      SSE
-+ * _mm_min_epi8                    SSE4.1
-+ * _mm_min_epi16                   SSE2
-+ * _mm_min_epi32                   SSE4.1
-+ * _mm_min_epi64                   AVX512VL + AVX512F
-+ * _mm_min_epu8                    SSE2
-+ * _mm_min_epu[16,32]              SSE4.1
-+ * _mm_min_epu64                   AVX512VL + AVX512F
-+ * _mm_min_pd                      SSE2
-+ * _mm_min_ps                      SSE
-+ * _mm_mul_pd                      SSE2
-+ * _mm_mul_ps                      SSE
-+ * _mm_mullo_epi16                 SSE2
-+ * _mm_mullo_epi32                 SSE4.1
-+ * _mm_mullo_epi64                 AVX512VL + AVX512DQ
-+ * _mm_or_si128                    SSE2
-+ * _mm_storeu_pd                   SSE2
-+ * _mm_storeu_ps                   SSE
-+ * _mm_storeu_si128                SSE2
-+ * _mm_xor_si128                   SSE2
-+ * _mm256_add_epi[8,16,32,64]      AVX2
-+ * _mm256_add_p[s,d]               AVX
-+ * _mm256_adds_epi[8,16]           AVX2
-+ * _mm256_adds_epu[8,16]           AVX2
-+ * _mm256_and_si256                AVX2
-+ * _mm256_loadu_p[s,d]             AVX
-+ * _mm256_loadu_si256              AVX
-+ * _mm256_max_epi[8,16,32]         AVX2
-+ * _mm256_max_epi64                AVX512VL + AVX512F
-+ * _mm256_max_epu[8,16,32]         AVX2
-+ * _mm256_max_epu64                AVX512VL + AVX512F
-+ * _mm256_max_p[s,d]               AVX
-+ * _mm256_min_epi[8,16,32]         AVX2
-+ * _mm256_min_epi64                AVX512VL + AVX512F
-+ * _mm256_min_epu[8,16,32]         AVX2
-+ * _mm256_min_epu64                AVX512VL + AVX512F
-+ * _mm256_min_p[s,d]               AVX
-+ * _mm256_mul_p[s,d]               AVX
-+ * _mm256_mullo_epi[16,32]         AVX2
-+ * _mm256_mullo_epi64              AVX512VL + AVX512DQ
-+ * _mm256_or_si256                 AVX2
-+ * _mm256_storeu_p[s,d]            AVX
-+ * _mm256_storeu_si256             AVX
-+ * _mm256_xor_si256                AVX2
-+ * _mm512_add_epi[8,16]            AVX512BW
-+ * _mm512_add_epi[32,64]           AVX512F
-+ * _mm512_add_p[s,d]               AVX512F
-+ * _mm512_adds_epi[8,16]           AVX512BW
-+ * _mm512_adds_epu[8,16]           AVX512BW
-+ * _mm512_and_si512                AVX512F
-+ * _mm512_cvtepi16_epi8            AVX512BW
-+ * _mm512_cvtepi8_epi16            AVX512BW
-+ * _mm512_loadu_p[s,d]             AVX512F
-+ * _mm512_loadu_si512              AVX512F
-+ * _mm512_max_epi[8,16]            AVX512BW
-+ * _mm512_max_epi[32,64]           AVX512F
-+ * _mm512_max_epu[8,16]            AVX512BW
-+ * _mm512_max_epu[32,64]           AVX512F
-+ * _mm512_max_p[s,d]               AVX512F
-+ * _mm512_min_epi[8,16]            AVX512BW
-+ * _mm512_min_epi[32,64]           AVX512F
-+ * _mm512_min_epu[8,16]            AVX512BW
-+ * _mm512_min_epu[32,64]           AVX512F
-+ * _mm512_min_p[s,d]               AVX512F
-+ * _mm512_mul_p[s,d]               AVX512F
-+ * _mm512_mullo_epi16              AVX512BW
-+ * _mm512_mullo_epi32              AVX512F
-+ * _mm512_mullo_epi64              AVX512DQ
-+ * _mm512_or_si512                 AVX512F
-+ * _mm512_storeu_p[s,d]            AVX512F
-+ * _mm512_storeu_si512             AVX512F
-+ * _mm512_xor_si512                AVX512F
-+ */
-+
- /*
-  * Since all the functions in this file are essentially identical, we
-  * use a macro to substitute in names and types.  The core operation
-@@ -62,13 +184,14 @@
-   (((_flag) & mca_op_avx_component.flags) == (_flag))
- 
- #if defined(GENERATE_AVX512_CODE) && defined(OMPI_MCA_OP_HAVE_AVX512) && (1 == OMPI_MCA_OP_HAVE_AVX512)
-+#if __AVX512F__
- #define OP_AVX_AVX512_FUNC(name, type_sign, type_size, type, op)               \
-     if( OMPI_OP_AVX_HAS_FLAGS(OMPI_OP_AVX_HAS_AVX512F_FLAG|OMPI_OP_AVX_HAS_AVX512BW_FLAG) ) { \
-         int types_per_step = (512 / 8) / sizeof(type);                         \
-         for( ; left_over >= types_per_step; left_over -= types_per_step ) {    \
--            __m512i vecA =  _mm512_loadu_si512((__m512*)in);                   \
-+            __m512i vecA = _mm512_loadu_si512((__m512*)in);                    \
-             in += types_per_step;                                              \
--            __m512i vecB =  _mm512_loadu_si512((__m512*)out);                  \
-+            __m512i vecB = _mm512_loadu_si512((__m512*)out);                   \
-             __m512i res = _mm512_##op##_ep##type_sign##type_size(vecA, vecB);  \
-             _mm512_storeu_si512((__m512*)out, res);                            \
-             out += types_per_step;                                             \
-@@ -76,10 +199,14 @@
-         if( 0 == left_over ) return;                                           \
-     }
- #else
-+#error Target architecture lacks AVX512F support needed for _mm512_loadu_si512 and _mm512_storeu_si512
-+#endif  /* __AVX512F__ */
-+#else
- #define OP_AVX_AVX512_FUNC(name, type_sign, type_size, type, op) {}
- #endif  /* defined(OMPI_MCA_OP_HAVE_AVX512) && (1 == OMPI_MCA_OP_HAVE_AVX512) */
- 
- #if defined(GENERATE_AVX2_CODE) && defined(OMPI_MCA_OP_HAVE_AVX2) && (1 == OMPI_MCA_OP_HAVE_AVX2)
-+#if __AVX__
- #define OP_AVX_AVX2_FUNC(name, type_sign, type_size, type, op)                 \
-     if( OMPI_OP_AVX_HAS_FLAGS(OMPI_OP_AVX_HAS_AVX2_FLAG | OMPI_OP_AVX_HAS_AVX_FLAG) ) {  \
-         int types_per_step = (256 / 8) / sizeof(type);  /* AVX2 */             \
-@@ -87,30 +214,37 @@
-             __m256i vecA = _mm256_loadu_si256((__m256i*)in);                   \
-             in += types_per_step;                                              \
-             __m256i vecB = _mm256_loadu_si256((__m256i*)out);                  \
--            __m256i res =  _mm256_##op##_ep##type_sign##type_size(vecA, vecB); \
-+            __m256i res = _mm256_##op##_ep##type_sign##type_size(vecA, vecB);  \
-             _mm256_storeu_si256((__m256i*)out, res);                           \
-             out += types_per_step;                                             \
-         }                                                                      \
-         if( 0 == left_over ) return;                                           \
-     }
- #else
-+#error Target architecture lacks AVX support needed for _mm256_loadu_si256 and _mm256_storeu_si256
-+#endif  /* __AVX__ */
-+#else
- #define OP_AVX_AVX2_FUNC(name, type_sign, type_size, type, op) {}
- #endif  /* defined(OMPI_MCA_OP_HAVE_AVX2) && (1 == OMPI_MCA_OP_HAVE_AVX2) */
- 
- #if defined(GENERATE_SSE3_CODE) && defined(OMPI_MCA_OP_HAVE_AVX) && (1 == OMPI_MCA_OP_HAVE_AVX)
-+#if __SSE3__
- #define OP_AVX_SSE4_1_FUNC(name, type_sign, type_size, type, op)               \
-     if( OMPI_OP_AVX_HAS_FLAGS(OMPI_OP_AVX_HAS_SSE3_FLAG | OMPI_OP_AVX_HAS_SSE4_1_FLAG) ) { \
--        int types_per_step = (128 / 8) / sizeof(type);  /* AVX */              \
-+        int types_per_step = (128 / 8) / sizeof(type);                         \
-         for( ; left_over >= types_per_step; left_over -= types_per_step ) {    \
-             __m128i vecA = _mm_lddqu_si128((__m128i*)in);                      \
-             in += types_per_step;                                              \
-             __m128i vecB = _mm_lddqu_si128((__m128i*)out);                     \
--            __m128i res =  _mm_##op##_ep##type_sign##type_size(vecA, vecB);    \
-+            __m128i res = _mm_##op##_ep##type_sign##type_size(vecA, vecB);     \
-             _mm_storeu_si128((__m128i*)out, res);                              \
-             out += types_per_step;                                             \
-         }                                                                      \
-     }
- #else
-+#error Target architecture lacks SSE3 support needed for _mm_lddqu_si128 and _mm_storeu_si128
-+#endif  /* __SSE3__ */
-+#else
- #define OP_AVX_SSE4_1_FUNC(name, type_sign, type_size, type, op) {}
- #endif  /* defined(OMPI_MCA_OP_HAVE_AVX) && (1 == OMPI_MCA_OP_HAVE_AVX) */
- 
-@@ -143,12 +277,13 @@ static void OP_CONCAT(ompi_op_avx_2buff_##name##_##type,PREPEND)(const void *_in
- }
- 
- #if defined(GENERATE_AVX512_CODE) && defined(OMPI_MCA_OP_HAVE_AVX512) && (1 == OMPI_MCA_OP_HAVE_AVX512)
-+#if __AVX512BW__ && __AVX__
- #define OP_AVX_AVX512_MUL(name, type_sign, type_size, type, op)         \
-     if( OMPI_OP_AVX_HAS_FLAGS(OMPI_OP_AVX_HAS_AVX512F_FLAG | OMPI_OP_AVX_HAS_AVX512BW_FLAG) ) {  \
-         int types_per_step = (256 / 8) / sizeof(type);                  \
-         for (; left_over >= types_per_step; left_over -= types_per_step) { \
--            __m256i vecA_tmp =  _mm256_loadu_si256((__m256i*)in);       \
--            __m256i vecB_tmp =  _mm256_loadu_si256((__m256i*)out);      \
-+            __m256i vecA_tmp = _mm256_loadu_si256((__m256i*)in);        \
-+            __m256i vecB_tmp = _mm256_loadu_si256((__m256i*)out);       \
-             in += types_per_step;                                       \
-             __m512i vecA = _mm512_cvtepi8_epi16(vecA_tmp);              \
-             __m512i vecB = _mm512_cvtepi8_epi16(vecB_tmp);              \
-@@ -160,6 +295,9 @@ static void OP_CONCAT(ompi_op_avx_2buff_##name##_##type,PREPEND)(const void *_in
-         if( 0 == left_over ) return;                                    \
-     }
- #else
-+#error Target architecture lacks AVX512BW and AVX support needed for _mm256_loadu_si256, _mm256_storeu_si256 and _mm512_cvtepi8_epi16
-+#endif  /* __AVX512BW__ && __AVX__ */
-+#else
- #define OP_AVX_AVX512_MUL(name, type_sign, type_size, type, op) {}
- #endif  /* defined(OMPI_MCA_OP_HAVE_AVX512) && (1 == OMPI_MCA_OP_HAVE_AVX512) */
- /**
-@@ -201,13 +339,14 @@ static void OP_CONCAT( ompi_op_avx_2buff_##name##_##type, PREPEND)(const void *_
-  *
-  */
- #if defined(GENERATE_AVX512_CODE) && defined(OMPI_MCA_OP_HAVE_AVX512) && (1 == OMPI_MCA_OP_HAVE_AVX512)
-+#if __AVX512F__
- #define OP_AVX_AVX512_BIT_FUNC(name, type_size, type, op)               \
-     if( OMPI_OP_AVX_HAS_FLAGS( OMPI_OP_AVX_HAS_AVX512F_FLAG) ) {        \
-         types_per_step = (512 / 8) / sizeof(type);                      \
-         for (; left_over >= types_per_step; left_over -= types_per_step) { \
--            __m512i vecA =  _mm512_loadu_si512((__m512i*)in);           \
-+            __m512i vecA = _mm512_loadu_si512((__m512i*)in);            \
-             in += types_per_step;                                       \
--            __m512i vecB =  _mm512_loadu_si512((__m512i*)out);          \
-+            __m512i vecB = _mm512_loadu_si512((__m512i*)out);           \
-             __m512i res = _mm512_##op##_si512(vecA, vecB);              \
-             _mm512_storeu_si512((__m512i*)out, res);                    \
-             out += types_per_step;                                      \
-@@ -215,10 +354,14 @@ static void OP_CONCAT( ompi_op_avx_2buff_##name##_##type, PREPEND)(const void *_
-         if( 0 == left_over ) return;                                    \
-     }
- #else
-+#error Target architecture lacks AVX512F support needed for _mm512_loadu_si512 and _mm512_storeu_si512
-+#endif  /* __AVX512F__ */
-+#else
- #define OP_AVX_AVX512_BIT_FUNC(name, type_size, type, op) {}
- #endif  /* defined(OMPI_MCA_OP_HAVE_AVX512) && (1 == OMPI_MCA_OP_HAVE_AVX512) */
- 
- #if defined(GENERATE_AVX2_CODE) && defined(OMPI_MCA_OP_HAVE_AVX2) && (1 == OMPI_MCA_OP_HAVE_AVX2)
-+#if __AVX__
- #define OP_AVX_AVX2_BIT_FUNC(name, type_size, type, op)                 \
-     if( OMPI_OP_AVX_HAS_FLAGS(OMPI_OP_AVX_HAS_AVX2_FLAG | OMPI_OP_AVX_HAS_AVX_FLAG) ) { \
-         types_per_step = (256 / 8) / sizeof(type);                      \
-@@ -226,17 +369,21 @@ static void OP_CONCAT( ompi_op_avx_2buff_##name##_##type, PREPEND)(const void *_
-             __m256i vecA = _mm256_loadu_si256((__m256i*)in);            \
-             in += types_per_step;                                       \
-             __m256i vecB = _mm256_loadu_si256((__m256i*)out);           \
--            __m256i res =  _mm256_##op##_si256(vecA, vecB);             \
-+            __m256i res = _mm256_##op##_si256(vecA, vecB);              \
-             _mm256_storeu_si256((__m256i*)out, res);                    \
-             out += types_per_step;                                      \
-         }                                                               \
-         if( 0 == left_over ) return;                                    \
-     }
- #else
-+#error Target architecture lacks AVX support needed for _mm256_loadu_si256 and _mm256_storeu_si256
-+#endif  /* __AVX__ */
-+#else
- #define OP_AVX_AVX2_BIT_FUNC(name, type_size, type, op) {}
- #endif  /* defined(OMPI_MCA_OP_HAVE_AVX2) && (1 == OMPI_MCA_OP_HAVE_AVX2) */
- 
- #if defined(GENERATE_SSE3_CODE) && defined(OMPI_MCA_OP_HAVE_AVX) && (1 == OMPI_MCA_OP_HAVE_AVX)
-+#if __SSE3__ && __SSE2__
- #define OP_AVX_SSE3_BIT_FUNC(name, type_size, type, op)                 \
-     if( OMPI_OP_AVX_HAS_FLAGS(OMPI_OP_AVX_HAS_SSE3_FLAG) ) {            \
-         types_per_step = (128 / 8) / sizeof(type);                      \
-@@ -244,12 +391,15 @@ static void OP_CONCAT( ompi_op_avx_2buff_##name##_##type, PREPEND)(const void *_
-             __m128i vecA = _mm_lddqu_si128((__m128i*)in);               \
-             in += types_per_step;                                       \
-             __m128i vecB = _mm_lddqu_si128((__m128i*)out);              \
--            __m128i res =  _mm_##op##_si128(vecA, vecB);                \
-+            __m128i res = _mm_##op##_si128(vecA, vecB);                 \
-             _mm_storeu_si128((__m128i*)out, res);                       \
-             out += types_per_step;                                      \
-         }                                                               \
-     }
- #else
-+#error Target architecture lacks SSE2 and SSE3 support needed for _mm_lddqu_si128 and _mm_storeu_si128
-+#endif  /* __SSE3__ && __SSE2__ */
-+#else
- #define OP_AVX_SSE3_BIT_FUNC(name, type_size, type, op) {}
- #endif  /* defined(OMPI_MCA_OP_HAVE_AVX) && (1 == OMPI_MCA_OP_HAVE_AVX) */
- 
-@@ -282,12 +432,13 @@ static void OP_CONCAT(ompi_op_avx_2buff_##name##_##type,PREPEND)(const void *_in
- }
- 
- #if defined(GENERATE_AVX512_CODE) && defined(OMPI_MCA_OP_HAVE_AVX512) && (1 == OMPI_MCA_OP_HAVE_AVX512)
-+#if __AVX512F__
- #define OP_AVX_AVX512_FLOAT_FUNC(op)                                    \
-     if( OMPI_OP_AVX_HAS_FLAGS(OMPI_OP_AVX_HAS_AVX512F_FLAG) ) {         \
-         types_per_step = (512 / 8) / sizeof(float);                     \
-         for (; left_over >= types_per_step; left_over -= types_per_step) { \
--            __m512 vecA =  _mm512_loadu_ps((__m512*)in);                \
--            __m512 vecB =  _mm512_loadu_ps((__m512*)out);         \
-+            __m512 vecA = _mm512_loadu_ps((__m512*)in);                 \
-+            __m512 vecB = _mm512_loadu_ps((__m512*)out);                \
-             in += types_per_step;                                       \
-             __m512 res = _mm512_##op##_ps(vecA, vecB);                  \
-             _mm512_storeu_ps((__m512*)out, res);                        \
-@@ -296,28 +447,36 @@ static void OP_CONCAT(ompi_op_avx_2buff_##name##_##type,PREPEND)(const void *_in
-         if( 0 == left_over ) return;                                    \
-     }
- #else
-+#error Target architecture lacks AVX512F support needed for _mm512_loadu_ps and _mm512_storeu_ps
-+#endif  /* __AVX512F__ */
-+#else
- #define OP_AVX_AVX512_FLOAT_FUNC(op) {}
- #endif  /* defined(OMPI_MCA_OP_HAVE_AVX512) && (1 == OMPI_MCA_OP_HAVE_AVX512) */
- 
- #if defined(GENERATE_AVX2_CODE) && defined(OMPI_MCA_OP_HAVE_AVX2) && (1 == OMPI_MCA_OP_HAVE_AVX2)
-+#if __AVX__
- #define OP_AVX_AVX_FLOAT_FUNC(op)                                       \
-     if( OMPI_OP_AVX_HAS_FLAGS(OMPI_OP_AVX_HAS_AVX_FLAG) ) {             \
-         types_per_step = (256 / 8) / sizeof(float);                     \
-         for( ; left_over >= types_per_step; left_over -= types_per_step ) { \
--            __m256 vecA =  _mm256_loadu_ps(in);                          \
-+            __m256 vecA = _mm256_loadu_ps(in);                          \
-             in += types_per_step;                                       \
--            __m256 vecB =  _mm256_loadu_ps(out);                         \
-+            __m256 vecB = _mm256_loadu_ps(out);                         \
-             __m256 res = _mm256_##op##_ps(vecA, vecB);                  \
--            _mm256_storeu_ps(out, res);                                  \
-+            _mm256_storeu_ps(out, res);                                 \
-             out += types_per_step;                                      \
-         }                                                               \
-         if( 0 == left_over ) return;                                    \
-     }
- #else
-+#error Target architecture lacks AVX support needed for _mm256_loadu_ps and _mm256_storeu_ps
-+#endif  /* __AVX__ */
-+#else
- #define OP_AVX_AVX_FLOAT_FUNC(op) {}
- #endif  /* defined(OMPI_MCA_OP_HAVE_AVX2) && (1 == OMPI_MCA_OP_HAVE_AVX2) */
- 
- #if defined(GENERATE_AVX_CODE) && defined(OMPI_MCA_OP_HAVE_AVX) && (1 == OMPI_MCA_OP_HAVE_AVX)
-+#if __SSE__
- #define OP_AVX_SSE_FLOAT_FUNC(op)                                       \
-     if( OMPI_OP_AVX_HAS_FLAGS(OMPI_OP_AVX_HAS_SSE_FLAG) ) {             \
-         types_per_step = (128 / 8) / sizeof(float);                     \
-@@ -331,6 +490,9 @@ static void OP_CONCAT(ompi_op_avx_2buff_##name##_##type,PREPEND)(const void *_in
-         }                                                               \
-     }
- #else
-+#error Target architecture lacks SSE support needed for _mm_loadu_ps and _mm_storeu_ps
-+#endif  /* __SSE__ */
-+#else
- #define OP_AVX_SSE_FLOAT_FUNC(op) {}
- #endif  /* defined(OMPI_MCA_OP_HAVE_AVX) && (1 == OMPI_MCA_OP_HAVE_AVX) */
- 
-@@ -363,13 +525,14 @@ static void OP_CONCAT(ompi_op_avx_2buff_##op##_float,PREPEND)(const void *_in, v
- }
- 
- #if defined(GENERATE_AVX512_CODE) && defined(OMPI_MCA_OP_HAVE_AVX512) && (1 == OMPI_MCA_OP_HAVE_AVX512)
-+#if __AVX512F__
- #define OP_AVX_AVX512_DOUBLE_FUNC(op)                                   \
-     if( OMPI_OP_AVX_HAS_FLAGS(OMPI_OP_AVX_HAS_AVX512F_FLAG) ) {         \
-         types_per_step = (512 / 8)  / sizeof(double);                   \
-         for (; left_over >= types_per_step; left_over -= types_per_step) { \
--            __m512d vecA =  _mm512_loadu_pd(in);                        \
-+            __m512d vecA = _mm512_loadu_pd(in);                         \
-             in += types_per_step;                                       \
--            __m512d vecB =  _mm512_loadu_pd(out);                       \
-+            __m512d vecB = _mm512_loadu_pd(out);                        \
-             __m512d res = _mm512_##op##_pd(vecA, vecB);                 \
-             _mm512_storeu_pd((out), res);                               \
-             out += types_per_step;                                      \
-@@ -377,17 +540,21 @@ static void OP_CONCAT(ompi_op_avx_2buff_##op##_float,PREPEND)(const void *_in, v
-         if( 0 == left_over ) return;                                    \
-     }
- #else
-+#error Target architecture lacks AVXF512 support needed for _mm512_loadu_pd and _mm512_storeu_pd
-+#endif  /* __AVXF512__ */
-+#else
- #define OP_AVX_AVX512_DOUBLE_FUNC(op) {}
- #endif  /* defined(OMPI_MCA_OP_HAVE_AVX512) && (1 == OMPI_MCA_OP_HAVE_AVX512) */
- 
- #if defined(GENERATE_AVX2_CODE) && defined(OMPI_MCA_OP_HAVE_AVX2) && (1 == OMPI_MCA_OP_HAVE_AVX2)
-+#if __AVX__
- #define OP_AVX_AVX_DOUBLE_FUNC(op)                                      \
-     if( OMPI_OP_AVX_HAS_FLAGS(OMPI_OP_AVX_HAS_AVX_FLAG) ) {             \
-         types_per_step = (256 / 8)  / sizeof(double);                   \
-         for( ; left_over >= types_per_step; left_over -= types_per_step ) { \
--            __m256d vecA =  _mm256_loadu_pd(in);                        \
-+            __m256d vecA = _mm256_loadu_pd(in);                         \
-             in += types_per_step;                                       \
--            __m256d vecB =  _mm256_loadu_pd(out);                       \
-+            __m256d vecB = _mm256_loadu_pd(out);                        \
-             __m256d res = _mm256_##op##_pd(vecA, vecB);                 \
-             _mm256_storeu_pd(out, res);                                 \
-             out += types_per_step;                                      \
-@@ -395,10 +562,14 @@ static void OP_CONCAT(ompi_op_avx_2buff_##op##_float,PREPEND)(const void *_in, v
-         if( 0 == left_over ) return;                                    \
-       }
- #else
-+#error Target architecture lacks AVX support needed for _mm256_loadu_pd and _mm256_storeu_pd
-+#endif  /* __AVX__ */
-+#else
- #define OP_AVX_AVX_DOUBLE_FUNC(op) {}
- #endif  /* defined(OMPI_MCA_OP_HAVE_AVX2) && (1 == OMPI_MCA_OP_HAVE_AVX2) */
- 
- #if defined(GENERATE_AVX_CODE) && defined(OMPI_MCA_OP_HAVE_AVX) && (1 == OMPI_MCA_OP_HAVE_AVX)
-+#if __SSE2__
- #define OP_AVX_SSE2_DOUBLE_FUNC(op)                                     \
-     if( OMPI_OP_AVX_HAS_FLAGS(OMPI_OP_AVX_HAS_SSE2_FLAG) ) {            \
-         types_per_step = (128 / 8)  / sizeof(double);                   \
-@@ -412,6 +583,9 @@ static void OP_CONCAT(ompi_op_avx_2buff_##op##_float,PREPEND)(const void *_in, v
-         }                                                               \
-     }
- #else
-+#error Target architecture lacks SSE2 support needed for _mm_loadu_pd and _mm_storeu_pd
-+#endif  /* __SSE2__ */
-+#else
- #define OP_AVX_SSE2_DOUBLE_FUNC(op) {}
- #endif  /* defined(OMPI_MCA_OP_HAVE_AVX) && (1 == OMPI_MCA_OP_HAVE_AVX) */
- 
-@@ -580,12 +754,13 @@ static void OP_CONCAT(ompi_op_avx_2buff_##op##_double,PREPEND)(const void *_in,
-  *  routines, needed for some optimizations.
-  */
- #if defined(GENERATE_AVX512_CODE) && defined(OMPI_MCA_OP_HAVE_AVX512) && (1 == OMPI_MCA_OP_HAVE_AVX512)
-+#if __AVX512F__
- #define OP_AVX_AVX512_FUNC_3(name, type_sign, type_size, type, op)      \
-     if( OMPI_OP_AVX_HAS_FLAGS(OMPI_OP_AVX_HAS_AVX512F_FLAG|OMPI_OP_AVX_HAS_AVX512BW_FLAG) ) {   \
-         int types_per_step = (512 / 8) / sizeof(type);                  \
-         for (; left_over >= types_per_step; left_over -= types_per_step) { \
--            __m512i vecA =  _mm512_loadu_si512(in1);                    \
--            __m512i vecB =  _mm512_loadu_si512(in2);                    \
-+            __m512i vecA = _mm512_loadu_si512(in1);                     \
-+            __m512i vecB = _mm512_loadu_si512(in2);                     \
-             in1 += types_per_step;                                      \
-             in2 += types_per_step;                                      \
-             __m512i res = _mm512_##op##_ep##type_sign##type_size(vecA, vecB); \
-@@ -595,10 +770,14 @@ static void OP_CONCAT(ompi_op_avx_2buff_##op##_double,PREPEND)(const void *_in,
-         if( 0 == left_over ) return;                                    \
-     }
- #else
-+#error Target architecture lacks AVX512F support needed for _mm512_loadu_si512 and _mm512_storeu_si512
-+#endif  /* __AVX512F__ */
-+#else
- #define OP_AVX_AVX512_FUNC_3(name, type_sign, type_size, type, op) {}
- #endif  /* defined(OMPI_MCA_OP_HAVE_AVX512) && (1 == OMPI_MCA_OP_HAVE_AVX512) */
- 
- #if defined(GENERATE_AVX2_CODE) && defined(OMPI_MCA_OP_HAVE_AVX2) && (1 == OMPI_MCA_OP_HAVE_AVX2)
-+#if __AVX__
- #define OP_AVX_AVX2_FUNC_3(name, type_sign, type_size, type, op)        \
-     if( OMPI_OP_AVX_HAS_FLAGS(OMPI_OP_AVX_HAS_AVX2_FLAG | OMPI_OP_AVX_HAS_AVX_FLAG) ) { \
-         int types_per_step = (256 / 8) / sizeof(type);                  \
-@@ -607,17 +786,21 @@ static void OP_CONCAT(ompi_op_avx_2buff_##op##_double,PREPEND)(const void *_in,
-             __m256i vecB = _mm256_loadu_si256((__m256i*)in2);           \
-             in1 += types_per_step;                                      \
-             in2 += types_per_step;                                      \
--            __m256i res =  _mm256_##op##_ep##type_sign##type_size(vecA, vecB); \
-+            __m256i res = _mm256_##op##_ep##type_sign##type_size(vecA, vecB); \
-             _mm256_storeu_si256((__m256i*)out, res);                    \
-             out += types_per_step;                                      \
-         }                                                               \
-         if( 0 == left_over ) return;                                    \
-     }
- #else
-+#error Target architecture lacks AVX support needed for _mm256_loadu_si256 and _mm256_storeu_si256
-+#endif  /* __AVX__ */
-+#else
- #define OP_AVX_AVX2_FUNC_3(name, type_sign, type_size, type, op) {}
- #endif  /* defined(OMPI_MCA_OP_HAVE_AVX2) && (1 == OMPI_MCA_OP_HAVE_AVX2) */
- 
- #if defined(GENERATE_SSE3_CODE) && defined(OMPI_MCA_OP_HAVE_SSE41) && (1 == OMPI_MCA_OP_HAVE_SSE41) && defined(OMPI_MCA_OP_HAVE_AVX) && (1 == OMPI_MCA_OP_HAVE_AVX)
-+#if __SSE3__ && __SSE2__
- #define OP_AVX_SSE4_1_FUNC_3(name, type_sign, type_size, type, op)      \
-     if( OMPI_OP_AVX_HAS_FLAGS(OMPI_OP_AVX_HAS_SSE3_FLAG | OMPI_OP_AVX_HAS_SSE4_1_FLAG) ) {       \
-         int types_per_step = (128 / 8) / sizeof(type);                  \
-@@ -626,12 +809,15 @@ static void OP_CONCAT(ompi_op_avx_2buff_##op##_double,PREPEND)(const void *_in,
-             __m128i vecB = _mm_lddqu_si128((__m128i*)in2);              \
-             in1 += types_per_step;                                      \
-             in2 += types_per_step;                                      \
--            __m128i res =  _mm_##op##_ep##type_sign##type_size(vecA, vecB); \
-+            __m128i res = _mm_##op##_ep##type_sign##type_size(vecA, vecB); \
-             _mm_storeu_si128((__m128i*)out, res);                       \
-             out += types_per_step;                                      \
-         }                                                               \
-     }
- #else
-+#error Target architecture lacks SSE2 and SSE3 support needed for _mm_lddqu_si128 and _mm_storeu_si128
-+#endif  /* __SSE3__ && __SSE2__ */
-+#else
- #define OP_AVX_SSE4_1_FUNC_3(name, type_sign, type_size, type, op) {}
- #endif  /* defined(OMPI_MCA_OP_HAVE_AVX) && (1 == OMPI_MCA_OP_HAVE_AVX) */
- 
-@@ -667,12 +853,13 @@ static void OP_CONCAT(ompi_op_avx_3buff_##name##_##type,PREPEND)(const void * re
- }
- 
- #if defined(GENERATE_AVX512_CODE) && defined(OMPI_MCA_OP_HAVE_AVX512) && (1 == OMPI_MCA_OP_HAVE_AVX512)
-+#if __AVX512BW__ && __AVX__
- #define OP_AVX_AVX512_MUL_3(name, type_sign, type_size, type, op)       \
-     if( OMPI_OP_AVX_HAS_FLAGS(OMPI_OP_AVX_HAS_AVX512F_FLAG | OMPI_OP_AVX_HAS_AVX512BW_FLAG) ) { \
-         int types_per_step = (256 / 8) / sizeof(type);                  \
-         for (; left_over >= types_per_step; left_over -= types_per_step) { \
--            __m256i vecA_tmp =  _mm256_loadu_si256((__m256i*)in1);      \
--            __m256i vecB_tmp =  _mm256_loadu_si256((__m256i*)in2);      \
-+            __m256i vecA_tmp = _mm256_loadu_si256((__m256i*)in1);       \
-+            __m256i vecB_tmp = _mm256_loadu_si256((__m256i*)in2);       \
-             in1 += types_per_step;                                      \
-             in2 += types_per_step;                                      \
-             __m512i vecA = _mm512_cvtepi8_epi16(vecA_tmp);              \
-@@ -685,6 +872,9 @@ static void OP_CONCAT(ompi_op_avx_3buff_##name##_##type,PREPEND)(const void * re
-         if( 0 == left_over ) return;                                    \
-   }
- #else
-+#error Target architecture lacks AVX512BW and AVX support needed for _mm256_loadu_si256, _mm256_storeu_si256 and _mm512_cvtepi8_epi16
-+#endif  /* __AVX512BW__ && __AVX__ */
-+#else
- #define OP_AVX_AVX512_MUL_3(name, type_sign, type_size, type, op) {}
- #endif  /* defined(OMPI_MCA_OP_HAVE_AVX512) && (1 == OMPI_MCA_OP_HAVE_AVX512) */
- /**
-@@ -723,12 +913,13 @@ static void OP_CONCAT(ompi_op_avx_3buff_##name##_##type,PREPEND)(const void * re
- }
- 
- #if defined(GENERATE_AVX512_CODE) && defined(OMPI_MCA_OP_HAVE_AVX512) && (1 == OMPI_MCA_OP_HAVE_AVX512)
-+#if __AVX512F__
- #define OP_AVX_AVX512_BIT_FUNC_3(name, type_size, type, op)             \
-     if( OMPI_OP_AVX_HAS_FLAGS(OMPI_OP_AVX_HAS_AVX512F_FLAG) ) {         \
-         types_per_step = (512 / 8) / sizeof(type);                      \
-         for (; left_over >= types_per_step; left_over -= types_per_step) {  \
--            __m512i vecA =  _mm512_loadu_si512(in1);                    \
--            __m512i vecB =  _mm512_loadu_si512(in2);                    \
-+            __m512i vecA = _mm512_loadu_si512(in1);                     \
-+            __m512i vecB = _mm512_loadu_si512(in2);                     \
-             in1 += types_per_step;                                      \
-             in2 += types_per_step;                                      \
-             __m512i res = _mm512_##op##_si512(vecA, vecB);              \
-@@ -738,10 +929,14 @@ static void OP_CONCAT(ompi_op_avx_3buff_##name##_##type,PREPEND)(const void * re
-         if( 0 == left_over ) return;                                    \
-     }
- #else
-+#error Target architecture lacks AVX512F support needed for _mm512_loadu_si512 and _mm512_storeu_si512
-+#endif  /* __AVX512F__ */
-+#else
- #define OP_AVX_AVX512_BIT_FUNC_3(name, type_size, type, op) {}
- #endif  /* defined(OMPI_MCA_OP_HAVE_AVX512) && (1 == OMPI_MCA_OP_HAVE_AVX512) */
- 
- #if defined(GENERATE_AVX2_CODE) && defined(OMPI_MCA_OP_HAVE_AVX2) && (1 == OMPI_MCA_OP_HAVE_AVX2)
-+#if __AVX__
- #define OP_AVX_AVX2_BIT_FUNC_3(name, type_size, type, op)               \
-     if( OMPI_OP_AVX_HAS_FLAGS(OMPI_OP_AVX_HAS_AVX2_FLAG | OMPI_OP_AVX_HAS_AVX_FLAG) ) { \
-         types_per_step = (256 / 8) / sizeof(type);                      \
-@@ -750,17 +945,21 @@ static void OP_CONCAT(ompi_op_avx_3buff_##name##_##type,PREPEND)(const void * re
-             __m256i vecB = _mm256_loadu_si256((__m256i*)in2);           \
-             in1 += types_per_step;                                      \
-             in2 += types_per_step;                                      \
--            __m256i res =  _mm256_##op##_si256(vecA, vecB);             \
-+            __m256i res = _mm256_##op##_si256(vecA, vecB);              \
-             _mm256_storeu_si256((__m256i*)out, res);                    \
-             out += types_per_step;                                      \
-         }                                                               \
-         if( 0 == left_over ) return;                                    \
-     }
- #else
-+#error Target architecture lacks AVX support needed for _mm256_loadu_si256 and _mm256_storeu_si256
-+#endif  /* __AVX__ */
-+#else
- #define OP_AVX_AVX2_BIT_FUNC_3(name, type_size, type, op) {}
- #endif  /* defined(OMPI_MCA_OP_HAVE_AVX2) && (1 == OMPI_MCA_OP_HAVE_AVX2) */
- 
- #if defined(GENERATE_SSE3_CODE) && defined(OMPI_MCA_OP_HAVE_AVX) && (1 == OMPI_MCA_OP_HAVE_AVX)
-+#if __SSE3__ && __SSE2__
- #define OP_AVX_SSE3_BIT_FUNC_3(name, type_size, type, op)               \
-     if( OMPI_OP_AVX_HAS_FLAGS(OMPI_OP_AVX_HAS_SSE3_FLAG) ) {            \
-         types_per_step = (128 / 8) / sizeof(type);                      \
-@@ -769,12 +968,15 @@ static void OP_CONCAT(ompi_op_avx_3buff_##name##_##type,PREPEND)(const void * re
-             __m128i vecB = _mm_lddqu_si128((__m128i*)in2);              \
-             in1 += types_per_step;                                      \
-             in2 += types_per_step;                                      \
--            __m128i res =  _mm_##op##_si128(vecA, vecB);                \
-+            __m128i res = _mm_##op##_si128(vecA, vecB);                 \
-             _mm_storeu_si128((__m128i*)out, res);                       \
-             out += types_per_step;                                      \
-         }                                                               \
-     }
- #else
-+#error Target architecture lacks SSE2 and SSE3 support needed for _mm_lddqu_si128 and _mm_storeu_si128
-+#endif  /* __SSE3__ && __SSE2__ */
-+#else
- #define OP_AVX_SSE3_BIT_FUNC_3(name, type_size, type, op) {}
- #endif  /* defined(OMPI_MCA_OP_HAVE_AVX) && (1 == OMPI_MCA_OP_HAVE_AVX) */
- 
-@@ -809,12 +1011,13 @@ static void OP_CONCAT(ompi_op_avx_3buff_##op##_##type,PREPEND)(const void *_in1,
- }
- 
- #if defined(GENERATE_AVX512_CODE) && defined(OMPI_MCA_OP_HAVE_AVX512) && (1 == OMPI_MCA_OP_HAVE_AVX512)
-+#if __AVX512F__
- #define OP_AVX_AVX512_FLOAT_FUNC_3(op)                                  \
-     if( OMPI_OP_AVX_HAS_FLAGS(OMPI_OP_AVX_HAS_AVX512F_FLAG) ) {         \
-         types_per_step = (512 / 8) / sizeof(float);                     \
-         for (; left_over >= types_per_step; left_over -= types_per_step) { \
--            __m512 vecA =  _mm512_loadu_ps(in1);                        \
--            __m512 vecB =  _mm512_loadu_ps(in2);                        \
-+            __m512 vecA = _mm512_loadu_ps(in1);                         \
-+            __m512 vecB = _mm512_loadu_ps(in2);                         \
-             in1 += types_per_step;                                      \
-             in2 += types_per_step;                                      \
-             __m512 res = _mm512_##op##_ps(vecA, vecB);                  \
-@@ -824,16 +1027,20 @@ static void OP_CONCAT(ompi_op_avx_3buff_##op##_##type,PREPEND)(const void *_in1,
-         if( 0 == left_over ) return;                                    \
-     }
- #else
-+#error Target architecture lacks AVX512F support needed for _mm512_loadu_ps and _mm512_storeu_ps
-+#endif  /* __AVX512F__ */
-+#else
- #define OP_AVX_AVX512_FLOAT_FUNC_3(op) {}
- #endif  /* defined(OMPI_MCA_OP_HAVE_AVX512) && (1 == OMPI_MCA_OP_HAVE_AVX512) */
- 
- #if defined(GENERATE_AVX2_CODE) && defined(OMPI_MCA_OP_HAVE_AVX2) && (1 == OMPI_MCA_OP_HAVE_AVX2)
-+#if __AVX__
- #define OP_AVX_AVX_FLOAT_FUNC_3(op)                                     \
-     if( OMPI_OP_AVX_HAS_FLAGS(OMPI_OP_AVX_HAS_AVX_FLAG) ) {             \
-         types_per_step = (256 / 8) / sizeof(float);                     \
-         for( ; left_over >= types_per_step; left_over -= types_per_step ) { \
--            __m256 vecA =  _mm256_loadu_ps(in1);                        \
--            __m256 vecB =  _mm256_loadu_ps(in2);                        \
-+            __m256 vecA = _mm256_loadu_ps(in1);                         \
-+            __m256 vecB = _mm256_loadu_ps(in2);                         \
-             in1 += types_per_step;                                      \
-             in2 += types_per_step;                                      \
-             __m256 res = _mm256_##op##_ps(vecA, vecB);                  \
-@@ -843,10 +1050,14 @@ static void OP_CONCAT(ompi_op_avx_3buff_##op##_##type,PREPEND)(const void *_in1,
-         if( 0 == left_over ) return;                                    \
-     }
- #else
-+#error Target architecture lacks AVX support needed for _mm256_loadu_ps and _mm256_storeu_ps
-+#endif  /* __AVX__ */
-+#else
- #define OP_AVX_AVX_FLOAT_FUNC_3(op) {}
- #endif  /* defined(OMPI_MCA_OP_HAVE_AVX2) && (1 == OMPI_MCA_OP_HAVE_AVX2) */
- 
- #if defined(GENERATE_AVX_CODE) && defined(OMPI_MCA_OP_HAVE_AVX) && (1 == OMPI_MCA_OP_HAVE_AVX)
-+#if __SSE__
- #define OP_AVX_SSE_FLOAT_FUNC_3(op)                  \
-     if( OMPI_OP_AVX_HAS_FLAGS(OMPI_OP_AVX_HAS_SSE_FLAG) ) {             \
-         types_per_step = (128 / 8) / sizeof(float);                     \
-@@ -861,6 +1072,9 @@ static void OP_CONCAT(ompi_op_avx_3buff_##op##_##type,PREPEND)(const void *_in1,
-         }                                                               \
-     }
- #else
-+#error Target architecture lacks SSE support needed for _mm_loadu_ps and _mm_storeu_ps
-+#endif  /* __SSE__ */
-+#else
- #define OP_AVX_SSE_FLOAT_FUNC_3(op) {}
- #endif  /* defined(OMPI_MCA_OP_HAVE_AVX) && (1 == OMPI_MCA_OP_HAVE_AVX) */
- 
-@@ -895,12 +1109,13 @@ static void OP_CONCAT(ompi_op_avx_3buff_##op##_float,PREPEND)(const void *_in1,
- }
- 
- #if defined(GENERATE_AVX512_CODE) && defined(OMPI_MCA_OP_HAVE_AVX512) && (1 == OMPI_MCA_OP_HAVE_AVX512)
-+#if __AVX512F__
- #define OP_AVX_AVX512_DOUBLE_FUNC_3(op)                                 \
-     if( OMPI_OP_AVX_HAS_FLAGS(OMPI_OP_AVX_HAS_AVX512F_FLAG) ) {         \
-         types_per_step = (512 / 8) / sizeof(double);                    \
-         for (; left_over >= types_per_step; left_over -= types_per_step) { \
--            __m512d vecA =  _mm512_loadu_pd((in1));                     \
--            __m512d vecB =  _mm512_loadu_pd((in2));                     \
-+            __m512d vecA = _mm512_loadu_pd((in1));                      \
-+            __m512d vecB = _mm512_loadu_pd((in2));                      \
-             in1 += types_per_step;                                      \
-             in2 += types_per_step;                                      \
-             __m512d res = _mm512_##op##_pd(vecA, vecB);                 \
-@@ -910,16 +1125,20 @@ static void OP_CONCAT(ompi_op_avx_3buff_##op##_float,PREPEND)(const void *_in1,
-         if( 0 == left_over ) return;                                    \
-     }
- #else
-+#error Target architecture lacks AVXF512 support needed for _mm512_loadu_pd and _mm512_storeu_pd
-+#endif  /* __AVXF512__ */
-+#else
- #define OP_AVX_AVX512_DOUBLE_FUNC_3(op) {}
- #endif  /* defined(OMPI_MCA_OP_HAVE_AVX512) && (1 == OMPI_MCA_OP_HAVE_AVX512) */
- 
- #if defined(GENERATE_AVX2_CODE) && defined(OMPI_MCA_OP_HAVE_AVX2) && (1 == OMPI_MCA_OP_HAVE_AVX2)
-+#if __AVX__
- #define OP_AVX_AVX_DOUBLE_FUNC_3(op)                                    \
-     if( OMPI_OP_AVX_HAS_FLAGS(OMPI_OP_AVX_HAS_AVX_FLAG) ) {             \
-         types_per_step = (256 / 8) / sizeof(double);                    \
-         for( ; left_over >= types_per_step; left_over -= types_per_step ) { \
--            __m256d vecA =  _mm256_loadu_pd(in1);                       \
--            __m256d vecB =  _mm256_loadu_pd(in2);                       \
-+            __m256d vecA = _mm256_loadu_pd(in1);                        \
-+            __m256d vecB = _mm256_loadu_pd(in2);                        \
-             in1 += types_per_step;                                      \
-             in2 += types_per_step;                                      \
-             __m256d res = _mm256_##op##_pd(vecA, vecB);                 \
-@@ -929,10 +1148,14 @@ static void OP_CONCAT(ompi_op_avx_3buff_##op##_float,PREPEND)(const void *_in1,
-         if( 0 == left_over ) return;                                    \
-     }
- #else
-+#error Target architecture lacks AVX support needed for _mm256_loadu_pd and _mm256_storeu_pd
-+#endif  /* __AVX__ */
-+#else
- #define OP_AVX_AVX_DOUBLE_FUNC_3(op) {}
- #endif  /* defined(OMPI_MCA_OP_HAVE_AVX2) && (1 == OMPI_MCA_OP_HAVE_AVX2) */
- 
- #if defined(GENERATE_AVX_CODE) && defined(OMPI_MCA_OP_HAVE_AVX) && (1 == OMPI_MCA_OP_HAVE_AVX)
-+#if __SSE2__
- #define OP_AVX_SSE2_DOUBLE_FUNC_3(op)                                   \
-     if( OMPI_OP_AVX_HAS_FLAGS(OMPI_OP_AVX_HAS_SSE2_FLAG) ) {            \
-         types_per_step = (128 / 8) / sizeof(double);                    \
-@@ -947,6 +1170,9 @@ static void OP_CONCAT(ompi_op_avx_3buff_##op##_float,PREPEND)(const void *_in1,
-         }                                                               \
-     }
- #else
-+#error Target architecture lacks SSE2 support needed for _mm_loadu_pd and _mm_storeu_pd
-+#endif  /* __SSE2__ */
-+#else
- #define OP_AVX_SSE2_DOUBLE_FUNC_3(op) {}
- #endif  /* defined(OMPI_MCA_OP_HAVE_AVX) && (1 == OMPI_MCA_OP_HAVE_AVX) */
- 
-
-From ac6f658a4127bbfd916f26946330d9906dcbae54 Mon Sep 17 00:00:00 2001
-From: George Bosilca <bosilca@icl.utk.edu>
-Date: Tue, 5 Jan 2021 22:40:26 -0500
-Subject: [PATCH 3/3] A better test for MPI_OP performance.
-
-The test now has the ability to add a shift to all or to any of the
-input and output buffers to assess the impact of unaligned operations.
-
-Signed-off-by: George Bosilca <bosilca@icl.utk.edu>
----
- test/datatype/reduce_local.c | 161 ++++++++++++++++++++++-------------
- 1 file changed, 104 insertions(+), 57 deletions(-)
-
-diff --git test/datatype/reduce_local.c test/datatype/reduce_local.c
-index 97890f94227..f227439b714 100644
---- test/datatype/reduce_local.c
-+++ test/datatype/reduce_local.c
-@@ -59,7 +59,7 @@ static int total_errors = 0;
-      _a < _b ? _a : _b; })
- 
- static void print_status(char* op, char* type, int type_size,
--                         int count, double duration,
-+                         int count, int max_shift, double *duration, int repeats,
-                          int correct )
- {
-     if(correct) {
-@@ -68,7 +68,15 @@ static void print_status(char* op, char* type, int type_size,
-         printf("%-10s %s [\033[1;31mfail\033[0m]", op, type);
-         total_errors++;
-     }
--    printf(" count  %-10d  time %.6f seconds\n", count, duration);
-+    if( 1 == max_shift ) {
-+        printf(" count  %-10d  time (seconds) %.8f seconds\n", count, duration[0] / repeats);
-+    } else {
-+        printf(" count  %-10d  time (seconds / shifts) ", count);
-+        for( int i = 0; i < max_shift; i++ ) {
-+            printf("%.8f ", duration[i] / repeats );
-+        }
-+        printf("\n");
-+    }
- }
- 
- static int do_ops_built = 0;
-@@ -115,19 +123,23 @@ do { \
-     const TYPE *_p1 = ((TYPE*)(INBUF)), *_p3 = ((TYPE*)(CHECK_BUF)); \
-     TYPE *_p2 = ((TYPE*)(INOUT_BUF)); \
-     skip_op_type = 0; \
--    for(int _k = 0; _k < min((COUNT), 4); +_k++ ) { \
--        memcpy(_p2, _p3, sizeof(TYPE) * (COUNT)); \
--        tstart = MPI_Wtime(); \
--        MPI_Reduce_local(_p1+_k, _p2+_k, (COUNT)-_k, (MPITYPE), (MPIOP)); \
--        tend = MPI_Wtime(); \
--        if( check ) { \
--            for( i = 0; i < (COUNT)-_k; i++ ) { \
--                if(((_p2+_k)[i]) == (((_p1+_k)[i]) OPNAME ((_p3+_k)[i]))) \
--                    continue; \
--                printf("First error at alignment %d position %d (%" TYPE_PREFIX " %s %" TYPE_PREFIX " != %" TYPE_PREFIX ")\n", \
--                       _k, i, (_p1+_k)[i], (#OPNAME), (_p3+_k)[i], (_p2+_k)[i]); \
--                correctness = 0; \
--                break; \
-+    for(int _k = 0; _k < min((COUNT), max_shift); +_k++ ) { \
-+        duration[_k] = 0.0; \
-+        for(int _r = repeats; _r > 0; _r--) { \
-+            memcpy(_p2, _p3, sizeof(TYPE) * (COUNT)); \
-+            tstart = MPI_Wtime(); \
-+            MPI_Reduce_local(_p1+_k, _p2+_k, (COUNT)-_k, (MPITYPE), (MPIOP)); \
-+            tend = MPI_Wtime(); \
-+            duration[_k] += (tend - tstart); \
-+            if( check ) { \
-+                for( i = 0; i < (COUNT)-_k; i++ ) { \
-+                    if(((_p2+_k)[i]) == (((_p1+_k)[i]) OPNAME ((_p3+_k)[i]))) \
-+                        continue; \
-+                    printf("First error at alignment %d position %d (%" TYPE_PREFIX " %s %" TYPE_PREFIX " != %" TYPE_PREFIX ")\n", \
-+                           _k, i, (_p1+_k)[i], (#OPNAME), (_p3+_k)[i], (_p2+_k)[i]); \
-+                    correctness = 0; \
-+                    break; \
-+                } \
-             } \
-         } \
-     } \
-@@ -139,20 +151,24 @@ do { \
-     const TYPE *_p1 = ((TYPE*)(INBUF)), *_p3 = ((TYPE*)(CHECK_BUF)); \
-     TYPE *_p2 = ((TYPE*)(INOUT_BUF)); \
-     skip_op_type = 0; \
--    for(int _k = 0; _k < min((COUNT), 4); +_k++ ) { \
--        memcpy(_p2, _p3, sizeof(TYPE) * (COUNT)); \
--        tstart = MPI_Wtime(); \
--        MPI_Reduce_local(_p1+_k, _p2+_k, (COUNT), (MPITYPE), (MPIOP)); \
--        tend = MPI_Wtime(); \
--        if( check ) { \
--            for( i = 0; i < (COUNT); i++ ) { \
--                TYPE _v1 = *(_p1+_k), _v2 = *(_p2+_k), _v3 = *(_p3+_k); \
--                if(_v2 == OPNAME(_v1, _v3)) \
--                    continue; \
--                printf("First error at alignment %d position %d (%" TYPE_PREFIX " !=  %s(%" TYPE_PREFIX ", %" TYPE_PREFIX ")\n", \
--                       _k, i, _v1, (#OPNAME), _v3, _v2); \
--                correctness = 0; \
--                break; \
-+    for(int _k = 0; _k < min((COUNT), max_shift); +_k++ ) { \
-+        duration[_k] = 0.0; \
-+        for(int _r = repeats; _r > 0; _r--) { \
-+            memcpy(_p2, _p3, sizeof(TYPE) * (COUNT)); \
-+            tstart = MPI_Wtime(); \
-+            MPI_Reduce_local(_p1+_k, _p2+_k, (COUNT), (MPITYPE), (MPIOP)); \
-+            tend = MPI_Wtime(); \
-+            duration[_k] += (tend - tstart); \
-+            if( check ) { \
-+                for( i = 0; i < (COUNT); i++ ) { \
-+                    TYPE _v1 = *(_p1+_k), _v2 = *(_p2+_k), _v3 = *(_p3+_k); \
-+                    if(_v2 == OPNAME(_v1, _v3)) \
-+                        continue; \
-+                    printf("First error at alignment %d position %d (%" TYPE_PREFIX " !=  %s(%" TYPE_PREFIX ", %" TYPE_PREFIX ")\n", \
-+                           _k, i, _v1, (#OPNAME), _v3, _v2); \
-+                    correctness = 0; \
-+                    break; \
-+                } \
-             } \
-         } \
-     } \
-@@ -163,24 +179,36 @@ int main(int argc, char **argv)
- {
-     static void *in_buf = NULL, *inout_buf = NULL, *inout_check_buf = NULL;
-     int count, type_size = 8, rank, size, provided, correctness = 1;
--    int repeats = 1, i, c;
--    double tstart, tend;
-+    int repeats = 1, i, c, op1_alignment = 0, res_alignment = 0;
-+    int max_shift = 4;
-+    double *duration, tstart, tend;
-     bool check = true;
-     char type[5] = "uifd", *op = "sum", *mpi_type;
-     int lower = 1, upper = 1000000, skip_op_type;
-     MPI_Op mpi_op;
- 
--    while( -1 != (c = getopt(argc, argv, "l:u:t:o:s:n:vfh")) ) {
-+    while( -1 != (c = getopt(argc, argv, "l:u:r:t:o:i:s:n:1:2:vfh")) ) {
-         switch(c) {
-         case 'l':
-             lower = atoi(optarg);
-             if( lower <= 0 ) {
--                fprintf(stderr, "The number of elements must be positive\n");
-+                fprintf(stderr, "The lower number of elements must be positive\n");
-                 exit(-1);
-             }
-             break;
-         case 'u':
-             upper = atoi(optarg);
-+            if( lower <= 0 ) {
-+                fprintf(stderr, "The upper number of elements must be positive\n");
-+                exit(-1);
-+            }
-+            break;
-+        case 'i':
-+            max_shift = atoi(optarg);
-+            if( max_shift <= 0 ) {
-+                fprintf(stderr, "The max shift must be positive\n");
-+                exit(-1);
-+            }
-             break;
-         case 'f':
-             check = false;
-@@ -216,14 +244,32 @@ int main(int argc, char **argv)
-                 exit(-1);
-             }
-             break;
-+        case '1':
-+            op1_alignment = atoi(optarg);
-+            if( op1_alignment < 0 ) {
-+                fprintf(stderr, "alignment for the first operand must be positive\n");
-+                exit(-1);
-+            }
-+            break;
-+        case '2':
-+            res_alignment = atoi(optarg);
-+            if( res_alignment < 0 ) {
-+                fprintf(stderr, "alignment for the result must be positive\n");
-+                exit(-1);
-+            }
-+            break;
-         case 'h':
-             fprintf(stdout, "%s options are:\n"
-                     " -l <number> : lower number of elements\n"
-                     " -u <number> : upper number of elements\n"
-                     " -s <type_size> : 8, 16, 32 or 64 bits elements\n"
-                     " -t [i,u,f,d] : type of the elements to apply the operations on\n"
-+                    " -r <number> : number of repetitions for each test\n"
-                     " -o <op> : comma separated list of operations to execute among\n"
-                     "           sum, min, max, prod, bor, bxor, band\n"
-+                    " -i <number> : shift on all buffers to check alignment\n"
-+                    " -1 <number> : (mis)alignment in elements for the first op\n"
-+                    " -2 <number> : (mis)alignment in elements for the result\n"
-                     " -v: increase the verbosity level\n"
-                     " -h: this help message\n", argv[0]);
-             exit(0);
-@@ -233,9 +279,10 @@ int main(int argc, char **argv)
-     if( !do_ops_built ) {  /* not yet done, take the default */
-             build_do_ops( "all", do_ops);
-     }
--    in_buf          = malloc(upper * sizeof(double));
--    inout_buf       = malloc(upper * sizeof(double));
--    inout_check_buf = malloc(upper * sizeof(double));
-+    posix_memalign( &in_buf,          64, (upper + op1_alignment) * sizeof(double));
-+    posix_memalign( &inout_buf,       64, (upper + res_alignment) * sizeof(double));
-+    posix_memalign( &inout_check_buf, 64, upper * sizeof(double));
-+    duration = (double*)malloc(max_shift * sizeof(double));
- 
-     ompi_mpi_init(argc, argv, MPI_THREAD_SERIALIZED, &provided, false);
- 
-@@ -253,8 +300,8 @@ int main(int argc, char **argv)
-                 correctness = 1;
-                 if('i' == type[type_idx]) {
-                     if( 8 == type_size ) {
--                        int8_t *in_int8 = (int8_t*)in_buf,
--                            *inout_int8 = (int8_t*)inout_buf,
-+                        int8_t *in_int8 = (int8_t*)((char*)in_buf + op1_alignment * sizeof(int8_t)),
-+                            *inout_int8 = (int8_t*)((char*)inout_buf + res_alignment * sizeof(int8_t)),
-                             *inout_int8_for_check = (int8_t*)inout_check_buf;
-                         for( i = 0; i < count; i++ ) {
-                             in_int8[i] = 5;
-@@ -299,8 +346,8 @@ int main(int argc, char **argv)
-                         }
-                     }
-                     if( 16 == type_size ) {
--                        int16_t *in_int16 = (int16_t*)in_buf,
--                            *inout_int16 = (int16_t*)inout_buf,
-+                        int16_t *in_int16 = (int16_t*)((char*)in_buf + op1_alignment * sizeof(int16_t)),
-+                            *inout_int16 = (int16_t*)((char*)inout_buf + res_alignment * sizeof(int16_t)),
-                             *inout_int16_for_check = (int16_t*)inout_check_buf;
-                         for( i = 0; i < count; i++ ) {
-                             in_int16[i] = 5;
-@@ -345,8 +392,8 @@ int main(int argc, char **argv)
-                         }
-                     }
-                     if( 32 == type_size ) {
--                        int32_t *in_int32 = (int32_t*)in_buf,
--                            *inout_int32 = (int32_t*)inout_buf,
-+                        int32_t *in_int32 = (int32_t*)((char*)in_buf + op1_alignment * sizeof(int32_t)),
-+                            *inout_int32 = (int32_t*)((char*)inout_buf + res_alignment * sizeof(int32_t)),
-                             *inout_int32_for_check = (int32_t*)inout_check_buf;
-                         for( i = 0; i < count; i++ ) {
-                             in_int32[i] = 5;
-@@ -391,8 +438,8 @@ int main(int argc, char **argv)
-                         }
-                     }
-                     if( 64 == type_size ) {
--                        int64_t *in_int64 = (int64_t*)in_buf,
--                            *inout_int64 = (int64_t*)inout_buf,
-+                        int64_t *in_int64 = (int64_t*)((char*)in_buf + op1_alignment * sizeof(int64_t)),
-+                            *inout_int64 = (int64_t*)((char*)inout_buf + res_alignment * sizeof(int64_t)),
-                             *inout_int64_for_check = (int64_t*)inout_check_buf;
-                         for( i = 0; i < count; i++ ) {
-                             in_int64[i] = 5;
-@@ -440,8 +487,8 @@ int main(int argc, char **argv)
- 
-                 if( 'u' == type[type_idx] ) {
-                     if( 8 == type_size ) {
--                        uint8_t *in_uint8 = (uint8_t*)in_buf,
--                            *inout_uint8 = (uint8_t*)inout_buf,
-+                        uint8_t *in_uint8 = (uint8_t*)((char*)in_buf + op1_alignment * sizeof(uint8_t)),
-+                            *inout_uint8 = (uint8_t*)((char*)inout_buf + res_alignment * sizeof(uint8_t)),
-                             *inout_uint8_for_check = (uint8_t*)inout_check_buf;
-                         for( i = 0; i < count; i++ ) {
-                             in_uint8[i] = 5;
-@@ -486,8 +533,8 @@ int main(int argc, char **argv)
-                         }
-                     }
-                     if( 16 == type_size ) {
--                        uint16_t *in_uint16 = (uint16_t*)in_buf,
--                            *inout_uint16 = (uint16_t*)inout_buf,
-+                        uint16_t *in_uint16 = (uint16_t*)((char*)in_buf + op1_alignment * sizeof(uint16_t)),
-+                            *inout_uint16 = (uint16_t*)((char*)inout_buf + res_alignment * sizeof(uint16_t)),
-                             *inout_uint16_for_check = (uint16_t*)inout_check_buf;
-                         for( i = 0; i < count; i++ ) {
-                             in_uint16[i] = 5;
-@@ -532,8 +579,8 @@ int main(int argc, char **argv)
-                         }
-                     }
-                     if( 32 == type_size ) {
--                        uint32_t *in_uint32 = (uint32_t*)in_buf,
--                            *inout_uint32 = (uint32_t*)inout_buf,
-+                        uint32_t *in_uint32 = (uint32_t*)((char*)in_buf + op1_alignment * sizeof(uint32_t)),
-+                            *inout_uint32 = (uint32_t*)((char*)inout_buf + res_alignment * sizeof(uint32_t)),
-                             *inout_uint32_for_check = (uint32_t*)inout_check_buf;
-                         for( i = 0; i < count; i++ ) {
-                             in_uint32[i] = 5;
-@@ -578,8 +625,8 @@ int main(int argc, char **argv)
-                         }
-                     }
-                     if( 64 == type_size ) {
--                        uint64_t *in_uint64 = (uint64_t*)in_buf,
--                              *inout_uint64 = (uint64_t*)inout_buf,
-+                        uint64_t *in_uint64 = (uint64_t*)((char*)in_buf + op1_alignment * sizeof(uint64_t)),
-+                              *inout_uint64 = (uint64_t*)((char*)inout_buf + res_alignment * sizeof(uint64_t)),
-                             *inout_uint64_for_check = (uint64_t*)inout_check_buf;
-                         for( i = 0; i < count; i++ ) {
-                             in_uint64[i] = 5;
-@@ -626,8 +673,8 @@ int main(int argc, char **argv)
-                 }
- 
-                 if( 'f' == type[type_idx] ) {
--                    float *in_float = (float*)in_buf,
--                        *inout_float = (float*)inout_buf,
-+                    float *in_float = (float*)((char*)in_buf + op1_alignment * sizeof(float)),
-+                        *inout_float = (float*)((char*)inout_buf + res_alignment * sizeof(float)),
-                         *inout_float_for_check = (float*)inout_check_buf;
-                     for( i = 0; i < count; i++ ) {
-                         in_float[i] = 1000.0+1;
-@@ -658,8 +705,8 @@ int main(int argc, char **argv)
-                 }
- 
-                 if( 'd' == type[type_idx] ) {
--                    double *in_double = (double*)in_buf,
--                        *inout_double = (double*)inout_buf,
-+                    double *in_double = (double*)((char*)in_buf + op1_alignment * sizeof(double)),
-+                        *inout_double = (double*)((char*)inout_buf + res_alignment * sizeof(double)),
-                         *inout_double_for_check = (double*)inout_check_buf;
-                     for( i = 0; i < count; i++ ) {
-                         in_double[i] = 10.0+1;
-@@ -691,7 +738,7 @@ int main(int argc, char **argv)
-         check_and_continue:
-                 if( !skip_op_type )
-                     print_status(array_of_ops[do_ops[op_idx]].mpi_op_name,
--                                 mpi_type, type_size, count, tend-tstart, correctness);
-+                                 mpi_type, type_size, count, max_shift, duration, repeats, correctness);
-             }
-             if( !skip_op_type )
-                 printf("\n");
diff --git a/srcpkgs/openmpi/patches/drop-orted-mpir.patch b/srcpkgs/openmpi/patches/drop-orted-mpir.patch
new file mode 100644
index 000000000000..a50c9ec97ab6
--- /dev/null
+++ b/srcpkgs/openmpi/patches/drop-orted-mpir.patch
@@ -0,0 +1,19 @@
+orted-mpir is a helper that avoids CFLAGS which can optimize out certain MPIR
+debugging functionality. It is unversioned, leaks dependencies into other MPI
+modules and libraries, and upstream agrees it shouldn't be installed.
+
+https://github.com/open-mpi/ompi/pull/8892
+
+diff --git orte/orted/orted-mpir/Makefile.am orte/orted/orted-mpir/Makefile.am
+index 5c0dd33564..8a03fcd387 100644
+--- orte/orted/orted-mpir/Makefile.am
++++ orte/orted/orted-mpir/Makefile.am
+@@ -15,7 +15,7 @@
+ 
+ CFLAGS = $(CFLAGS_WITHOUT_OPTFLAGS) $(DEBUGGER_CFLAGS)
+ 
+-lib_LTLIBRARIES = lib@ORTE_LIB_PREFIX@open-orted-mpir.la
++noinst_LTLIBRARIES = lib@ORTE_LIB_PREFIX@open-orted-mpir.la
+ lib@ORTE_LIB_PREFIX@open_orted_mpir_la_SOURCES = \
+         orted_mpir_breakpoint.c \
+         orted_mpir.h
diff --git a/srcpkgs/openmpi/template b/srcpkgs/openmpi/template
index 696765fbd403..ce8585fa6835 100644
--- a/srcpkgs/openmpi/template
+++ b/srcpkgs/openmpi/template
@@ -1,7 +1,7 @@
 # Template file for 'openmpi'
 pkgname=openmpi
-version=4.1.0
-revision=3
+version=4.1.1
+revision=1
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-hwloc=${XBPS_CROSS_BASE}/usr
  --libdir=\${prefix}/lib${XBPS_TARGET_WORDSIZE}"
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://www.open-mpi.org/"
 distfiles="${homepage}/software/ompi/v${version%.*}/downloads/${pkgname}-${version}.tar.bz2"
-checksum=73866fb77090819b6a8c85cb8539638d37d6877455825b74e289d647a39fd5b5
+checksum=e24f7a778bd11a71ad0c14587a7f5b00e68a71aa5623e2157bafee3d44c07cda
 nocross="configure attempts to run target binaries"
 lib32disabled=yes
 

From 46ee58281a8890f35b0d644ee479be624a763c3d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 30 Apr 2021 16:00:10 -0400
Subject: [PATCH 1891/2024] python3-breathe: update to 4.29.2.

---
 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 59f8adea7ccb..d9685e4a0cda 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.29.1
+version=4.29.2
 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=72cf9ade88f3e9163e0730e4089fde7b92464f691d29250019983457a977df44
+checksum=e71dfb5dd1176b91bb27d26b7c210d8bd0be5e1f31f10e22ab8d38412a74b52e
 
 post_install() {
 	vlicense LICENSE

From 9e5bcb5b7a982d5d1e78a4cbfe0a001deeddca75 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 30 Apr 2021 16:00:27 -0400
Subject: [PATCH 1892/2024] python3-pip: update to 21.1.1.

---
 srcpkgs/python3-pip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pip/template b/srcpkgs/python3-pip/template
index 0e885d68f040..a8fc5408eb11 100644
--- a/srcpkgs/python3-pip/template
+++ b/srcpkgs/python3-pip/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pip'
 pkgname=python3-pip
-version=21.1
+version=21.1.1
 revision=1
 wrksrc="pip-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pip.pypa.io/"
 changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
 distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
-checksum=a810bf07c3723a28621c29abe8e34429fa082c337f89aea9a795865416b66d3e
+checksum=51ad01ddcd8de923533b01a870e7b987c2eb4d83b50b89e1bf102723ff9fed8b
 # Tests have unpackaged dependencies
 make_check=no
 

From 5fa1bcb6634238685d9d03db1b60800edbf730e6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 30 Apr 2021 16:10:44 -0400
Subject: [PATCH 1893/2024] python3-virtualenv: update to 20.4.4.

---
 srcpkgs/python3-virtualenv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-virtualenv/template b/srcpkgs/python3-virtualenv/template
index 44a63a2f74e3..65a094f1d0a1 100644
--- a/srcpkgs/python3-virtualenv/template
+++ b/srcpkgs/python3-virtualenv/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-virtualenv'
 pkgname=python3-virtualenv
-version=20.4.2
+version=20.4.4
 revision=1
 wrksrc="virtualenv-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://virtualenv.pypa.io/"
 changelog="https://virtualenv.pypa.io/en/latest/changelog.html"
 distfiles="${PYPI_SITE}/v/virtualenv/virtualenv-${version}.tar.gz"
-checksum=147b43894e51dd6bba882cf9c282447f780e2251cd35172403745fc381a0a80d
+checksum=09c61377ef072f43568207dc8e46ddeac6bcdcaf288d49011bda0e7f4d38c4a2
 alternatives="virtualenv:virtualenv:/usr/bin/virtualenv3"
 
 do_check() {

From 45bf34de895847cfe4e1c2892743137f361ce651 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 30 Apr 2021 16:13:49 -0400
Subject: [PATCH 1894/2024] python-urllib3: update to 1.26.4.

---
 srcpkgs/python-urllib3/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python-urllib3/template b/srcpkgs/python-urllib3/template
index 4888a2760953..430c93c8e557 100644
--- a/srcpkgs/python-urllib3/template
+++ b/srcpkgs/python-urllib3/template
@@ -1,17 +1,20 @@
 # Template file for 'python-urllib3'
 pkgname=python-urllib3
-version=1.26.3
+version=1.26.4
 revision=1
 wrksrc="urllib3-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python-six"
+checkdepends="python-pytest python3-pytest python-six python3-six"
 short_desc="HTTP library with thread-safe connection pooling (Python2)"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="MIT"
 homepage="https://urllib3.readthedocs.io/"
 distfiles="${PYPI_SITE}/u/urllib3/urllib3-${version}.tar.gz"
-checksum=de3eedaad74a2683334e282005cd8d7f22f4d55fa690a2a1020a416cb0a47e73
+checksum=e7b021f7241115872f92f43c6508082facffbd1c048e3c6e2bb9c2a157e28937
+# Checks depend on unpackaged "trustme"
+make_check=no
 
 post_install() {
 	for sitelib in ${py3_sitelib} ${py2_sitelib}; do

From 20102f2a3fca6477c00c014e0fecac74e9c4594a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 30 Apr 2021 16:16:38 -0400
Subject: [PATCH 1895/2024] python-lxml: update to 4.6.3.

---
 srcpkgs/python-lxml/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python-lxml/template b/srcpkgs/python-lxml/template
index eec5e36d0bf3..8095f7c7e40f 100644
--- a/srcpkgs/python-lxml/template
+++ b/srcpkgs/python-lxml/template
@@ -1,6 +1,6 @@
 # Template file for 'python-lxml'
 pkgname=python-lxml
-version=4.6.2
+version=4.6.3
 revision=1
 wrksrc="lxml-lxml-${version}"
 build_style=python-module
@@ -13,7 +13,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="BSD-3-Clause, custom:ElementTree"
 homepage="https://lxml.de/"
 distfiles="https://github.com/lxml/lxml/archive/lxml-${version}.tar.gz"
-checksum=31eff968b5fb7f0dc6f2dedff071f179c17df5ada2c3fd613f79a5f14a94490a
+checksum=5955ed615b7be9407d9eab83edde8f1818c94224d762d1d6355bf0371f220bd6
 
 do_check() {
 	cp -f build-3.*/lib.linux-*/lxml/*.so src/lxml

From 02d8d09ab9c95e3a1b828efbd88f126bdff69bd1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 30 Apr 2021 16:21:02 -0400
Subject: [PATCH 1896/2024] khal: update to 0.10.3.

---
 srcpkgs/khal/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/khal/template b/srcpkgs/khal/template
index 361776c7bfb5..00e615ba7c78 100644
--- a/srcpkgs/khal/template
+++ b/srcpkgs/khal/template
@@ -1,18 +1,19 @@
 # Template file for 'khal'
 pkgname=khal
-version=0.10.2
-revision=2
+version=0.10.3
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-click python3-click-log python3-configobj
  python3-dateutil python3-icalendar python3-pytz python3-tzlocal
  python3-urwid python3-xdg python3-atomicwrites"
+checkdepends="python3-pytest python3-freezegun vdirsyncer $depends"
 short_desc="Command-line calendar build around CalDAV"
 maintainer="Anachron <gith@cron.world>"
 license="MIT"
 homepage="http://lostpackets.de/khal/"
 distfiles="${PYPI_SITE}/k/khal/khal-${version}.tar.gz"
-checksum=494f215c3d1cb7a1f8d756b440809d255bd20e2937f98bd0b5d44e42d4cb1087
+checksum=2fdd8fc14fe597e5a7d6e9c63c7868d960b4ed021b563c684a71f07090eda432
 
 pre_build() {
 	vsed -i setup.py \

From cdafb8a3eeae32dd098f4cf0b19b67491c593362 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 30 Apr 2021 16:23:01 -0400
Subject: [PATCH 1897/2024] python3-josepy: update to 1.8.0.

---
 srcpkgs/python3-josepy/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-josepy/template b/srcpkgs/python3-josepy/template
index dc4c6602ac97..048606e2d7c7 100644
--- a/srcpkgs/python3-josepy/template
+++ b/srcpkgs/python3-josepy/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-josepy'
 pkgname=python3-josepy
-version=1.7.0
+version=1.8.0
 revision=1
 wrksrc="josepy-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-cryptography python3-openssl python3-setuptools python3-six"
-checkdepends="python3-pytest python3-mock $depends"
+checkdepends="python3-pytest-flake8 python3-mock $depends"
 short_desc="JOSE protocol implementation in Python3"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/certbot/josepy"
 distfiles="${PYPI_SITE}/j/josepy/josepy-${version}.tar.gz"
-checksum=d265414fa16d7a8b7a1d1833b4ebb19a22bd0deae5d44413cf9040fd8491d85a
+checksum=a5a182eb499665d99e7ec54bb3fe389f9cbc483d429c9651f20384ba29564269
 
 pre_check() {
 	vsed -e '/addopts/d' -i pytest.ini

From 8cebee2328fd51a863e07030a4fd5bcc5f04bcd5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 30 Apr 2021 16:25:20 -0400
Subject: [PATCH 1898/2024] python3-hyperframe: update to 6.0.1.

---
 srcpkgs/python3-hyperframe/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-hyperframe/template b/srcpkgs/python3-hyperframe/template
index 4c3eca278d8a..172c3ba23ccc 100644
--- a/srcpkgs/python3-hyperframe/template
+++ b/srcpkgs/python3-hyperframe/template
@@ -1,17 +1,22 @@
 # Template file for 'python3-hyperframe'
 pkgname=python3-hyperframe
-version=6.0.0
+version=6.0.1
 revision=1
 wrksrc=hyperframe-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3"
+checkdepends="python3-pytest"
 short_desc="Pure-Python HTTP/2 framing (Python3)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://python-hyper.org/hyperframe/"
 distfiles="https://github.com/python-hyper/hyperframe/archive/v${version}.tar.gz"
-checksum=85f749fcb81630cc10e770af970b6b31be64de204c6cae852fc0f06b685e9d96
+checksum=a126e1e0fb24135aa7ac53cefe11ad197d0c9a5e74f495c1236022b1e578a7a8
+
+do_check() {
+	PYTHONPATH="$(cd build/lib* && pwd)" python3 -m pytest
+}
 
 post_install() {
 	vlicense LICENSE

From 2c080aba4a0f909ce1c0f8de480e29d5d6867c16 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 30 Apr 2021 16:26:29 -0400
Subject: [PATCH 1899/2024] python3-ConfigArgParse: update to 1.4.

---
 srcpkgs/python3-ConfigArgParse/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-ConfigArgParse/template b/srcpkgs/python3-ConfigArgParse/template
index ccd04b6a3dba..2132e58fe20a 100644
--- a/srcpkgs/python3-ConfigArgParse/template
+++ b/srcpkgs/python3-ConfigArgParse/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ConfigArgParse'
 pkgname=python3-ConfigArgParse
-version=1.3
+version=1.4
 revision=1
 wrksrc="ConfigArgParse-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/bw2/ConfigArgParse"
 distfiles="${PYPI_SITE}/C/ConfigArgParse/ConfigArgParse-${version}.tar.gz"
-checksum=0428b975ab6c48bb101ccb732e1b5cb616296e28268e032aa806f32b647a1cc1
+checksum=abef9ff44fb0091f0e3bb2ee7e5b26a02b5b62d45408a5272a9bd461f5b59b4b
 
 post_install() {
 	vlicense LICENSE

From 8faa74ecc823bd1e973ee5a9817e2a2489513acc Mon Sep 17 00:00:00 2001
From: jkoderu-git <64820459+jkoderu-git@users.noreply.github.com>
Date: Fri, 30 Apr 2021 19:47:35 +0000
Subject: [PATCH 1900/2024] lollypop: update to 1.4.19

---
 srcpkgs/lollypop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lollypop/template b/srcpkgs/lollypop/template
index 1c38cb23aea4..a294bdb652a2 100644
--- a/srcpkgs/lollypop/template
+++ b/srcpkgs/lollypop/template
@@ -1,6 +1,6 @@
 # Template file for 'lollypop'
 pkgname=lollypop
-version=1.4.16
+version=1.4.19
 revision=1
 build_style=meson
 hostmakedepends="cmake git glib-devel gobject-introspection intltool itstool pkg-config"
@@ -13,4 +13,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Lollypop"
 distfiles="https://adishatz.org/lollypop/${pkgname}-${version}.tar.xz"
-checksum=7384c57e4f8922c8e5e3b4b2a93e4bc15cc019579fdf1f99d0c42555e1238222
+checksum=38bc38181e93ad989cb42d8efb2b8dc96223486eb200863d81f3a0b7573e3830

From a8e53e416129693816c27d7f032a58793f807bc3 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sat, 1 May 2021 01:21:40 +0200
Subject: [PATCH 1901/2024] thermald: update to 2.4.4.

---
 srcpkgs/thermald/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thermald/template b/srcpkgs/thermald/template
index ecc17f3f7e32..d1a872d7d31b 100644
--- a/srcpkgs/thermald/template
+++ b/srcpkgs/thermald/template
@@ -1,6 +1,6 @@
 # Template file for 'thermald'
 pkgname=thermald
-version=2.4.2
+version=2.4.4
 revision=1
 _pkgname=thermal_daemon
 archs="i686* x86_64*"
@@ -13,7 +13,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/intel/${_pkgname}"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=02deb2127934eec036771ec4028c106fb156d85784f58ac6e9906f7aa142793c
+checksum=54c069e2c1e7f02212aee3a0c0b66a684e56509114dcf583a6d1d56aaa370157
 conf_files='/etc/thermald/*'
 
 if [ "$CROSS_BUILD" ]; then

From 27a7e0088dbd290cd969c428831ca360dd138be2 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sat, 1 May 2021 01:25:18 +0200
Subject: [PATCH 1902/2024] terraform: update to 0.15.1.

---
 srcpkgs/terraform/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template
index ee187a2a91cb..3533faa5ffc3 100644
--- a/srcpkgs/terraform/template
+++ b/srcpkgs/terraform/template
@@ -1,6 +1,6 @@
 # Template file for 'terraform'
 pkgname=terraform
-version=0.15.0
+version=0.15.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/$pkgname"
@@ -9,4 +9,4 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MPL-2.0"
 homepage="https://www.terraform.io/"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=89e1d82ee6f02bb9c280f1d9ab0c0edc6061c4442bf43af0f4e4f1001730188e
+checksum=ec4926ff56952ddc43d15523ea7c359e260139d33d938057b19ff05b695722cd

From 52fcf1c9ad66570b994f000ff5740f2cc739f343 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sat, 1 May 2021 01:27:59 +0200
Subject: [PATCH 1903/2024] terragrunt: update to 0.29.1.

---
 srcpkgs/terragrunt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index 45f0b1a575b8..8cdce268b452 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,6 +1,6 @@
 # Template file for 'terragrunt'
 pkgname=terragrunt
-version=0.28.7
+version=0.29.1
 revision=1
 build_style=go
 go_import_path="github.com/gruntwork-io/terragrunt"
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="https://github.com/gruntwork-io/terragrunt"
 distfiles="$homepage/archive/v$version.tar.gz"
-checksum=e84d4ade9ffbc1ca9e0a2b9cf594915a9515d331cfcc65f78b6c36b0cb3b53cc
+checksum=f33da3e49d3d6b8cb989a07961c2192026bc9475e2a839070ee013c4dbc19f37
 
 post_install() {
 	vlicense LICENSE.txt

From 0c46104e596cc2887e0be1eddc49f68b1d8be9d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 25 Apr 2021 22:53:14 +0700
Subject: [PATCH 1904/2024] mozc: update to 2.26.4353.100.

---
 srcpkgs/fcitx5-mozc                           |   1 +
 srcpkgs/mozc/patches/abseil.patch             |  73 ++++
 srcpkgs/mozc/patches/cross.patch              |  10 +-
 srcpkgs/mozc/patches/cxx-stdlib.patch         |  29 ++
 .../default_hiragana_from_environment.patch   |  20 --
 srcpkgs/mozc/patches/fcitx.patch              |  13 +
 srcpkgs/mozc/patches/no-parallel.patch        |   6 +-
 srcpkgs/mozc/patches/protobuf-370.patch       | 327 ------------------
 srcpkgs/mozc/patches/unsigned-int.patch       | 210 +++++++++++
 srcpkgs/mozc/template                         | 109 ++++--
 srcpkgs/mozc/update                           |   2 +
 11 files changed, 409 insertions(+), 391 deletions(-)
 create mode 120000 srcpkgs/fcitx5-mozc
 create mode 100644 srcpkgs/mozc/patches/abseil.patch
 create mode 100644 srcpkgs/mozc/patches/cxx-stdlib.patch
 delete mode 100644 srcpkgs/mozc/patches/default_hiragana_from_environment.patch
 create mode 100644 srcpkgs/mozc/patches/fcitx.patch
 delete mode 100644 srcpkgs/mozc/patches/protobuf-370.patch
 create mode 100644 srcpkgs/mozc/patches/unsigned-int.patch
 create mode 100644 srcpkgs/mozc/update

diff --git a/srcpkgs/fcitx5-mozc b/srcpkgs/fcitx5-mozc
new file mode 120000
index 000000000000..6874ca426b5f
--- /dev/null
+++ b/srcpkgs/fcitx5-mozc
@@ -0,0 +1 @@
+mozc
\ No newline at end of file
diff --git a/srcpkgs/mozc/patches/abseil.patch b/srcpkgs/mozc/patches/abseil.patch
new file mode 100644
index 000000000000..22510299dc9f
--- /dev/null
+++ b/srcpkgs/mozc/patches/abseil.patch
@@ -0,0 +1,73 @@
+
+Ported from grpc's patches
+
+An all-in-one patch that fixes several issues:
+
+1) UnscaledCycleClock not fully implemented for ppc*-musl (disabled on musl)
+2) powerpc stacktrace implementation only works on glibc (disabled on musl)
+3) powerpc stacktrace implementation has ppc64 assumptions (fixed)
+4) examine_stack.cpp makes glibc assumptions on powerpc (fixed)
+
+--- mozc/src/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
++++ mozc/src/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h
+@@ -46,7 +46,7 @@
+ 
+ // The following platforms have an implementation of a hardware counter.
+ #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
+-  defined(__powerpc__) || defined(__ppc__) || \
++  ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \
+   defined(_M_IX86) || defined(_M_X64)
+ #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
+ #else
+--- mozc/src/third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc
++++ mozc/src/third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc
+@@ -27,6 +27,10 @@
+ #include <csignal>
+ #include <cstdio>
+ 
++#if defined(__powerpc__)
++#include <asm/ptrace.h>
++#endif
++
+ #include "absl/base/attributes.h"
+ #include "absl/base/internal/raw_logging.h"
+ #include "absl/base/macros.h"
+@@ -55,8 +59,10 @@
+     return reinterpret_cast<void*>(context->uc_mcontext.pc);
+ #elif defined(__powerpc64__)
+     return reinterpret_cast<void*>(context->uc_mcontext.gp_regs[32]);
+-#elif defined(__powerpc__)
++#elif defined(__powerpc__) && defined(__GLIBC__)
+     return reinterpret_cast<void*>(context->uc_mcontext.regs->nip);
++#elif defined(__powerpc__)
++    return reinterpret_cast<void*>(((struct pt_regs *)context->uc_regs)->nip);
+ #elif defined(__riscv)
+     return reinterpret_cast<void*>(context->uc_mcontext.__gregs[REG_PC]);
+ #elif defined(__s390__) && !defined(__s390x__)
+--- mozc/src/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
++++ mozc/src/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
+@@ -64,7 +64,7 @@
+ #elif defined(__i386__) || defined(__x86_64__)
+ #define ABSL_STACKTRACE_INL_HEADER \
+   "absl/debugging/internal/stacktrace_x86-inl.inc"
+-#elif defined(__ppc__) || defined(__PPC__)
++#elif (defined(__ppc__) || defined(__PPC__)) && defined(__GLIBC__)
+ #define ABSL_STACKTRACE_INL_HEADER \
+   "absl/debugging/internal/stacktrace_powerpc-inl.inc"
+ #elif defined(__aarch64__)
+--- mozc/src/third_party/abseil-cpp/absl/debugging/internal/stacktrace_powerpc-inl.inc
++++ mozc/src/third_party/abseil-cpp/absl/debugging/internal/stacktrace_powerpc-inl.inc
+@@ -130,8 +130,13 @@
+         StacktracePowerPCGetLR(new_sp) == kernel_sigtramp_rt64_address) {
+       const ucontext_t* signal_context =
+           reinterpret_cast<const ucontext_t*>(uc);
++#if defined(__powerpc64__)
+       void **const sp_before_signal =
+           reinterpret_cast<void**>(signal_context->uc_mcontext.gp_regs[PT_R1]);
++#else
++      void **const sp_before_signal =
++          reinterpret_cast<void**>(signal_context->uc_mcontext.uc_regs->gregs[PT_R1]);
++#endif
+       // Check that alleged sp before signal is nonnull and is reasonably
+       // aligned.
+       if (sp_before_signal != nullptr &&
diff --git a/srcpkgs/mozc/patches/cross.patch b/srcpkgs/mozc/patches/cross.patch
index 17d47a900eb9..d73c5f82b430 100644
--- a/srcpkgs/mozc/patches/cross.patch
+++ b/srcpkgs/mozc/patches/cross.patch
@@ -1,7 +1,9 @@
---- mozc/src/gyp/common.gypi
+Index: mozc/src/gyp/common.gypi
+===================================================================
+--- mozc/src/gyp/common.gypi.orig
 +++ mozc/src/gyp/common.gypi
-@@ -444,12 +444,12 @@
-     }],
+@@ -409,12 +409,12 @@
+   'conditions': [
      ['target_platform=="Linux"', {
        'make_global_settings': [
 -        ['AR', '<!(which ar)'],
@@ -19,7 +21,7 @@
        ],
      }],
      ['target_platform=="Android"', {
-@@ -494,12 +494,12 @@
+@@ -459,12 +459,12 @@
          ['LD', '<(ndk_bin_dir)/<(toolchain_prefix)-ld'],
          ['NM', '<(ndk_bin_dir)/<(toolchain_prefix)-nm'],
          ['READELF', '<(ndk_bin_dir)/<(toolchain_prefix)-readelf'],
diff --git a/srcpkgs/mozc/patches/cxx-stdlib.patch b/srcpkgs/mozc/patches/cxx-stdlib.patch
new file mode 100644
index 000000000000..0bccaf8ddc4f
--- /dev/null
+++ b/srcpkgs/mozc/patches/cxx-stdlib.patch
@@ -0,0 +1,29 @@
+Index: mozc/src/gyp/common.gypi
+===================================================================
+--- mozc/src/gyp/common.gypi
++++ mozc/src/gyp/common.gypi
+@@ -105,7 +105,7 @@
+     ],
+     # Libraries for GNU/Linux environment.
+     'linux_ldflags': [
+-      '-lc++',
++      '-lstdc++',
+       '-pthread',
+     ],
+ 
+@@ -205,7 +205,6 @@
+               '-Wtype-limits',
+             ],
+             'cflags_cc': [
+-              '-stdlib=libc++',
+               '-Wno-covered-switch-default',
+               '-Wno-unnamed-type-template-args',
+               '-Wno-c++11-narrowing',
+@@ -225,7 +224,6 @@
+               '-Wtype-limits',
+             ],
+             'cflags_cc': [
+-              '-stdlib=libc++',
+               '-Wno-covered-switch-default',
+               '-Wno-unnamed-type-template-args',
+               '-Wno-c++11-narrowing',
diff --git a/srcpkgs/mozc/patches/default_hiragana_from_environment.patch b/srcpkgs/mozc/patches/default_hiragana_from_environment.patch
deleted file mode 100644
index d733635ac5a1..000000000000
--- a/srcpkgs/mozc/patches/default_hiragana_from_environment.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- mozc/src/unix/ibus/property_handler.cc
-+++ mozc/src/unix/ibus/property_handler.cc
-@@ -40,6 +40,8 @@
- #include "unix/ibus/mozc_engine_property.h"
- #include "unix/ibus/path_util.h"
- 
-+#include <cstdlib>
-+
- // On Gnome Shell with IBus 1.5, new property named "symbol" is used to
- // represent the mode indicator on the system panel. Note that "symbol" does
- // not exist in IBus 1.4.x.
-@@ -80,7 +82,7 @@ bool GetDisabled(IBusEngine *engine) {
- // On IBus 1.4.x, IBus expects that an IME should always be turned on and
- // IME on/off keys are handled by IBus itself rather than each IME.
- #if IBUS_CHECK_VERSION(1, 5, 0)
--const bool kActivatedOnLaunch = false;
-+const bool kActivatedOnLaunch = !!::std::getenv("IBUS_MOZC_DEFAULT_HIRAGANA");
- #else
- const bool kActivatedOnLaunch = true;
- #endif  // IBus>=1.5.0
diff --git a/srcpkgs/mozc/patches/fcitx.patch b/srcpkgs/mozc/patches/fcitx.patch
new file mode 100644
index 000000000000..1ed6d01516f5
--- /dev/null
+++ b/srcpkgs/mozc/patches/fcitx.patch
@@ -0,0 +1,13 @@
+Index: mozc/src/unix/fcitx/fcitx.gyp
+===================================================================
+--- mozc/src/unix/fcitx/fcitx.gyp.orig
++++ mozc/src/unix/fcitx/fcitx.gyp
+@@ -96,7 +96,7 @@
+         '<@(fcitx_dep_include_dirs)',
+       ],
+       'defines': [
+-        'LOCALEDIR="<!@(fcitx4-config --prefix)/share/locale/"',
++        'LOCALEDIR="/usr/share/locale/"',
+       ],
+     },
+   ],
diff --git a/srcpkgs/mozc/patches/no-parallel.patch b/srcpkgs/mozc/patches/no-parallel.patch
index 14b23367f09e..5952cbc6a040 100644
--- a/srcpkgs/mozc/patches/no-parallel.patch
+++ b/srcpkgs/mozc/patches/no-parallel.patch
@@ -1,6 +1,8 @@
---- mozc/src/build_mozc.py
+Index: mozc/src/build_mozc.py
+===================================================================
+--- mozc/src/build_mozc.py.orig
 +++ mozc/src/build_mozc.py
-@@ -728,6 +728,7 @@ def GypMain(options, unused_args):
+@@ -496,6 +496,7 @@ def GypMain(options, unused_args):
    gyp_options.extend(['--generator-output=.'])
    short_basename = GetBuildShortBaseName(target_platform)
    gyp_options.extend(['-G', 'output_dir=%s' % short_basename])
diff --git a/srcpkgs/mozc/patches/protobuf-370.patch b/srcpkgs/mozc/patches/protobuf-370.patch
deleted file mode 100644
index 59d4e0bb995d..000000000000
--- a/srcpkgs/mozc/patches/protobuf-370.patch
+++ /dev/null
@@ -1,327 +0,0 @@
---- mozc/src/dictionary/user_dictionary.cc
-+++ mozc/src/dictionary/user_dictionary.cc
-@@ -289,7 +289,7 @@ class UserDictionary::UserDictionaryReloader : public Thread {
-     }
- 
-     auto_register_mode_ = false;
--    dic_->Load(*(storage.get()));
-+    dic_->Load(*(storage->storage()));
-   }
- 
-  private:
---- mozc/src/dictionary/user_dictionary_session.cc
-+++ mozc/src/dictionary/user_dictionary_session.cc
-@@ -144,7 +144,7 @@ class UndoRenameDictionaryCommand : public UserDictionarySession::UndoCommand {
-   virtual bool RunUndo(mozc::UserDictionaryStorage *storage) {
-     UserDictionary *dictionary =
-         UserDictionaryUtil::GetMutableUserDictionaryById(
--            storage, dictionary_id_);
-+            storage->storage(), dictionary_id_);
-     if (dictionary == NULL) {
-       return false;
-     }
-@@ -169,7 +169,7 @@ class UndoAddEntryCommand : public UserDictionarySession::UndoCommand {
-   virtual bool RunUndo(mozc::UserDictionaryStorage *storage) {
-     UserDictionary *dictionary =
-         UserDictionaryUtil::GetMutableUserDictionaryById(
--            storage, dictionary_id_);
-+            storage->storage(), dictionary_id_);
-     if (dictionary == NULL || dictionary->entries_size() == 0) {
-       return false;
-     }
-@@ -195,7 +195,7 @@ class UndoEditEntryCommand : public UserDictionarySession::UndoCommand {
-   virtual bool RunUndo(mozc::UserDictionaryStorage *storage) {
-     UserDictionary *dictionary =
-         UserDictionaryUtil::GetMutableUserDictionaryById(
--            storage, dictionary_id_);
-+            storage->storage(), dictionary_id_);
-     if (dictionary == NULL ||
-         index_ < 0 || dictionary->entries_size() <= index_) {
-       return false;
-@@ -240,7 +240,7 @@ class UndoDeleteEntryCommand : public UserDictionarySession::UndoCommand {
-   virtual bool RunUndo(mozc::UserDictionaryStorage *storage) {
-     UserDictionary *dictionary =
-         UserDictionaryUtil::GetMutableUserDictionaryById(
--            storage, dictionary_id_);
-+            storage->storage(), dictionary_id_);
-     if (dictionary == NULL) {
-       return false;
-     }
-@@ -306,7 +306,7 @@ class UndoImportFromStringCommand : public UserDictionarySession::UndoCommand {
-   virtual bool RunUndo(mozc::UserDictionaryStorage *storage) {
-     UserDictionary *dictionary =
-         UserDictionaryUtil::GetMutableUserDictionaryById(
--            storage, dictionary_id_);
-+            storage->storage(), dictionary_id_);
-     if (dictionary == NULL) {
-       return false;
-     }
-@@ -345,7 +345,7 @@ UserDictionarySession::~UserDictionarySession() {
- 
- // TODO(hidehiko) move this to header.
- const UserDictionaryStorage &UserDictionarySession::storage() const {
--  return *storage_;
-+  return *storage_->storage();
- }
- mozc::UserDictionaryStorage *UserDictionarySession::mutable_storage() {
-   return storage_.get();
-@@ -464,7 +464,7 @@ UserDictionaryCommandStatus::Status UserDictionarySession::CreateDictionary(
-     const string &dictionary_name, uint64 *new_dictionary_id) {
-   UserDictionaryCommandStatus::Status status =
-       UserDictionaryUtil::CreateDictionary(
--          storage_.get(), dictionary_name, new_dictionary_id);
-+          storage_->storage(), dictionary_name, new_dictionary_id);
-   if (status == UserDictionaryCommandStatus::USER_DICTIONARY_COMMAND_SUCCESS) {
-     AddUndoCommand(new UndoCreateDictionaryCommand);
-   }
-@@ -488,7 +488,7 @@ UserDictionarySession::DeleteDictionaryInternal(
-   int original_index;
-   UserDictionary *deleted_dictionary;
-   if (!UserDictionaryUtil::DeleteDictionary(
--          storage_.get(), dictionary_id,
-+          storage_->storage(), dictionary_id,
-           &original_index, &deleted_dictionary)) {
-     // Failed to delete the dictionary.
-     return UserDictionaryCommandStatus::UNKNOWN_DICTIONARY_ID;
-@@ -510,7 +510,7 @@ UserDictionaryCommandStatus::Status UserDictionarySession::RenameDictionary(
-     uint64 dictionary_id, const string &dictionary_name) {
-   string original_name;
-   const UserDictionary *dictionary =
--      UserDictionaryUtil::GetUserDictionaryById(*storage_, dictionary_id);
-+      UserDictionaryUtil::GetUserDictionaryById(*storage_->storage(), dictionary_id);
-   if (dictionary != NULL) {
-     // Note that if dictionary is null, it means the dictionary_id is invalid
-     // so following RenameDictionary will fail, and error handling is done
-@@ -547,7 +547,7 @@ UserDictionaryCommandStatus::Status UserDictionarySession::AddEntry(
-     uint64 dictionary_id, const UserDictionary::Entry &entry) {
-   UserDictionary *dictionary =
-       UserDictionaryUtil::GetMutableUserDictionaryById(
--          storage_.get(), dictionary_id);
-+          storage_->storage(), dictionary_id);
-   if (dictionary == NULL) {
-     return UserDictionaryCommandStatus::UNKNOWN_DICTIONARY_ID;
-   }
-@@ -575,7 +575,7 @@ UserDictionaryCommandStatus::Status UserDictionarySession::EditEntry(
-     uint64 dictionary_id, int index, const UserDictionary::Entry &entry) {
-   UserDictionary *dictionary =
-       UserDictionaryUtil::GetMutableUserDictionaryById(
--          storage_.get(), dictionary_id);
-+          storage_->storage(), dictionary_id);
-   if (dictionary == NULL) {
-     return UserDictionaryCommandStatus::UNKNOWN_DICTIONARY_ID;
-   }
-@@ -604,7 +604,7 @@ UserDictionaryCommandStatus::Status UserDictionarySession::DeleteEntry(
-     uint64 dictionary_id, const std::vector<int> &index_list) {
-   UserDictionary *dictionary =
-       UserDictionaryUtil::GetMutableUserDictionaryById(
--          storage_.get(), dictionary_id);
-+          storage_->storage(), dictionary_id);
-   if (dictionary == NULL) {
-     return UserDictionaryCommandStatus::UNKNOWN_DICTIONARY_ID;
-   }
-@@ -644,7 +644,7 @@ UserDictionaryCommandStatus::Status UserDictionarySession::ImportFromString(
-     uint64 dictionary_id, const string &data) {
-   UserDictionary *dictionary =
-       UserDictionaryUtil::GetMutableUserDictionaryById(
--          storage_.get(), dictionary_id);
-+          storage_->storage(), dictionary_id);
-   if (dictionary == NULL) {
-     return UserDictionaryCommandStatus::UNKNOWN_DICTIONARY_ID;
-   }
-@@ -699,7 +699,7 @@ UserDictionarySession::ImportToNewDictionaryFromString(
-     uint64 *new_dictionary_id) {
-   UserDictionaryCommandStatus::Status status =
-       UserDictionaryUtil::CreateDictionary(
--          storage_.get(), dictionary_name, new_dictionary_id);
-+          storage_->storage(), dictionary_name, new_dictionary_id);
-   if (status != UserDictionaryCommandStatus::USER_DICTIONARY_COMMAND_SUCCESS) {
-     return status;
-   }
-@@ -709,7 +709,7 @@ UserDictionarySession::ImportToNewDictionaryFromString(
- 
-   UserDictionary *dictionary =
-       UserDictionaryUtil::GetMutableUserDictionaryById(
--          storage_.get(), *new_dictionary_id);
-+          storage_->storage(), *new_dictionary_id);
-   if (dictionary == NULL) {
-     // The dictionary should be always found.
-     return UserDictionaryCommandStatus::UNKNOWN_ERROR;
-@@ -728,7 +728,7 @@ bool UserDictionarySession::EnsureNonEmptyStorage() {
-   uint64 new_dictionary_id;
-   UserDictionaryCommandStatus::Status status =
-       UserDictionaryUtil::CreateDictionary(
--          storage_.get(), default_dictionary_name_, &new_dictionary_id);
-+          storage_->storage(), default_dictionary_name_, &new_dictionary_id);
-   CHECK_EQ(
-       status, UserDictionaryCommandStatus::USER_DICTIONARY_COMMAND_SUCCESS);
-   return true;
---- mozc/src/dictionary/user_dictionary_storage.cc
-+++ mozc/src/dictionary/user_dictionary_storage.cc
-@@ -109,7 +109,7 @@ bool UserDictionaryStorage::LoadInternal() {
-   mozc::protobuf::io::IstreamInputStream zero_copy_input(&ifs);
-   mozc::protobuf::io::CodedInputStream decoder(&zero_copy_input);
-   decoder.SetTotalBytesLimit(kDefaultTotalBytesLimit, -1);
--  if (!ParseFromCodedStream(&decoder)) {
-+  if (!storage_.ParseFromCodedStream(&decoder)) {
-     LOG(ERROR) << "Failed to parse";
-     if (!decoder.ConsumedEntireMessage() || !ifs.eof()) {
-       LOG(ERROR) << "ParseFromStream failed: file seems broken";
-@@ -141,7 +141,7 @@ bool UserDictionaryStorage::Load() {
-     const UserDictionary &dict = dictionaries(i);
-     if (dict.id() == 0) {
-       mutable_dictionaries(i)->set_id(
--          UserDictionaryUtil::CreateNewDictionaryId(*this));
-+          UserDictionaryUtil::CreateNewDictionaryId(storage_));
-     }
-   }
- 
-@@ -171,7 +171,7 @@ bool UserDictionaryStorage::Save() {
-       return false;
-     }
- 
--    if (!SerializeToOstream(&ofs)) {
-+    if (!storage_.SerializeToOstream(&ofs)) {
-       LOG(ERROR) << "SerializeToString failed";
-       last_error_type_ = SYNC_FAILURE;
-       return false;
-@@ -241,7 +241,7 @@ bool UserDictionaryStorage::ExportDictionary(
- bool UserDictionaryStorage::CreateDictionary(
-     const string &dic_name, uint64 *new_dic_id) {
-   UserDictionaryCommandStatus::Status status =
--      UserDictionaryUtil::CreateDictionary(this, dic_name, new_dic_id);
-+      UserDictionaryUtil::CreateDictionary(&storage_, dic_name, new_dic_id);
-   // Update last_error_type_
-   switch (status) {
-     case UserDictionaryCommandStatus::DICTIONARY_NAME_EMPTY:
-@@ -273,7 +273,7 @@ bool UserDictionaryStorage::CreateDictionary(
- }
- 
- bool UserDictionaryStorage::DeleteDictionary(uint64 dic_id) {
--  if (!UserDictionaryUtil::DeleteDictionary(this, dic_id, NULL, NULL)) {
-+  if (!UserDictionaryUtil::DeleteDictionary(&storage_, dic_id, NULL, NULL)) {
-     // Failed to delete dictionary.
-     last_error_type_ = INVALID_DICTIONARY_ID;
-     return false;
-@@ -318,7 +318,7 @@ bool UserDictionaryStorage::RenameDictionary(uint64 dic_id,
- }
- 
- int UserDictionaryStorage::GetUserDictionaryIndex(uint64 dic_id) const {
--  return UserDictionaryUtil::GetUserDictionaryIndexById(*this, dic_id);
-+  return UserDictionaryUtil::GetUserDictionaryIndexById(storage_, dic_id);
- }
- 
- bool UserDictionaryStorage::GetUserDictionaryId(const string &dic_name,
-@@ -335,7 +335,7 @@ bool UserDictionaryStorage::GetUserDictionaryId(const string &dic_name,
- 
- user_dictionary::UserDictionary *UserDictionaryStorage::GetUserDictionary(
-     uint64 dic_id) {
--  return UserDictionaryUtil::GetMutableUserDictionaryById(this, dic_id);
-+  return UserDictionaryUtil::GetMutableUserDictionaryById(&storage_, dic_id);
- }
- 
- UserDictionaryStorage::UserDictionaryStorageErrorType
-@@ -361,14 +361,14 @@ bool UserDictionaryStorage::AddToAutoRegisteredDictionary(
- 
-   UserDictionary *dic = NULL;
-   if (auto_index == -1) {
--    if (UserDictionaryUtil::IsStorageFull(*this)) {
-+    if (UserDictionaryUtil::IsStorageFull(storage_)) {
-       last_error_type_ = TOO_MANY_DICTIONARIES;
-       LOG(ERROR) << "too many dictionaries";
-       UnLock();
-       return false;
-     }
-     dic = add_dictionaries();
--    dic->set_id(UserDictionaryUtil::CreateNewDictionaryId(*this));
-+    dic->set_id(UserDictionaryUtil::CreateNewDictionaryId(storage_));
-     dic->set_name(kAutoRegisteredDictionaryName);
-   } else {
-     dic = mutable_dictionaries(auto_index);
-@@ -410,7 +410,7 @@ bool UserDictionaryStorage::AddToAutoRegisteredDictionary(
- }
- 
- bool UserDictionaryStorage::ConvertSyncDictionariesToNormalDictionaries() {
--  if (CountSyncableDictionaries(*this) == 0) {
-+  if (CountSyncableDictionaries(storage_) == 0) {
-     return false;
-   }
- 
-@@ -445,7 +445,7 @@ bool UserDictionaryStorage::ConvertSyncDictionariesToNormalDictionaries() {
-           kDictionaryNameConvertedFromSyncableDictionary;
-       int index = 0;
-       while (UserDictionaryUtil::ValidateDictionaryName(
--                 *this, new_dictionary_name)
-+                 storage_, new_dictionary_name)
-              != UserDictionaryCommandStatus::USER_DICTIONARY_COMMAND_SUCCESS) {
-         ++index;
-         new_dictionary_name = Util::StringPrintf(
-@@ -456,7 +456,7 @@ bool UserDictionaryStorage::ConvertSyncDictionariesToNormalDictionaries() {
-     dic->set_syncable(false);
-   }
- 
--  DCHECK_EQ(0, CountSyncableDictionaries(*this));
-+  DCHECK_EQ(0, CountSyncableDictionaries(storage_));
- 
-   return true;
- }
---- mozc/src/dictionary/user_dictionary_storage.h
-+++ mozc/src/dictionary/user_dictionary_storage.h
-@@ -74,8 +74,20 @@ class ProcessMutex;
- 
- // Inherit from ProtocolBuffer
- // TODO(hidehiko): Get rid of this implementation.
--class UserDictionaryStorage : public user_dictionary::UserDictionaryStorage {
-+class UserDictionaryStorage {
-+ private:
-+  user_dictionary::UserDictionaryStorage storage_;
-  public:
-+  static const user_dictionary::UserDictionaryStorage& default_instance() { return user_dictionary::UserDictionaryStorage::default_instance(); }
-+  user_dictionary::UserDictionaryStorage *storage() { return &storage_; }
-+  int dictionaries_size() const { return storage_.dictionaries_size(); }
-+  void clear_dictionaries() { storage_.clear_dictionaries(); }
-+  user_dictionary::UserDictionary* mutable_dictionaries(int index) { return storage_.mutable_dictionaries(index); }
-+  ::google::protobuf::RepeatedPtrField<user_dictionary::UserDictionary >* mutable_dictionaries() { return storage_.mutable_dictionaries(); }
-+  const ::google::protobuf::RepeatedPtrField<user_dictionary::UserDictionary >& dictionaries() const { return storage_.dictionaries(); }
-+  const user_dictionary::UserDictionary& dictionaries(int index) const { return storage_.dictionaries(index); }
-+  user_dictionary::UserDictionary* add_dictionaries() { return storage_.add_dictionaries(); }
-+
-   typedef user_dictionary::UserDictionary UserDictionary;
-   typedef user_dictionary::UserDictionary::Entry UserDictionaryEntry;
- 
---- mozc/src/prediction/user_history_predictor.cc
-+++ mozc/src/prediction/user_history_predictor.cc
-@@ -291,7 +291,7 @@ bool UserHistoryStorage::Load() {
-     return false;
-   }
- 
--  if (!ParseFromString(input)) {
-+  if (!userHistory_.ParseFromString(input)) {
-     LOG(ERROR) << "ParseFromString failed. message looks broken";
-     return false;
-   }
-@@ -307,7 +307,7 @@ bool UserHistoryStorage::Save() const {
-   }
- 
-   string output;
--  if (!AppendToString(&output)) {
-+  if (!userHistory_.AppendToString(&output)) {
-     LOG(ERROR) << "AppendToString failed";
-     return false;
-   }
---- mozc/src/prediction/user_history_predictor.h
-+++ mozc/src/prediction/user_history_predictor.h
-@@ -61,8 +61,13 @@ class Segments;
- class UserHistoryPredictorSyncer;
- 
- // Added serialization method for UserHistory.
--class UserHistoryStorage : public mozc::user_history_predictor::UserHistory {
-+class UserHistoryStorage {
-+ private:
-+  user_history_predictor::UserHistory userHistory_;
-  public:
-+  int entries_size() const { return userHistory_.entries_size(); }
-+  const user_history_predictor::UserHistory_Entry& entries(int index) const { return userHistory_.entries(index); }
-+  user_history_predictor::UserHistory_Entry* add_entries() { return userHistory_.add_entries(); }
-   explicit UserHistoryStorage(const string &filename);
-   ~UserHistoryStorage();
- 
diff --git a/srcpkgs/mozc/patches/unsigned-int.patch b/srcpkgs/mozc/patches/unsigned-int.patch
new file mode 100644
index 000000000000..823db9f21993
--- /dev/null
+++ b/srcpkgs/mozc/patches/unsigned-int.patch
@@ -0,0 +1,210 @@
+Index: mozc/src/gui/word_register_dialog/word_register_dialog.cc
+===================================================================
+--- mozc/src/gui/word_register_dialog/word_register_dialog.cc
++++ mozc/src/gui/word_register_dialog/word_register_dialog.cc
+@@ -94,7 +94,7 @@ QString GetEnv(const char *envname) {
+       return QString::fromUtf16(reinterpret_cast<const ushort *>(buffer.get()));
+     } else {
+       // This is a fallback just in case.
+-      return QString::fromUcs4(reinterpret_cast<const uint *>(buffer.get()));
++      return QString::fromUcs4(reinterpret_cast<const unsigned *>(buffer.get()));
+     }
+   }
+   return QLatin1String("");
+Index: mozc/src/unix/fcitx/surrounding_text_util.cc
+===================================================================
+--- mozc/src/unix/fcitx/surrounding_text_util.cc
++++ mozc/src/unix/fcitx/surrounding_text_util.cc
+@@ -41,10 +41,10 @@
+ namespace mozc {
+ namespace fcitx {
+ 
+-bool SurroundingTextUtil::GetSafeDelta(uint from, uint to, int32 *delta) {
++bool SurroundingTextUtil::GetSafeDelta(unsigned from, unsigned to, int32 *delta) {
+   DCHECK(delta);
+ 
+-  static_assert(sizeof(int64) >= sizeof(uint),
++  static_assert(sizeof(int64) >= sizeof(unsigned),
+                 "int64 must be sufficient to store a guint value.");
+   static_assert(sizeof(int64) == sizeof(llabs(0)),
+                 "|llabs(0)| must returns a 64-bit integer.");
+@@ -113,8 +113,8 @@ bool SearchAnchorPosForward(
+     const std::string &surrounding_text,
+     const std::string &selected_text,
+     size_t selected_chars_len,
+-    uint cursor_pos,
+-    uint *anchor_pos) {
++    unsigned cursor_pos,
++    unsigned *anchor_pos) {
+ 
+   ConstChar32Iterator iter(surrounding_text);
+   // Move |iter| to cursor pos.
+@@ -137,15 +137,15 @@ bool SearchAnchorPosBackward(
+     const std::string &surrounding_text,
+     const std::string &selected_text,
+     size_t selected_chars_len,
+-    uint cursor_pos,
+-    uint *anchor_pos) {
++    unsigned cursor_pos,
++    unsigned *anchor_pos) {
+   if (cursor_pos < selected_chars_len) {
+     return false;
+   }
+ 
+   ConstChar32Iterator iter(surrounding_text);
+   // Skip |iter| to (potential) anchor pos.
+-  const uint skip_count = cursor_pos - selected_chars_len;
++  const unsigned skip_count = cursor_pos - selected_chars_len;
+   DCHECK_LE(skip_count, cursor_pos);
+   if (!Skip(&iter, skip_count)) {
+     return false;
+@@ -164,8 +164,8 @@ bool SearchAnchorPosBackward(
+ bool SurroundingTextUtil::GetAnchorPosFromSelection(
+     const std::string &surrounding_text,
+     const std::string &selected_text,
+-    uint cursor_pos,
+-    uint *anchor_pos) {
++    unsigned cursor_pos,
++    unsigned *anchor_pos) {
+   DCHECK(anchor_pos);
+ 
+   if (surrounding_text.empty()) {
+@@ -196,8 +196,8 @@ bool GetSurroundingText(FcitxInstance* i
+         return false;
+     }
+ 
+-    uint cursor_pos = 0;
+-    uint anchor_pos = 0;
++    unsigned cursor_pos = 0;
++    unsigned anchor_pos = 0;
+     char* str = NULL;
+ 
+     if (!FcitxInstanceGetSurroundingText(instance, ic, &str, &cursor_pos, &anchor_pos)) {
+@@ -211,7 +211,7 @@ bool GetSurroundingText(FcitxInstance* i
+         const char* primary = NULL;
+ 
+         if ((primary = FcitxClipboardGetPrimarySelection(instance, NULL)) != NULL) {
+-            uint new_anchor_pos = 0;
++            unsigned new_anchor_pos = 0;
+             const std::string primary_text(primary);
+             if (SurroundingTextUtil::GetAnchorPosFromSelection(
+                 surrounding_text, primary_text,
+Index: mozc/src/unix/fcitx/surrounding_text_util.h
+===================================================================
+--- mozc/src/unix/fcitx/surrounding_text_util.h
++++ mozc/src/unix/fcitx/surrounding_text_util.h
+@@ -55,7 +55,7 @@ class SurroundingTextUtil {
+   // Returns true when neither |abs(delta)| nor |-delta| does not cause
+   // integer overflow, that is, |delta| is in a safe range.
+   // Returns false otherwise.
+-  static bool GetSafeDelta(uint from, uint to, int32 *delta);
++  static bool GetSafeDelta(unsigned from, unsigned to, int32 *delta);
+ 
+   // Returns true if
+   // 1. |surrounding_text| contains |selected_text|
+@@ -71,8 +71,8 @@ class SurroundingTextUtil {
+   static bool GetAnchorPosFromSelection(
+       const std::string &surrounding_text,
+       const std::string &selected_text,
+-      uint cursor_pos,
+-      uint *anchor_pos);
++      unsigned cursor_pos,
++      unsigned *anchor_pos);
+ 
+  private:
+   DISALLOW_IMPLICIT_CONSTRUCTORS(SurroundingTextUtil);
+Index: mozc/src/unix/fcitx5/surrounding_text_util.cc
+===================================================================
+--- mozc/src/unix/fcitx5/surrounding_text_util.cc
++++ mozc/src/unix/fcitx5/surrounding_text_util.cc
+@@ -43,10 +43,10 @@ namespace fcitx {
+ 
+ using namespace mozc;
+ 
+-bool SurroundingTextUtil::GetSafeDelta(uint from, uint to, int32 *delta) {
++bool SurroundingTextUtil::GetSafeDelta(unsigned from, unsigned to, int32 *delta) {
+   DCHECK(delta);
+ 
+-  static_assert(sizeof(int64) >= sizeof(uint),
++  static_assert(sizeof(int64) >= sizeof(unsigned),
+                 "int64 must be sufficient to store a guint value.");
+   static_assert(sizeof(int64) == sizeof(llabs(0)),
+                 "|llabs(0)| must returns a 64-bit integer.");
+@@ -110,8 +110,8 @@ bool StartsWith(ConstChar32Iterator *ite
+ // Otherwise returns false.
+ bool SearchAnchorPosForward(const std::string &surrounding_text,
+                             const std::string &selected_text,
+-                            size_t selected_chars_len, uint cursor_pos,
+-                            uint *anchor_pos) {
++                            size_t selected_chars_len, unsigned cursor_pos,
++                            unsigned *anchor_pos) {
+   ConstChar32Iterator iter(surrounding_text);
+   // Move |iter| to cursor pos.
+   if (!Skip(&iter, cursor_pos)) {
+@@ -131,15 +131,15 @@ bool SearchAnchorPosForward(const std::s
+ // Otherwise returns false.
+ bool SearchAnchorPosBackward(const std::string &surrounding_text,
+                              const std::string &selected_text,
+-                             size_t selected_chars_len, uint cursor_pos,
+-                             uint *anchor_pos) {
++                             size_t selected_chars_len, unsigned cursor_pos,
++                             unsigned *anchor_pos) {
+   if (cursor_pos < selected_chars_len) {
+     return false;
+   }
+ 
+   ConstChar32Iterator iter(surrounding_text);
+   // Skip |iter| to (potential) anchor pos.
+-  const uint skip_count = cursor_pos - selected_chars_len;
++  const unsigned skip_count = cursor_pos - selected_chars_len;
+   DCHECK_LE(skip_count, cursor_pos);
+   if (!Skip(&iter, skip_count)) {
+     return false;
+@@ -157,7 +157,7 @@ bool SearchAnchorPosBackward(const std::
+ 
+ bool SurroundingTextUtil::GetAnchorPosFromSelection(
+     const std::string &surrounding_text, const std::string &selected_text,
+-    uint cursor_pos, uint *anchor_pos) {
++    unsigned cursor_pos, unsigned *anchor_pos) {
+   DCHECK(anchor_pos);
+ 
+   if (surrounding_text.empty()) {
+@@ -187,13 +187,13 @@ bool GetSurroundingText(InputContext *ic
+   }
+ 
+   const auto surrounding_text = ic->surroundingText().text();
+-  uint cursor_pos = ic->surroundingText().cursor();
+-  uint anchor_pos = ic->surroundingText().anchor();
++  unsigned cursor_pos = ic->surroundingText().cursor();
++  unsigned anchor_pos = ic->surroundingText().anchor();
+ 
+   if (cursor_pos == anchor_pos && clipboard) {
+     std::string primary = clipboard->call<IClipboard::primary>(ic);
+     if (!primary.empty()) {
+-      uint new_anchor_pos = 0;
++      unsigned new_anchor_pos = 0;
+       if (SurroundingTextUtil::GetAnchorPosFromSelection(
+               surrounding_text, primary, cursor_pos, &new_anchor_pos)) {
+         anchor_pos = new_anchor_pos;
+Index: mozc/src/unix/fcitx5/surrounding_text_util.h
+===================================================================
+--- mozc/src/unix/fcitx5/surrounding_text_util.h
++++ mozc/src/unix/fcitx5/surrounding_text_util.h
+@@ -56,7 +56,7 @@ class SurroundingTextUtil {
+   // Returns true when neither |abs(delta)| nor |-delta| does not cause
+   // integer overflow, that is, |delta| is in a safe range.
+   // Returns false otherwise.
+-  static bool GetSafeDelta(uint from, uint to, int32 *delta);
++  static bool GetSafeDelta(unsigned from, unsigned to, int32 *delta);
+ 
+   // Returns true if
+   // 1. |surrounding_text| contains |selected_text|
+@@ -71,7 +71,7 @@ class SurroundingTextUtil {
+   // Otherwise returns false.
+   static bool GetAnchorPosFromSelection(const std::string &surrounding_text,
+                                         const std::string &selected_text,
+-                                        uint cursor_pos, uint *anchor_pos);
++                                        unsigned cursor_pos, unsigned *anchor_pos);
+ 
+  private:
+   DISALLOW_IMPLICIT_CONSTRUCTORS(SurroundingTextUtil);
diff --git a/srcpkgs/mozc/template b/srcpkgs/mozc/template
index 71d32eb5b9cd..1a78d407f471 100644
--- a/srcpkgs/mozc/template
+++ b/srcpkgs/mozc/template
@@ -1,33 +1,36 @@
 # Template file for 'mozc'
 pkgname=mozc
-version=2.23.2815.102
-revision=10
+# src/data/version/mozc_version_template.bzl
+version=2.26.4353.100
+revision=1
 create_wrksrc=yes
 build_wrksrc=mozc/src
-hostmakedepends="gettext ninja pkg-config protobuf protobuf-devel python which"
+hostmakedepends="gettext ninja pkg-config protobuf protobuf-devel
+ python3-six which qt5-qmake qt5-host-tools"
 makedepends="gtk+-devel ibus-devel libzinnia-devel protobuf-devel qt5-devel
- fcitx-devel"
+ fcitx-devel libfcitx5-devel"
 depends="tegaki-zinnia-japanese>=0.3"
 short_desc="Japanese IME (Open Source version of Google Japanese Input)"
 maintainer="Matthias von Faber <mvf@gmx.eu>"
 license="BSD-3-Clause"
 homepage="https://github.com/google/mozc"
 distfiles="
- https://gitlab.com/fcitx/mozc/repository/dad94584ea5012110ad1d204e433964243a1639d/archive.tar.bz2>${pkgname}-${version}.tar.bz2
- https://github.com/bnoordhuis/gyp/archive/c6f471687407bf28ddfc63f1a8f47aeb7bf54edc.tar.gz
+ https://github.com/fcitx/mozc/archive/d384c3b3e7eed1aa54a6af3363781604fe538d65.tar.gz
+ https://github.com/abseil/abseil-cpp/archive/0f3bb466b868b523cf1dc9b2aaaed65c77b28862.tar.gz
+ ${DEBIAN_SITE}/main/g/gyp/gyp_0.1+20200513gitcaa6002.orig.tar.gz
  https://github.com/hiroyuki-komatsu/japanese-usage-dictionary/archive/e5b3425575734c323e1d947009dd74709437b684.tar.gz
 "
-checksum="
- e38457e63a7fa8d62d87b4f8b3e89fe5f6939d92e3c4fd287a93358375693892
- 882f074cbb3a4f2bba550fb615e63949c0fbf39eeb1718a0330b4a545ab97616
- 0b6efee0eebac2c1a8eeea333278aa40fcef7846bba9a379962c6e567e7e3dc1
-"
+checksum="69cb26e1f9c03e20715356ef568b583f2baf996df5fd8536aca2ed8e7bd9444f
+ 3d74cdc98b42fd4257d91f652575206de195e2c824fcd8d6e6d227f85cb143ef
+ 8d531bc7d3302461d76a32367453cec60ed08b455f27a53d8f313d81761713a8
+ 0b6efee0eebac2c1a8eeea333278aa40fcef7846bba9a379962c6e567e7e3dc1"
 
 CXXFLAGS="-D_GNU_SOURCE"
+patch_args=-Np0
+lib32disabled=yes
 
 if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-devel"
-	subpackages="ibus-mozc fcitx-mozc"
+	subpackages="ibus-mozc fcitx-mozc fcitx5-mozc"
 fi
 
 if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
@@ -35,45 +38,43 @@ if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 fi
 
 post_extract() {
-	ln -s mozc-* mozc
-	rm -rf mozc/src/unix/fcitx5
+	mv mozc-* mozc
 
 	# symlink "submodules" into place
-	for _src_dest in gyp japanese-usage-dictionary:japanese_usage_dictionary; do
+	for _src_dest in gyp \
+		abseil-cpp \
+		japanese-usage-dictionary:japanese_usage_dictionary
+	do
 		_src=${_src_dest%:*}
 		_dst=mozc/src/third_party/${_src_dest#*:}
 		rmdir $_dst
 		ln -sr $_src-* $_dst
 	done
+}
 
-	if [ "$CROSS_BUILD" ]; then
-		# find fcitx4-config
-		sed -i -e "s;fcitx4-config;${XBPS_CROSS_BASE}/usr/bin/fcitx4-config;" mozc/src/unix/fcitx/fcitx.gyp
+post_patch() {
+	if [ "$XBPS_TARGET_LIBC" = musl ]; then
+		vsed -i -e 's|PTHREAD_MUTEX_RECURSIVE_NP|PTHREAD_MUTEX_RECURSIVE|g' base/mutex.cc
 	fi
 }
 
 do_configure() {
-	case "$XBPS_TARGET_MACHINE" in
-		*-musl) sed -i -e 's|PTHREAD_MUTEX_RECURSIVE_NP|PTHREAD_MUTEX_RECURSIVE|g' base/mutex.cc ;;
-	esac
 	GYP_DEFINES="
 	 document_dir=/usr/share/licenses/${pkgname}
 	 use_libprotobuf=1
 	 use_libzinnia=1
-	" python2 build_mozc.py gyp --target_platform=Linux
+	" python3 build_mozc.py gyp --target_platform=Linux
 }
 
 do_build() {
-	local targets
-	targets="
-	 server/server.gyp:mozc_server
-	 gui/gui.gyp:mozc_tool
-	 unix/emacs/emacs.gyp:mozc_emacs_helper
-	 unix/ibus/ibus.gyp:ibus_mozc
-	 renderer/renderer.gyp:mozc_renderer
-	 unix/fcitx/fcitx.gyp:fcitx-mozc
-	"
-	python2 build_mozc.py build -c Release $targets
+	python3 build_mozc.py build -c Release \
+		server/server.gyp:mozc_server \
+		gui/gui.gyp:mozc_tool \
+		unix/emacs/emacs.gyp:mozc_emacs_helper \
+		unix/ibus/ibus.gyp:ibus_mozc \
+		renderer/renderer.gyp:mozc_renderer \
+		unix/fcitx/fcitx.gyp:fcitx-mozc \
+		unix/fcitx5/fcitx5.gyp:fcitx5-mozc
 
 	sed -i 's|/usr/libexec/|/usr/lib/ibus-mozc/|g' out_linux/Release/gen/unix/ibus/mozc.xml
 }
@@ -82,15 +83,16 @@ do_install() {
 	vinstall out_linux/Release/mozc_server 755 usr/lib/mozc
 	vinstall out_linux/Release/mozc_tool 755 usr/lib/mozc
 
-	head -n 29 server/mozc_server.cc > LICENSE
-	for i in LICENSE data/installer/*.html; do
-		vlicense "$i"
-	done
+	head -n 29 unix/fcitx5/fcitx_key_translator.cc >mozc.LICENSE
+	vlicense mozc.LICENSE
+	vlicense data/installer/credits_en.html
+	vlicense third_party/japanese_usage_dictionary/LICENSE dict.LICENSE
 }
 
 ibus-mozc_package() {
 	short_desc="Mozc engine for IBus - Client of the Mozc input method"
 	depends="${sourcepkg}-${version}_${revision} ibus>=1.5.14"
+	lib32disabled=yes
 	pkg_install() {
 		vinstall out_linux/Release/ibus_mozc 755 usr/lib/ibus-mozc ibus-engine-mozc
 		vinstall out_linux/Release/gen/unix/ibus/mozc.xml 644 usr/share/ibus/component
@@ -105,6 +107,7 @@ ibus-mozc_package() {
 emacs-mozc_package() {
 	pkgdesc="Mozc for Emacs"
 	depends="${sourcepkg}-${version}_${revision} emacs"
+	lib32disabled=yes
 	pkg_install() {
 		vbin out_linux/Release/mozc_emacs_helper
 		vinstall unix/emacs/mozc.el 644 usr/share/emacs/site-lisp/emacs-mozc
@@ -115,10 +118,40 @@ fcitx-mozc_package() {
 	short_desc="Mozc engine for fcitx - Client of the Mozc input method"
 	depends="${sourcepkg}-${version}_${revision} fcitx>=4.2.9"
 	homepage="https://fcitx-im.org/"
-	license="GPL-2.0-or-later"
+	lib32disabled=yes
 	pkg_install() {
+		local _file _lang
 		vinstall out_linux/Release/fcitx-mozc.so 644 usr/lib/fcitx
 		vinstall unix/fcitx/fcitx-mozc.conf 644 usr/share/fcitx/addon
 		vinstall unix/fcitx/mozc.conf 644 usr/share/fcitx/inputmethod
+		vinstall data/images/unix/ime_product_icon_opensource-32.png \
+			644 usr/share/fcitx/icon mozc.png
+		for _file in out_linux/Release/gen/unix/fcitx/po/*.mo
+		do
+			_lang=${_file##*/}
+			_lang=${_lang%.mo}
+			vinstall "$_file" 644 usr/share/locale/$_lang fcitx-mozc.mo
+		done
+	}
+}
+
+fcitx5-mozc_package() {
+	short_desc="Mozc engine for fcitx v5"
+	depends="${sourcepkg}-${version}_${revision} fcitx5"
+	homepage="https://fcitx-im.org/"
+	lib32disabled=yes
+	pkg_install() {
+		local _file _lang
+		vinstall out_linux/Release/fcitx5-mozc.so 644 usr/lib/fcitx5
+		vinstall unix/fcitx5/mozc-addon.conf 644 \
+			usr/share/fcitx5/addon mozc.conf
+		vinstall unix/fcitx5/mozc.conf 644 usr/share/fcitx5/inputmethod
+		for _file in unix/fcitx5/po/*.po
+		do
+			_lang=${_file##*/}
+			_lang=${_lang%.po}
+			vmkdir usr/share/locale/$_lang
+			msgfmt "$_file" -o $PKGDESTDIR/usr/share/locale/$_lang/fcitx5-mozc.mo
+		done
 	}
 }
diff --git a/srcpkgs/mozc/update b/srcpkgs/mozc/update
new file mode 100644
index 000000000000..5a7df464ba79
--- /dev/null
+++ b/srcpkgs/mozc/update
@@ -0,0 +1,2 @@
+# Google never tags any releases.
+ignore="*"

From 5f4061f2eda355d087d6c20265f866fc85692a2c 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, 1 May 2021 10:07:53 +0700
Subject: [PATCH 1905/2024] mozc: fix build with platform not have atomic8_*

---
 srcpkgs/mozc/patches/latomic.patch | 150 +++++++++++++++++++++++++++++
 srcpkgs/mozc/template              |   5 +
 2 files changed, 155 insertions(+)
 create mode 100644 srcpkgs/mozc/patches/latomic.patch

diff --git a/srcpkgs/mozc/patches/latomic.patch b/srcpkgs/mozc/patches/latomic.patch
new file mode 100644
index 000000000000..2a30432a821e
--- /dev/null
+++ b/srcpkgs/mozc/patches/latomic.patch
@@ -0,0 +1,150 @@
+Index: mozc/src/gui/gui.gyp
+===================================================================
+--- mozc/src/gui/gui.gyp.orig
++++ mozc/src/gui/gui.gyp
+@@ -790,6 +790,13 @@
+             'tool/mozc_tool_main_noqt.cc',
+           ],
+         }],
++        ['use_libatomic==1', {
++          'link_settings': {
++            'libraries': [
++              '-latomic',
++            ],
++          },
++        }],
+         # For Mac, ConfigDialog is the host app for necessary frameworks.
+         ['OS=="win"', {
+           'product_name': '<(tool_product_name_win)',
+Index: mozc/src/gyp/defines.gypi
+===================================================================
+--- mozc/src/gyp/defines.gypi.orig
++++ mozc/src/gyp/defines.gypi
+@@ -68,6 +68,9 @@
+     # use_libibus represents if ibus library is used or not.
+     # This option is only for Linux.
+     'use_libibus%': '0',
++
++    # use_libatomic represents if libatomic is required or not
++    'use_libatomic%': '0',
+   },
+   'target_defaults': {
+     'defines': [
+Index: mozc/src/renderer/renderer.gyp
+===================================================================
+--- mozc/src/renderer/renderer.gyp.orig
++++ mozc/src/renderer/renderer.gyp
+@@ -592,6 +592,15 @@
+             '../base/base.gyp:crash_report_handler',
+             'mozc_renderer_lib',
+           ],
++          'conditions': [
++            ['use_libatomic==1', {
++              'link_settings': {
++                'libraries': [
++                  '-latomic',
++                ],
++              },
++            }],
++          ],
+         },
+         {
+           'target_name': 'gtk_renderer_test',
+Index: mozc/src/server/server.gyp
+===================================================================
+--- mozc/src/server/server.gyp.orig
++++ mozc/src/server/server.gyp
+@@ -55,6 +55,13 @@
+         'mozc_server_lib',
+       ],
+       'conditions': [
++        ['use_libatomic==1', {
++          'link_settings': {
++            'libraries': [
++              '-latomic',
++            ],
++          },
++        }],
+         ['OS=="mac"', {
+           'product_name': '<(branding)Converter',
+           'sources': [
+Index: mozc/src/unix/emacs/emacs.gyp
+===================================================================
+--- mozc/src/unix/emacs/emacs.gyp.orig
++++ mozc/src/unix/emacs/emacs.gyp
+@@ -46,6 +46,15 @@
+         '../../protocol/protocol.gyp:config_proto',
+         'mozc_emacs_helper_lib',
+       ],
++      'conditions': [
++        ['use_libatomic==1', {
++          'link_settings': {
++            'libraries': [
++              '-latomic',
++            ],
++          },
++        }],
++      ],
+     },
+     {
+       'target_name': 'mozc_emacs_helper_lib',
+Index: mozc/src/unix/fcitx/fcitx.gyp
+===================================================================
+--- mozc/src/unix/fcitx/fcitx.gyp.orig
++++ mozc/src/unix/fcitx/fcitx.gyp
+@@ -98,6 +98,15 @@
+       'defines': [
+         'LOCALEDIR="/usr/share/locale/"',
+       ],
++      'conditions': [
++        ['use_libatomic==1', {
++          'link_settings': {
++            'libraries': [
++              '-latomic',
++            ],
++          },
++        }],
++      ],
+     },
+   ],
+   }, {
+Index: mozc/src/unix/fcitx5/fcitx5.gyp
+===================================================================
+--- mozc/src/unix/fcitx5/fcitx5.gyp.orig
++++ mozc/src/unix/fcitx5/fcitx5.gyp
+@@ -105,6 +105,15 @@
+       'defines': [
+         'FCITX_GETTEXT_DOMAIN="fcitx5-mozc"',
+       ],
++      'conditions': [
++        ['use_libatomic==1', {
++          'link_settings': {
++            'libraries': [
++              '-latomic',
++            ],
++          },
++        }],
++      ],
+     },
+   ],
+   }, {
+Index: mozc/src/unix/ibus/ibus.gyp
+===================================================================
+--- mozc/src/unix/ibus/ibus.gyp.orig
++++ mozc/src/unix/ibus/ibus.gyp
+@@ -239,6 +239,15 @@
+         'ibus_mozc_lib',
+         'ibus_mozc_metadata',
+       ],
++      'conditions': [
++        ['use_libatomic==1', {
++          'link_settings': {
++            'libraries': [
++              '-latomic',
++            ],
++          },
++        }],
++      ],
+     },
+     {
+       'target_name': 'ibus_mozc_test',
diff --git a/srcpkgs/mozc/template b/srcpkgs/mozc/template
index 1a78d407f471..bcab66eeaf11 100644
--- a/srcpkgs/mozc/template
+++ b/srcpkgs/mozc/template
@@ -37,6 +37,10 @@ if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	broken="Does not build"
 fi
 
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+fi
+
 post_extract() {
 	mv mozc-* mozc
 
@@ -63,6 +67,7 @@ do_configure() {
 	 document_dir=/usr/share/licenses/${pkgname}
 	 use_libprotobuf=1
 	 use_libzinnia=1
+	 ${XBPS_TARGET_NO_ATOMIC8:+use_libatomic=1}
 	" python3 build_mozc.py gyp --target_platform=Linux
 }
 

From ce7e72cff158ab5f047336265d71a1fc2e914192 Mon Sep 17 00:00:00 2001
From: Sora Morimoto <sora@morimoto.io>
Date: Sat, 1 May 2021 10:40:57 +0900
Subject: [PATCH 1906/2024] terraform-ls: update to 0.16.1

Signed-off-by: Sora Morimoto <sora@morimoto.io>
---
 srcpkgs/terraform-ls/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/terraform-ls/template b/srcpkgs/terraform-ls/template
index 4b83363eb3ae..27576807d2b2 100644
--- a/srcpkgs/terraform-ls/template
+++ b/srcpkgs/terraform-ls/template
@@ -1,6 +1,6 @@
 # Template file for 'terraform-ls'
 pkgname=terraform-ls
-version=0.15.0
+version=0.16.1
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/$pkgname"
@@ -9,7 +9,7 @@ maintainer="Sora Morimoto <sora@morimoto.io>"
 license="MPL-2.0"
 homepage="https://github.com/hashicorp/terraform-ls"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=1efa538816c8678fe1e1243bdd99b913056d64826d631dfd7a6795c37573ed97
+checksum=e466d782fd1e2bede2f90e5677e1fd18df4a23476ebb08212502a3e955667736
 
 post_install() {
 	vlicense LICENSE

From 0467b0908005845f8fdda42c4b6ec8770d9763df Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 1 May 2021 11:25:36 +0200
Subject: [PATCH 1907/2024] mcelog: update to 176.

---
 srcpkgs/mcelog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mcelog/template b/srcpkgs/mcelog/template
index 0e0d77b4b7a4..3c7ce0131db7 100644
--- a/srcpkgs/mcelog/template
+++ b/srcpkgs/mcelog/template
@@ -1,6 +1,6 @@
 # Template file for 'mcelog'
 pkgname=mcelog
-version=175
+version=176
 revision=1
 archs="i686* x86_64*"
 conf_files="/etc/mcelog/mcelog.conf"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="http://www.mcelog.org/"
 distfiles="https://github.com/andikleen/${pkgname}/archive/v${version}.tar.gz"
-checksum=ed25a39bb20178e79e18cc5d3202b198868986ec3e964b6285f6a7bac8469fdf
+checksum=995a88c19b640f9de7755581bf3bb37d2315a949f39f06870e88f50e147487a4
 
 do_build() {
 	make CC=$CC CFLAGS="$CFLAGS $LDFLAGS" ${makejobs}

From 50122427cbe9e88f7b39e79b16382467e7125b1b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 1 May 2021 11:26:50 +0200
Subject: [PATCH 1908/2024] xlbiff: update to 4.5.2.

---
 srcpkgs/xlbiff/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xlbiff/template b/srcpkgs/xlbiff/template
index 563bc5830192..7dc9ba798055 100644
--- a/srcpkgs/xlbiff/template
+++ b/srcpkgs/xlbiff/template
@@ -1,6 +1,6 @@
 # Template file for 'xlbiff'
 pkgname=xlbiff
-version=4.5.1
+version=4.5.2
 revision=1
 build_style=gnu-configure
 configure_args="--with-xmhformdir=/etc/nmh"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="http://www.edsantiago.com/xlbiff/"
 distfiles="https://github.com/edsantiago/xlbiff/archive/${version}.tar.gz"
-checksum=96e72a0f30452d39ee9b37b4147cf89681b31546fb4fec607324349531f744cd
+checksum=f1da27a0cd526100d60f7087d6c88a90a0fef21412bcb7e536a85df0be381e20
 
 pre_configure() {
 	autoreconf -fi

From 87b07a7bd063c4052bda2b7a007cbbbd566df892 Mon Sep 17 00:00:00 2001
From: Gadzhi Kharkharov <me@kkga.me>
Date: Wed, 28 Apr 2021 23:55:10 +0300
Subject: [PATCH 1909/2024] wlsunset: generate man page

---
 .../patches/fix-scdoc-cross-compiling.patch   | 55 +++++++++++++++++++
 srcpkgs/wlsunset/template                     |  5 +-
 2 files changed, 58 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/wlsunset/patches/fix-scdoc-cross-compiling.patch

diff --git a/srcpkgs/wlsunset/patches/fix-scdoc-cross-compiling.patch b/srcpkgs/wlsunset/patches/fix-scdoc-cross-compiling.patch
new file mode 100644
index 000000000000..f9189f0e700d
--- /dev/null
+++ b/srcpkgs/wlsunset/patches/fix-scdoc-cross-compiling.patch
@@ -0,0 +1,55 @@
+From 7be432057f268fff6e68928f3c3f3b4b70d67368 Mon Sep 17 00:00:00 2001
+From: Kenny Levinsen <kl@kl.wtf>
+Date: Fri, 30 Apr 2021 20:02:02 +0200
+Subject: [PATCH] meson: Copy seatd's scdoc handling
+
+This fixes cross-compiling, and avoids unnecessary search for a shell.
+---
+ meson.build | 13 +++++--------
+ 1 file changed, 5 insertions(+), 8 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 23d24c5..9a02caf 100644
+--- a/meson.build
++++ b/meson.build
+@@ -3,7 +3,7 @@ project(
+ 	'c',
+ 	version: '0.2.0',
+ 	license: 'MIT',
+-	meson_version: '>=0.53.0',
++	meson_version: '>=0.56.0',
+ 	default_options: [
+ 		'c_std=c11',
+ 		'warning_level=3',
+@@ -56,16 +56,13 @@ executable(
+ 	install: true,
+ )
+ 
+-scdoc = dependency('scdoc', required: get_option('man-pages'), version: '>= 1.9.7')
++scdoc = dependency('scdoc', required: get_option('man-pages'), version: '>= 1.9.7', native: true)
+ 
+ if scdoc.found()
+-	sh = find_program('sh')
+-
+-	man_pages = ['wlsunset.1.scd']
+-
++	scdoc_prog = find_program(scdoc.get_variable(pkgconfig: 'scdoc'), native: true)
+ 	mandir = get_option('mandir')
+ 
+-	foreach src : man_pages
++	foreach src : ['wlsunset.1.scd']
+ 		topic = src.split('.')[0]
+ 		section = src.split('.')[1]
+ 		output = '@0@.@1@'.format(topic, section)
+@@ -75,7 +72,7 @@ if scdoc.found()
+ 			input: src,
+ 			output: output,
+ 			command: [
+-				sh, '-c', '@0@ < @INPUT@ > @1@'.format(scdoc.get_pkgconfig_variable('scdoc'), output)
++				'sh', '-c', '@0@ < @INPUT@ > @1@'.format(scdoc_prog.full_path(), output)
+ 			],
+ 			install: true,
+ 			install_dir: '@0@/man@1@'.format(mandir, section)
+-- 
+2.30.2
+
diff --git a/srcpkgs/wlsunset/template b/srcpkgs/wlsunset/template
index 3c5cc4170a20..5ec0aa3d8c45 100644
--- a/srcpkgs/wlsunset/template
+++ b/srcpkgs/wlsunset/template
@@ -1,9 +1,9 @@
 # Template file for 'wlsunset'
 pkgname=wlsunset
 version=0.2.0
-revision=1
+revision=2
 build_style=meson
-hostmakedepends="pkg-config wayland-devel"
+hostmakedepends="scdoc pkg-config wayland-devel"
 makedepends="pkg-config wayland-devel wayland-protocols"
 short_desc="Day/night gamma adjustments for Wayland compositors"
 maintainer="Duncaen <duncaen@voidlinux.org>"
@@ -11,6 +11,7 @@ license="MIT"
 homepage="https://sr.ht/~kennylevinsen/wlsunset/"
 distfiles="https://git.sr.ht/~kennylevinsen/wlsunset/archive/${version}.tar.gz"
 checksum=88bce695722a09d79545f14d404cc0659f7176bb08d5db5f4f23228b6ba8bb03
+patch_args=-Np1
 
 post_install() {
 	vlicense LICENSE

From 0a7ba4be6a35f5b970168f0863a7db2173110d6f Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Sat, 1 May 2021 12:17:20 +0200
Subject: [PATCH 1910/2024] python3-pikepdf: update to 2.11.4.

---
 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 d16b86b156a3..2db7128c706c 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.11.2
+version=2.11.4
 revision=2
 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=0958a07ebf12d62427babadd6a922409cb358d0415a5219a9269d8fab2aa487e
+checksum=7352ccda2eba78aab4d0e780de0ea4f7f84df0e6a5889ccc9b33d2aa6df3a54d
 
 pre_build() {
 	vsed -e '/setuptools_scm_git_archive/d' -i setup.py

From 520202673de54cd64d0eff7795959ab51a796d71 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 1 May 2021 10:02:44 -0400
Subject: [PATCH 1911/2024] endless-sky: update to 0.9.13.

---
 srcpkgs/endless-sky-data                |  1 -
 srcpkgs/endless-sky/patches/paths.patch | 22 +++++++++++-----------
 srcpkgs/endless-sky/template            | 14 ++++----------
 3 files changed, 15 insertions(+), 22 deletions(-)
 delete mode 120000 srcpkgs/endless-sky-data

diff --git a/srcpkgs/endless-sky-data b/srcpkgs/endless-sky-data
deleted file mode 120000
index 9931a47c7f60..000000000000
--- a/srcpkgs/endless-sky-data
+++ /dev/null
@@ -1 +0,0 @@
-endless-sky
\ No newline at end of file
diff --git a/srcpkgs/endless-sky/patches/paths.patch b/srcpkgs/endless-sky/patches/paths.patch
index cf765e07cf9f..8516bdfb9391 100644
--- a/srcpkgs/endless-sky/patches/paths.patch
+++ b/srcpkgs/endless-sky/patches/paths.patch
@@ -1,15 +1,15 @@
---- SConstruct.old	2017-12-06 12:54:20.524502000 -0800
-+++ SConstruct	2017-12-12 12:39:21.764384877 -0800
-@@ -18,7 +18,7 @@
- 	env.Append(LINKFLAGS = ["-static-libstdc++"])
- 
- opts = Variables()
--opts.Add(PathVariable("PREFIX", "Directory to install under", "/usr/local", PathVariable.PathIsDirCreate))
-+opts.Add(PathVariable("PREFIX", "Directory to install under", "/usr", PathVariable.PathIsDirCreate))
- opts.Add(PathVariable("DESTDIR", "Destination root directory", "", PathVariable.PathAccept))
- opts.Add(EnumVariable("mode", "Compilation mode", "release", allowed_values=("release", "debug", "profile")))
+--- SConstruct
++++ SConstruct
+@@ -41,7 +41,7 @@
+ 	PathVariable("BUILDDIR", "Directory to store compiled object files in", "build", PathVariable.PathIsDirCreate),
+ 	PathVariable("BIN_DIR", "Directory to store binaries in", ".", PathVariable.PathIsDirCreate),
+ 	PathVariable("DESTDIR", "Destination root directory, e.g. if building a package", "", PathVariable.PathAccept),
+-	PathVariable("PREFIX", "Directory to install under (will be prefixed by DESTDIR)", "/usr/local", PathVariable.PathIsDirCreate),
++	PathVariable("PREFIX", "Directory to install under (will be prefixed by DESTDIR)", "/usr", PathVariable.PathIsDirCreate),
+ )
  opts.Update(env)
-@@ -66,7 +66,7 @@
+ Help(opts.GenerateHelpText(env))
+@@ -150,7 +150,7 @@
  
  
  # Install the binary:
diff --git a/srcpkgs/endless-sky/template b/srcpkgs/endless-sky/template
index bb0215fd6f0f..11927a76afe6 100644
--- a/srcpkgs/endless-sky/template
+++ b/srcpkgs/endless-sky/template
@@ -1,7 +1,7 @@
 # Template file for 'endless-sky'
 pkgname=endless-sky
-version=0.9.12
-revision=3
+version=0.9.13
+revision=1
 build_style=scons
 makedepends="SDL2-devel glew-devel libjpeg-turbo-devel libmad-devel
  libopenal-devel libpng-devel"
@@ -11,11 +11,5 @@ maintainer="CoolOhm <micvlas@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="http://endless-sky.github.io/"
 distfiles="https://github.com/endless-sky/endless-sky/archive/v${version}.tar.gz"
-checksum=31f76ac11666415478678d924174d43a620a7fd1093e95131776aed12b912eb4
-
-endless-sky-data_package() {
-	short_desc+=" - data files"
-	pkg_install() {
-		vmove usr/share/games/endless-sky
-	}
-}
+checksum=001c8a28bbec7491f2725fbaa52b1ade813d33cec2d16521f241c80d04685b9d
+replaces="endless-sky-data>=0"

From 0cdde51332e9bfe641ee3f5903b2ce1d0462b781 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 30 Apr 2021 22:17:06 -0400
Subject: [PATCH 1912/2024] New package: python3-matplotlib-inline-0.1.2

The inline matplotlib logic in python3-ipython has been refactored into
this separate package that is needed for proper notebook functionality.
---
 srcpkgs/python3-matplotlib-inline/template | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 srcpkgs/python3-matplotlib-inline/template

diff --git a/srcpkgs/python3-matplotlib-inline/template b/srcpkgs/python3-matplotlib-inline/template
new file mode 100644
index 000000000000..82eccf890a57
--- /dev/null
+++ b/srcpkgs/python3-matplotlib-inline/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-matplotlib-inline'
+pkgname=python3-matplotlib-inline
+version=0.1.2
+revision=1
+_pypkg="${pkgname#python3-}"
+wrksrc="${_pypkg}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-traitlets"
+short_desc="Inline Matplotlib backend for Jupyter"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/ipython/matplotlib-inline"
+distfiles="${PYPI_SITE}/m/${_pypkg}/${_pypkg}-${version}.tar.gz"
+checksum=f41d5ff73c9f5385775d5c0bc13b424535c8402fe70ea8210f93e11f3683993e
+# No tests are shipped
+make_check=no
+
+post_install() {
+	vlicense LICENSE
+}

From 898727cf2acb1431ab889a619267b6111c014d9c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 30 Apr 2021 22:19:29 -0400
Subject: [PATCH 1913/2024] python3-ipython: update to 7.23.0.

---
 srcpkgs/python3-ipython/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-ipython/template b/srcpkgs/python3-ipython/template
index 0d1f20a5366d..bf1b012ed3a3 100644
--- a/srcpkgs/python3-ipython/template
+++ b/srcpkgs/python3-ipython/template
@@ -1,13 +1,13 @@
 # Template file for 'python3-ipython'
 pkgname=python3-ipython
-version=7.22.0
+version=7.23.0
 revision=1
 wrksrc="ipython-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-pickleshare python3-simplegeneric python3-traitlets
- python3-pexpect python3-prompt_toolkit python3-Pygments python3-jedi
- python3-backcall"
+depends="python3-setuptools python3-jedi python3-decorator python3-pickleshare
+ python3-traitlets python3-prompt_toolkit python3-Pygments python3-backcall
+ python3-matplotlib-inline python3-pexpect"
 checkdepends="$depends python3-pytest python3-nose python3-matplotlib
  python3-requests python3-testpath python3-numpy python3-ipython_ipykernel
  python3-jupyter_nbformat python3-Pygments python3-Pillow"
@@ -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=9c900332d4c5a6de534b4befeeb7de44ad0cc42e8327fa41b7685abde58cec74
+checksum=69178f32bf9c6257430b6f592c3ae230c32861a1966d2facec454e09078e232d
 conflicts="python-ipython<=5.8.0_2"
 
 post_install() {

From 763d35bc07d3aa6a91b97fe2efb701fa1663e138 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 1 May 2021 10:19:12 -0400
Subject: [PATCH 1914/2024] endless-sky: remove stale -data dependency

---
 srcpkgs/endless-sky/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/endless-sky/template b/srcpkgs/endless-sky/template
index 11927a76afe6..00583361ce76 100644
--- a/srcpkgs/endless-sky/template
+++ b/srcpkgs/endless-sky/template
@@ -1,11 +1,10 @@
 # Template file for 'endless-sky'
 pkgname=endless-sky
 version=0.9.13
-revision=1
+revision=2
 build_style=scons
 makedepends="SDL2-devel glew-devel libjpeg-turbo-devel libmad-devel
  libopenal-devel libpng-devel"
-depends="${pkgname}-data"
 short_desc="Space exploring, trading, and combat game"
 maintainer="CoolOhm <micvlas@gmail.com>"
 license="GPL-3.0-or-later"

From 365a4264b7f966b17ea6f225eb114b0d01487abb Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 1 May 2021 20:49:08 +0200
Subject: [PATCH 1915/2024] linux5.10: fix ppc-dotconfig

---
 srcpkgs/linux5.10/files/ppc-dotconfig | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/linux5.10/files/ppc-dotconfig b/srcpkgs/linux5.10/files/ppc-dotconfig
index 32cef8a304dc..7fbdd540c4fc 100644
--- a/srcpkgs/linux5.10/files/ppc-dotconfig
+++ b/srcpkgs/linux5.10/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.10.28 Kernel Configuration
+# Linux/powerpc 5.10.33 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -8,6 +8,8 @@ CONFIG_GCC_VERSION=100201
 CONFIG_LD_VERSION=235010000
 CONFIG_CLANG_VERSION=0
 CONFIG_LLD_VERSION=0
+CONFIG_CC_CAN_LINK=y
+CONFIG_CC_CAN_LINK_STATIC=y
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_IRQ_WORK=y
@@ -531,6 +533,7 @@ CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
 # end of GCOV-based kernel profiling
 
 CONFIG_HAVE_GCC_PLUGINS=y
+# CONFIG_GCC_PLUGINS is not set
 # end of General architecture-dependent options
 
 CONFIG_RT_MUTEXES=y

From c6b6b9fb104f68ebbd634703478e05af045eccde Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 1 May 2021 20:59:17 +0200
Subject: [PATCH 1916/2024] linux4.19: fix ppc-dotconfig

---
 srcpkgs/linux4.19/files/ppc-dotconfig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/linux4.19/files/ppc-dotconfig b/srcpkgs/linux4.19/files/ppc-dotconfig
index 489d1fbb5b32..26333a498bb8 100644
--- a/srcpkgs/linux4.19/files/ppc-dotconfig
+++ b/srcpkgs/linux4.19/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.19.185 Kernel Configuration
+# Linux/powerpc 4.19.189 Kernel Configuration
 #
 
 #
@@ -540,8 +540,9 @@ CONFIG_ARCH_HAS_PHYS_TO_DMA=y
 #
 # CONFIG_GCOV_KERNEL is not set
 CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
-CONFIG_PLUGIN_HOSTCC=""
+CONFIG_PLUGIN_HOSTCC="g++"
 CONFIG_HAVE_GCC_PLUGINS=y
+# CONFIG_GCC_PLUGINS is not set
 CONFIG_RT_MUTEXES=y
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
@@ -5598,7 +5599,6 @@ CONFIG_SPEAKUP_SYNTH_DUMMY=m
 # CONFIG_KS7010 is not set
 # CONFIG_GREYBUS is not set
 # CONFIG_PI433 is not set
-# CONFIG_MTK_MMC is not set
 
 #
 # Gasket devices

From e7dcd280886c516b7ade29415e06b136a59db446 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 1 May 2021 21:13:25 +0200
Subject: [PATCH 1917/2024] libtls: update to 3.2.5.

---
 srcpkgs/libtls/template | 6 +++---
 srcpkgs/libtls/update   | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
index 070ee2d34fd3..cd46d748bb03 100644
--- a/srcpkgs/libtls/template
+++ b/srcpkgs/libtls/template
@@ -1,7 +1,7 @@
 # Template file for 'libtls'
 pkgname=libtls
-version=3.2.4
-revision=2
+version=3.2.5
+revision=1
 wrksrc="libressl-${version}"
 build_style=gnu-configure
 configure_args="$(vopt_enable asm)"
@@ -13,7 +13,7 @@ license="OpenSSL, ISC"
 homepage="http://www.libressl.org/"
 changelog="https://raw.githubusercontent.com/libressl-portable/portable/master/ChangeLog"
 distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${version}.tar.gz"
-checksum=ac1dbb9e05a64910856599b1ac61118fdec1b3d0c700e42444d81c0d5f507a5a
+checksum=798a65fd61d385e09d559810cdfa46512f8def5919264cfef241a7b086ce7cfe
 _lssl_asm_ver="1.2.0"
 replaces="libtls20>0"
 
diff --git a/srcpkgs/libtls/update b/srcpkgs/libtls/update
index a5d5038a8320..db3a272cb32e 100644
--- a/srcpkgs/libtls/update
+++ b/srcpkgs/libtls/update
@@ -1 +1,2 @@
 ignore="*.0 *.1"
+pattern='libressl-\K[.\d]+'

From 9ea3bafa528f836e738244eb1bc0f0b53a6d16a3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 1 May 2021 16:23:34 -0400
Subject: [PATCH 1918/2024] python3-ipython: fix broken matplotlib_inline
 import

---
 srcpkgs/python3-ipython/patches/mpl_inline_fix.patch | 12 ++++++++++++
 srcpkgs/python3-ipython/template                     |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/python3-ipython/patches/mpl_inline_fix.patch

diff --git a/srcpkgs/python3-ipython/patches/mpl_inline_fix.patch b/srcpkgs/python3-ipython/patches/mpl_inline_fix.patch
new file mode 100644
index 000000000000..4526ce4af0e7
--- /dev/null
+++ b/srcpkgs/python3-ipython/patches/mpl_inline_fix.patch
@@ -0,0 +1,12 @@
+diff --git IPython/core/pylabtools.py IPython/core/pylabtools.py
+index c71b0cdb6..bb815956e 100644
+--- IPython/core/pylabtools.py
++++ IPython/core/pylabtools.py
+@@ -383,6 +383,6 @@ def configure_inline_support(shell, backend):
+         stacklevel=2,
+     )
+ 
+-    from matplotlib_inline.backend_inline import configure_inline_support_orig
++    from matplotlib_inline.backend_inline import configure_inline_support as configure_inline_support_orig
+ 
+     configure_inline_support_orig(shell, backend)
diff --git a/srcpkgs/python3-ipython/template b/srcpkgs/python3-ipython/template
index bf1b012ed3a3..671614a92a1d 100644
--- a/srcpkgs/python3-ipython/template
+++ b/srcpkgs/python3-ipython/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-ipython'
 pkgname=python3-ipython
 version=7.23.0
-revision=1
+revision=2
 wrksrc="ipython-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"

From 858df3367c1a72815291a12259566adf3eea0ecf Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 2 May 2021 11:10:45 +0000
Subject: [PATCH 1919/2024] nano: update to 5.7.

---
 srcpkgs/nano/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nano/template b/srcpkgs/nano/template
index 980beca9d68e..16808dc277e1 100644
--- a/srcpkgs/nano/template
+++ b/srcpkgs/nano/template
@@ -1,6 +1,6 @@
 # Template file for 'nano'
 pkgname=nano
-version=5.6.1
+version=5.7
 revision=1
 build_style=gnu-configure
 configure_args="--enable-utf8"
@@ -11,7 +11,7 @@ license="GPL-3.0-or-later"
 homepage="https://www.nano-editor.org/"
 changelog="http://git.savannah.gnu.org/cgit/nano.git/plain/NEWS"
 distfiles="https://www.nano-editor.org/dist/v${version%%.*}/nano-${version}.tar.xz"
-checksum=760d7059e0881ca0ee7e2a33b09d999ec456ff7204df86bee58eb6f523ee8b09
+checksum=d4b181cc2ec11def3711b4649e34f2be7a668e70ab506860514031d069cccafa
 
 post_install() {
 	vsconf syntax/nanorc.nanorc

From 2b40c8ce3a2100552424204c26a5f731b86c33ec Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 2 May 2021 12:24:08 +0200
Subject: [PATCH 1920/2024] qemu: update to 6.0.0.

---
 ...l.c-define-__SIGRTMIN-MAX-for-non-GN.patch | 27 ++++++++++--
 .../qemu/patches/ignore-sys-signal_h.patch    | 17 --------
 srcpkgs/qemu/patches/mmap-mremap-efault.patch | 41 -------------------
 srcpkgs/qemu/template                         |  6 +--
 4 files changed, 26 insertions(+), 65 deletions(-)
 delete mode 100644 srcpkgs/qemu/patches/ignore-sys-signal_h.patch
 delete mode 100644 srcpkgs/qemu/patches/mmap-mremap-efault.patch

diff --git a/srcpkgs/qemu/patches/0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch b/srcpkgs/qemu/patches/0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch
index 4acb8e070ce4..9da918e4345f 100644
--- a/srcpkgs/qemu/patches/0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch
+++ b/srcpkgs/qemu/patches/0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch
@@ -1,7 +1,23 @@
-Updated version of 0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch for qemu-3.0.0
-from alpine, original author Natanael Copa.
---- linux-user/signal.c	2019-08-22 19:46:40.369463327 +0200
-+++ linux-user/signal.c	2019-08-22 19:47:25.176898649 +0200
+From 8fbb4e6797ed67310b74cbaaa061269db45a5b71 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Tue, 29 Apr 2014 15:51:31 +0200
+Subject: [PATCH] linux-user/signal.c: define __SIGRTMIN/MAX for non-GNU
+ platforms
+
+The __SIGRTMIN and __SIGRTMAX are glibc internals and are not available
+on all platforms, so we define those if they are missing.
+
+This is needed for musl libc.
+
+Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
+---
+ linux-user/signal.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/linux-user/signal.c b/linux-user/signal.c
+index 5ca6d62b15..e917c16d91 100644
+--- linux-user/signal.c
++++ linux-user/signal.c
 @@ -25,6 +25,13 @@
  #include "trace.h"
  #include "signal-common.h"
@@ -16,3 +32,6 @@ from alpine, original author Natanael Copa.
  static struct target_sigaction sigact_table[TARGET_NSIG];
  
  static void host_signal_handler(int host_signum, siginfo_t *info,
+-- 
+2.23.0
+
diff --git a/srcpkgs/qemu/patches/ignore-sys-signal_h.patch b/srcpkgs/qemu/patches/ignore-sys-signal_h.patch
deleted file mode 100644
index 088a0e654c06..000000000000
--- a/srcpkgs/qemu/patches/ignore-sys-signal_h.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: Not needed. For glibc this has just #include <signal.h> and for musl it prints a warning.
-
---- include/qemu/osdep.h	2020-12-08 17:59:44.000000000 +0100
-+++ include/qemu/osdep.h	2020-12-12 18:41:47.709685865 +0100
-@@ -104,10 +104,6 @@
- #include <setjmp.h>
- #include <signal.h>
- 
--#ifdef HAVE_SYS_SIGNAL_H
--#include <sys/signal.h>
--#endif
--
- #ifndef _WIN32
- #include <sys/wait.h>
- #else
diff --git a/srcpkgs/qemu/patches/mmap-mremap-efault.patch b/srcpkgs/qemu/patches/mmap-mremap-efault.patch
deleted file mode 100644
index a5eaa7906c82..000000000000
--- a/srcpkgs/qemu/patches/mmap-mremap-efault.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: errno=EFAULT when the address passed to mremap(2) is not valid
-
-See Rich Felker's comment at https://www.openwall.com/lists/musl/2017/06/21/2 for
-why we need to return errno as described in man mremap(2) from qemu-user-static.
-Also speed up the loop when checking for increasing the mappings size to go
-in steps of TARGET_PAGE_SIZE and OR-in a check for the very last byte of the range.
-
---- linux-user/mmap.c	2019-04-23 20:14:46.000000000 +0200
-+++ linux-user/mmap.c	2019-06-30 16:31:26.545637450 +0200
-@@ -692,7 +692,7 @@
-     if (!guest_range_valid(old_addr, old_size) ||
-         ((flags & MREMAP_FIXED) &&
-          !guest_range_valid(new_addr, new_size))) {
--        errno = ENOMEM;
-+        errno = EFAULT;
-         return -1;
-     }
- 
-@@ -728,9 +728,10 @@
-             abi_ulong addr;
-             for (addr = old_addr + old_size;
-                  addr < old_addr + new_size;
--                 addr++) {
-+                 addr += TARGET_PAGE_SIZE) {
-                 prot |= page_get_flags(addr);
-             }
-+            prot |= page_get_flags(old_addr + new_size - 1);
-         }
-         if (prot == 0) {
-             host_addr = mremap(g2h(old_addr), old_size, new_size, flags);
-@@ -738,7 +739,7 @@
-                 mmap_reserve(old_addr + old_size, new_size - old_size);
-             }
-         } else {
--            errno = ENOMEM;
-+            errno = EFAULT;
-             host_addr = MAP_FAILED;
-         }
-         /* Check if address fits target address space */
diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template
index 83e43ff5cbae..75f57bac755d 100644
--- a/srcpkgs/qemu/template
+++ b/srcpkgs/qemu/template
@@ -1,8 +1,8 @@
 # Template file for 'qemu'
 # This package should be updated together with qemu-user-static
 pkgname=qemu
-version=5.2.0
-revision=2
+version=6.0.0
+revision=1
 build_style=configure
 hostmakedepends="gettext pkg-config perl python3 automake libtool flex
  python3-Sphinx texinfo ninja"
@@ -23,7 +23,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.qemu.org"
 distfiles="https://wiki.qemu.org/download/qemu-${version}.tar.bz2"
-checksum=7bd9334c02edaf02f5b0b52beb19fe7f72556c3ca0180e20f0095f0ef2f25f14
+checksum=7d306a03c67c0b667d21b55e1b172f5e55a9af5ee09cbd739fb2395aeca7860c
 ignore_elf_dirs="/usr/share/qemu"
 nostrip_files="hppa-firmware.img openbios-ppc openbios-sparc32 openbios-sparc64
  palcode-clipper s390-ccw.img s390-netboot.img u-boot.e500 opensbi-riscv32-generic-fw_dynamic.elf

From 3a535dcfc39f78e2f700d215506bc828a1f6d37e Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 2 May 2021 13:21:35 +0200
Subject: [PATCH 1921/2024] qemu-user-static: update to 6.0.0.

---
 srcpkgs/qemu-user-static/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qemu-user-static/template b/srcpkgs/qemu-user-static/template
index 396eaeb30591..c6870e38d263 100644
--- a/srcpkgs/qemu-user-static/template
+++ b/srcpkgs/qemu-user-static/template
@@ -1,8 +1,8 @@
 # Template file for 'qemu-user-static'
 # This package should be updated together with qemu
 pkgname=qemu-user-static
-version=5.2.0
-revision=2
+version=6.0.0
+revision=1
 wrksrc="qemu-${version}"
 build_style=configure
 hostmakedepends="pkg-config automake python3 ninja"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.qemu.org"
 distfiles="https://wiki.qemu.org/download/qemu-${version}.tar.bz2"
-checksum=7bd9334c02edaf02f5b0b52beb19fe7f72556c3ca0180e20f0095f0ef2f25f14
+checksum=7d306a03c67c0b667d21b55e1b172f5e55a9af5ee09cbd739fb2395aeca7860c
 
 _fmts="aarch64 aarch64_be alpha arm armeb cris hppa i386 m68k microblaze
  microblazeel mips mipsel mips64 mips64el mipsn32 mipsn32el or1k

From a5d2ef24aa34417743b5ed0fc69d24096884abed Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 2 May 2021 15:49:12 +0200
Subject: [PATCH 1922/2024] cloc: update to 1.90.

---
 srcpkgs/cloc/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/cloc/template b/srcpkgs/cloc/template
index cf2d1f35d3f3..893b7afa89d7 100644
--- a/srcpkgs/cloc/template
+++ b/srcpkgs/cloc/template
@@ -1,15 +1,15 @@
 # Template file for 'cloc'
 pkgname=cloc
-version=1.88
-revision=2
+version=1.90
+revision=1
 hostmakedepends="perl"
 depends="perl"
 short_desc="Count Lines of Code"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/AlDanial/cloc"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=e85c2d1b3ec389d892955cf20b3fa5c797e81136e231d9a09e4f4c62e272f8cd
+distfiles="https://github.com/AlDanial/cloc/archive/v${version}.tar.gz"
+checksum=60b429dd2aa5cd65707b359dcbcbeb710c8e4db880886528ced0962c67e52548
 
 do_build() {
 	make -C Unix man

From b5a4049a54c277dc326eb6c6d6b3b89280ad6da5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 2 May 2021 16:11:44 +0200
Subject: [PATCH 1923/2024] python3-pwntools: update to 4.5.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 e55396f0b064..cd8cb3e74172 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.4.0
+version=4.5.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=c51605b538c6394c6c31bc90bb3436224b497be1fe21a0a2420785ca399087e3
+checksum=2161cca2b480486fe9a3c89bd70852df13eea145250f4b5b6d6237e432364886
 
 post_install() {
 	rm -f ${DESTDIR}/usr/lib/python*/site-packages/*.md

From 34de83a188246fa77b2b33c921d565e84596677b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 2 May 2021 16:14:45 +0200
Subject: [PATCH 1924/2024] linux5.10: update to 5.10.34.

---
 srcpkgs/linux5.10/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 4e1423e09098..ddcc5f176e25 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.33
+version=5.10.34
 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=933fdbc36371c0f830b7a6a957a559fca2dad1cc0eaa852ef42fb168185b4315
+checksum=6eeeb7e005bd1d4eb8b10382a35f8cd54ee6692c244ab1362590fa539f3d6582
 python_version=3
 patch_args="-Np1"
 

From 13c4af48aa4114f7ca39c8eb959ee82126774e71 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 2 May 2021 11:06:42 +0000
Subject: [PATCH 1925/2024] skopeo: update to 1.2.3.

---
 srcpkgs/skopeo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/skopeo/template b/srcpkgs/skopeo/template
index cac6e3832eb3..9e9a53ff851d 100644
--- a/srcpkgs/skopeo/template
+++ b/srcpkgs/skopeo/template
@@ -1,6 +1,6 @@
 # Template file for 'skopeo'
 pkgname=skopeo
-version=1.2.2
+version=1.2.3
 revision=1
 build_style=go
 go_import_path="github.com/containers/${pkgname}"
@@ -14,7 +14,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://github.com/containers/skopeo"
 distfiles="https://github.com/containers/${pkgname}/archive/v${version}.tar.gz"
-checksum=b9adf2c209f49f79568cd69ee063bac1d61db20d277c20f189784fe39945a0ad
+checksum=bb62a226ad9427aaa0789c429e7f91de9caa8e284ed9227709751cc7d76a0591
 make_dirs="/var/lib/atomic/sigstore 0755 root root"
 
 post_build() {

From eed664425495b3d1c7af60dc26a13de1cb603f6b Mon Sep 17 00:00:00 2001
From: Jaume Devesa <jaume@mailbox.org>
Date: Sun, 2 May 2021 12:54:18 +0200
Subject: [PATCH 1926/2024] sfeed_curses: update to 0.9.11

---
 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 2ae38ed80866..3e649cb7e5b5 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.10
+version=0.9.11
 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=d64a64116cd16ba00c592ca08a8d545d2fa91c2cf9cf8673e2f0b6c7b101b2db
+checksum=17885597096c4a1f2146ba2a0b7a439c1deeb814092c4f721e6570506b32a382
 
 post_install() {
 	vlicense LICENSE

From 1f67d894b67d21e1f55011e93b53a5169e4159a1 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 2 May 2021 11:05:16 +0000
Subject: [PATCH 1927/2024] oil: update to 0.8.10.

---
 srcpkgs/oil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/oil/template b/srcpkgs/oil/template
index 69ea84476e67..ee8ea0497566 100644
--- a/srcpkgs/oil/template
+++ b/srcpkgs/oil/template
@@ -1,6 +1,6 @@
 # Template file for 'oil'
 pkgname=oil
-version=0.8.7
+version=0.8.10
 revision=1
 build_style=configure
 configure_args="--prefix=/usr $(vopt_with readline)"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://www.oilshell.org"
 distfiles="${homepage}/download/${pkgname}-${version}.tar.xz"
-checksum=29c5eed6efccbef6c22dbe5aec3d3d36f7c93da7a8d1cf19fc2cee93b5d1db73
+checksum=11307c062ae512aae8f0251d44cf80b19fee8056bf7e3e76c0257da489ef301d
 register_shell="/usr/bin/osh"
 nocross="Build systems gets confused with host and cross toolchains/headers"
 nostrip=yes

From 64fc609584af55ce41f9523775a4c976d721cc7d Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 2 May 2021 11:03:13 +0000
Subject: [PATCH 1928/2024] celluloid: update to 0.21.

---
 srcpkgs/celluloid/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/celluloid/template b/srcpkgs/celluloid/template
index 1ad41decbe8b..0af4a804504d 100644
--- a/srcpkgs/celluloid/template
+++ b/srcpkgs/celluloid/template
@@ -1,6 +1,6 @@
 # Template file for 'celluloid'
 pkgname=celluloid
-version=0.20
+version=0.21
 revision=1
 build_style=meson
 hostmakedepends="gettext glib-devel pkg-config"
@@ -10,7 +10,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://celluloid-player.github.io/"
 distfiles="https://github.com/${pkgname}-player/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.xz"
-checksum=63798c4cd7da818aef3ddbfed64d67a6db7b14d3774d143db18cefc6aed8524e
+checksum=2299d8cc1a5a620cc3686495da22ac4ccd6dd020827d9dd27e19a61d83707eb7
 
 gnome-mpv_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 5fa8c661b77b444404494e6e7b5402f145f055d0 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sun, 2 May 2021 11:02:01 +0000
Subject: [PATCH 1929/2024] kid3: update to 3.8.6.

---
 srcpkgs/kid3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 3291fe4b1e81..e916cbabed1e 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,6 +1,6 @@
 # Template file for 'kid3'
 pkgname=kid3
-version=3.8.5
+version=3.8.6
 revision=1
 build_style=cmake
 configure_args="-DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
@@ -19,7 +19,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="GPL-2.0-only"
 homepage="https://kid3.kde.org"
 distfiles="${SOURCEFORGE_SITE}/kid3/kid3-${version}.tar.gz"
-checksum=0c467927541e9dd8172758016778742f0b154cb2f5bcfce727b35cfbdee3141f
+checksum=71ef8c58227302737ebbed3b7f476f9f48e76ea894952d916dc33d9c08f96e08
 
 build_options="KDE mp3 mp4 flac vorbis taglib chromaprint"
 build_options_default="mp3 mp4 flac vorbis taglib chromaprint"

From 16c8d3c060a8a975c12e59ff887c7d6010c18c36 Mon Sep 17 00:00:00 2001
From: Gadzhi Kharkharov <me@kkga.me>
Date: Sun, 2 May 2021 11:17:27 +0300
Subject: [PATCH 1930/2024] zoxide: update to 0.7.0.

---
 srcpkgs/zoxide/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zoxide/template b/srcpkgs/zoxide/template
index 22756463b592..f8f8a804618b 100644
--- a/srcpkgs/zoxide/template
+++ b/srcpkgs/zoxide/template
@@ -1,6 +1,6 @@
 # Template file for 'zoxide'
 pkgname=zoxide
-version=0.6.0
+version=0.7.0
 revision=1
 build_style=cargo
 short_desc="Faster way to navigate your filesystem"
@@ -8,8 +8,11 @@ maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"
 homepage="https://github.com/ajeetdsouza/zoxide"
 distfiles="https://github.com/ajeetdsouza/zoxide/archive/v${version}.tar.gz"
-checksum=fe93aa4d1fe8d4f94b302335f30bc543c7a1664df2a3fde73e6253c74f576c35
+checksum=9a9b0aa82a647fa834e4ade483af292e50080758af25c5260c425420879d9691
 
 post_install() {
 	vlicense LICENSE
+	for f in man/*; do
+		vman $f
+	done
 }

From 7b56a8af511392455d9e4f7eb26246b3147dfcba Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sat, 1 May 2021 16:39:03 +0200
Subject: [PATCH 1931/2024] perl-CryptX: update to 0.072

---
 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 57e4a4306081..3ba6d0af545d 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.071
+version=0.072
 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=7249132e3452fa326d02f242d714a3ede0cca021442bed4fae644d94b0b649be
+checksum=162ffb9306e90dab4743a5b22ede21a53e09de2200d0ea35bd4f13744a161706

From 818cdbb8460a61775ade0a69d7491807434b91ed Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 1 May 2021 06:23:09 +0300
Subject: [PATCH 1932/2024] calibre: update to 5.17.0.

---
 srcpkgs/calibre/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 9546f815e3bd..e5b069b18cef 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,6 +1,6 @@
 # Template file for 'calibre'
 pkgname=calibre
-version=5.16.1
+version=5.17.0
 revision=1
 build_style=python3-module
 pycompile_dirs="/usr/lib/calibre/"
@@ -27,7 +27,7 @@ license="GPL-3.0-only"
 homepage="https://calibre-ebook.com"
 changelog="https://raw.githubusercontent.com/kovidgoyal/calibre/master/Changelog.txt"
 distfiles="https://download.calibre-ebook.com/${version}/calibre-${version}.tar.xz"
-checksum=9535c25b430634e7b379c6863bd736246538ca5c293e605a3174d8de72cd72b1
+checksum=add8812f7637abfd3015f5861388c69166a4815f2103d1e30dc297b28ead56bb
 lib32disabled=yes
 nocross=yes
 

From 9b964e2292d50f9bcb81dc524b6e77edbec09de6 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sat, 1 May 2021 13:03:12 +0000
Subject: [PATCH 1933/2024] yad: update to 9.3.

---
 srcpkgs/yad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yad/template b/srcpkgs/yad/template
index 9e16e76f7a73..c6008b33dfb8 100644
--- a/srcpkgs/yad/template
+++ b/srcpkgs/yad/template
@@ -1,6 +1,6 @@
 # Template file for 'yad'
 pkgname=yad
-version=9.1
+version=9.3
 revision=1
 build_style=gnu-configure
 configure_args="--enable-icon-browser"
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/v1cont/yad"
 changelog="https://raw.githubusercontent.com/v1cont/yad/master/NEWS"
 distfiles="https://github.com/v1cont/yad/releases/download/v${version}/yad-${version}.tar.xz"
-checksum=288142d338c055d3839083d8146c6f270bd5a17f78ff9cd2a3c41a8cf31a0e92
+checksum=d5ca05d7658ac45490f1b49e15d24acd2c2011d88dab3f8dab0431ae9f493319
 
 pre_configure() {
 	autoreconf -ivf

From 181e5a43e5a406c63ca956a4c760db76160019cd Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sat, 1 May 2021 13:22:18 +0000
Subject: [PATCH 1934/2024] amber: update to 0.5.9.

---
 srcpkgs/amber/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/amber/template b/srcpkgs/amber/template
index ef529dfc10a6..7befc2ca47cb 100644
--- a/srcpkgs/amber/template
+++ b/srcpkgs/amber/template
@@ -1,6 +1,6 @@
 # Template file for 'amber'
 pkgname=amber
-version=0.5.8
+version=0.5.9
 revision=1
 build_style=cargo
 short_desc="Code search/replace tool"
@@ -8,7 +8,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://github.com/dalance/amber"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=f12e0b176273e011209e7d8613d1b9a049e50aeb536871c1f6c05a9d6a494935
+checksum=bf974e997fffa0d54463fc85e44f054563372ca4dade50099fb6ecec0ca8c483
 
 post_install() {
 	vlicense LICENSE

From dd24f7c960a15839425497baba09e5d0c3702c99 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sat, 1 May 2021 16:22:24 +0200
Subject: [PATCH 1935/2024] New package: gtkdatabox3-1.0.0

---
 common/shlibs                |  1 +
 srcpkgs/gtkdatabox3-devel    |  1 +
 srcpkgs/gtkdatabox3/template | 26 ++++++++++++++++++++++++++
 3 files changed, 28 insertions(+)
 create mode 120000 srcpkgs/gtkdatabox3-devel
 create mode 100644 srcpkgs/gtkdatabox3/template

diff --git a/common/shlibs b/common/shlibs
index c39878238889..995c9750a41f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3916,6 +3916,7 @@ libsimavrparts.so.1 simavr-1.6_2
 libsword-1.8.1.so libsword-1.8.1_6
 libpari-gmp.so.7 pari-2.13.0_1
 libtree-sitter.so.0 tree-sitter-0.19.0_1
+libgtkdatabox.so.1 gtkdatabox3-1.0.0_1
 libwayland-client++.so.0 libwaylandpp-0.2.8_1
 libwayland-cursor++.so.0 libwaylandpp-0.2.8_1
 libwayland-egl++.so.0 libwaylandpp-0.2.8_1
diff --git a/srcpkgs/gtkdatabox3-devel b/srcpkgs/gtkdatabox3-devel
new file mode 120000
index 000000000000..78e11676000a
--- /dev/null
+++ b/srcpkgs/gtkdatabox3-devel
@@ -0,0 +1 @@
+gtkdatabox3
\ No newline at end of file
diff --git a/srcpkgs/gtkdatabox3/template b/srcpkgs/gtkdatabox3/template
new file mode 100644
index 000000000000..21d4dcd57561
--- /dev/null
+++ b/srcpkgs/gtkdatabox3/template
@@ -0,0 +1,26 @@
+# Template file for 'gtkdatabox3'
+pkgname=gtkdatabox3
+version=1.0.0
+revision=1
+wrksrc="gtkdatabox-${version}"
+build_style=gnu-configure
+hostmakedepends="pkg-config"
+makedepends="gtk+3-devel"
+short_desc="GTK+-Widget for fast data display"
+maintainer="newbluemoon <blaumolch@mailbox.org>"
+license="GPL-3.0-or-later"
+homepage="https://gtkdatabox3.sourceforge.io/"
+distfiles="${SOURCEFORGE_SITE}/gtkdatabox3/gtkdatabox-${version}.tar.gz"
+checksum=7add2cd8fb4209f3970dbd33f5238e25b43f6251e7534607bf926c7c6175e14b
+
+gtkdatabox3-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/share
+	}
+}

From 48ed061c732b4cd4fc8edf982035bf7c6872ef6a Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sat, 1 May 2021 16:23:25 +0200
Subject: [PATCH 1936/2024] klavaro: update to 3.12

---
 srcpkgs/klavaro/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/klavaro/template b/srcpkgs/klavaro/template
index 6b8cd84c19fa..ade9aa51ab4a 100644
--- a/srcpkgs/klavaro/template
+++ b/srcpkgs/klavaro/template
@@ -1,14 +1,14 @@
 # Template file for 'klavaro'
 pkgname=klavaro
-version=3.11
+version=3.12
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="intltool pkg-config"
-makedepends="gtk+3-devel libcurl-devel"
+makedepends="gtk+3-devel gtkdatabox3-devel libcurl-devel"
 short_desc="Touch typing tutor"
 maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="GPL-3.0-or-later"
 homepage="http://klavaro.sourceforge.net/en/"
 distfiles="${SOURCEFORGE_SITE}/klavaro/klavaro-${version}.tar.bz2"
-checksum=fc64d3bf9548a5d55af1ba72912024107883a918b95ae60cda95706116567de6
+checksum=c450e27f07d5e7d57818a5a8d428cacad7c17a28dcabe0c2e5694a4fe9abb97a

From edb0b7191afb4181b58e6dd18a308de09aea67a5 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Sat, 1 May 2021 17:48:39 +0300
Subject: [PATCH 1937/2024] hugo: update to 0.83.0

---
 srcpkgs/hugo/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index 88b46c4c244e..3c1ab0105527 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,7 +1,7 @@
 # Template file for 'hugo'
 pkgname=hugo
-version=0.82.1
-revision=3
+version=0.83.0
+revision=1
 build_style=go
 go_import_path="github.com/gohugoio/hugo"
 go_build_tags="extended"
@@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://gohugo.io"
 distfiles="https://github.com/gohugoio/hugo/archive/v${version}.tar.gz"
-checksum=3190ae848fdb1a04339c233faab5934c422d85cf85ea3b0c0b5a842239c84e75
+checksum=c22bbbf4f3e12bced1b6b73ed1b31f45b9123c3d37ccacf2d899c06aa07550a9
 
 post_install() {
 	vdoc README.md

From c139d39de4bc7934e40b63969220a8c5551f7e50 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Sat, 1 May 2021 22:34:56 +0200
Subject: [PATCH 1938/2024] git-toolbelt: update to 1.6.0.

---
 srcpkgs/git-toolbelt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-toolbelt/template b/srcpkgs/git-toolbelt/template
index b3e8202d3e22..1998841827ce 100644
--- a/srcpkgs/git-toolbelt/template
+++ b/srcpkgs/git-toolbelt/template
@@ -1,6 +1,6 @@
 # Template file for 'git-toolbelt'
 pkgname=git-toolbelt
-version=1.5.1
+version=1.6.0
 revision=1
 depends="git moreutils fzf"
 short_desc="Helper tools to make everyday life with Git much easier"
@@ -8,7 +8,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/nvie/git-toolbelt"
 distfiles="https://github.com/nvie/git-toolbelt/archive/v${version}.tar.gz"
-checksum=0fe8551fe5f9c05aaa566aba6f94667240cb0f6221a3c8d0d8cccff31244b1a8
+checksum=@8b0d689fcbda5148d0c8728b542fb691e7bbb91ba438f57db67e7f740819e526
 conflicts="git-extras"
 
 do_install() {

From ccce9f980ad1a545c03ec7a28945bda267117460 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Sat, 1 May 2021 18:01:42 +0300
Subject: [PATCH 1939/2024] oksh: update to 6.9

---
 srcpkgs/oksh/patches/cross.patch | 2 +-
 srcpkgs/oksh/template            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/oksh/patches/cross.patch b/srcpkgs/oksh/patches/cross.patch
index 0382ba8d35a7..df00dc4df1d8 100644
--- a/srcpkgs/oksh/patches/cross.patch
+++ b/srcpkgs/oksh/patches/cross.patch
@@ -1,6 +1,6 @@
 --- configure.orig
 +++ configure
-@@ -582,7 +582,7 @@
+@@ -932,7 +932,7 @@
  fi
  
  printf "checking for C compiler... "
diff --git a/srcpkgs/oksh/template b/srcpkgs/oksh/template
index ff2d3d321a7d..84e6085f54f0 100644
--- a/srcpkgs/oksh/template
+++ b/srcpkgs/oksh/template
@@ -1,6 +1,6 @@
 # Template file for 'oksh'
 pkgname=oksh
-version=6.8.1
+version=6.9
 revision=1
 build_style=gnu-configure
 makedepends="ncurses-devel"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="https://github.com/ibara/oksh"
 distfiles="https://github.com/ibara/oksh/releases/download/oksh-${version}/oksh-${version}.tar.gz"
-checksum=ddd2b27b99009a4ee58ddf58da73edf83962018066ccf33b2fe1f570a00917b0
+checksum=c08d97b2ac9ee5d88e9e508d27c75502b2d06c20d4c5ab87b496cb3b9951bd35
 register_shell="/bin/oksh"
 
 alternatives="

From eeb2c9c55b39cdf5d2e50f29e7a97995edfa4524 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Sun, 2 May 2021 18:50:23 +0300
Subject: [PATCH 1940/2024] hugo: update to 0.83.1

---
 srcpkgs/hugo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index 3c1ab0105527..09710e9fe8c9 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,6 +1,6 @@
 # Template file for 'hugo'
 pkgname=hugo
-version=0.83.0
+version=0.83.1
 revision=1
 build_style=go
 go_import_path="github.com/gohugoio/hugo"
@@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://gohugo.io"
 distfiles="https://github.com/gohugoio/hugo/archive/v${version}.tar.gz"
-checksum=c22bbbf4f3e12bced1b6b73ed1b31f45b9123c3d37ccacf2d899c06aa07550a9
+checksum=2abc273ffb79576c9347c80d443154db26be9ae15b6ae66f9b75056c3a285157
 
 post_install() {
 	vdoc README.md

From 169dab79aeb78a55a84b6c60c0315418af41ec89 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 30 Apr 2021 23:09:45 +0200
Subject: [PATCH 1941/2024] openradtool: update to 0.12.8.

---
 srcpkgs/openradtool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openradtool/template b/srcpkgs/openradtool/template
index 3ded299505d0..5e3bf13f83bb 100644
--- a/srcpkgs/openradtool/template
+++ b/srcpkgs/openradtool/template
@@ -1,6 +1,6 @@
 # Template file for 'openradtool'
 pkgname=openradtool
-version=0.12.7
+version=0.12.8
 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=366657ecd0b417ba1293a946ec05f7372d561aac7d2566504809608fdf5f6baa
+checksum=bf877b1db23f84a897c9c2223aa9ad360a63089b01620f26a7bb9b680cac27d8
 
 post_install() {
 	sed -n '2,16p' main.c >LICENSE

From ae2333698c5228f29b9d6ab1817afbde7e635a85 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Mon, 3 May 2021 02:57:54 +0300
Subject: [PATCH 1942/2024] font-iosevka: update to 6.1.2

---
 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 e87a1837b5cb..768b5b7ebd9f 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
 # Template file for 'font-iosevka'
 pkgname=font-iosevka
-version=6.0.1
+version=6.1.2
 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}/super-ttc-iosevka-${version}.zip
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-slab-${version}.zip"
 checksum="72c3d557ff41d871680652f56afd565ba6834c90eadc45a4ec15410dce1c0c80
- 644b3b5695151228657af0df2fd3c8af85d31d01ef3625b603f8d9776754bb6f
- b7f58505f408ed8fafa3312198d06e1312ee6b96eac1456a2597cc4e0a2ca221"
+ 2415cfa67462a913c4e6e4d55f7fa3b64ed0c57694013704579dc18fb925b874
+ 721ab82b60e0168d12731938ec97e0632f8608fd7c6f098ad991946ca1280cd5"
 
 font_dirs="/usr/share/fonts/TTF"
 

From 57abebf8fb4003e2651f280019ff06443af77b71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 30 Apr 2021 19:02:03 -0300
Subject: [PATCH 1943/2024] 0ad: disable generation of -32bit package.

The resulting 0ad-32bit package only contains internal libraries used by
the game.
---
 srcpkgs/0ad/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index ba58de90f397..d6bbdb483101 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,7 +1,7 @@
 # Template file for '0ad'
 pkgname=0ad
 version=0.0.24b
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* armv7l* ppc64le*"
 wrksrc="${pkgname}-${version}-alpha"
 hostmakedepends="pkg-config perl cmake python3 rust cargo yasm tar clang"
@@ -16,6 +16,7 @@ homepage="https://play0ad.com"
 distfiles="https://releases.wildfiregames.com/${pkgname}-${version}-alpha-unix-build.tar.xz"
 checksum=325c23c9b6bfc16eb636af6a7a7bdaadbf19214b6eed0422d74cc0090bf137a8
 nocross="uses bundled third-party libraries that do not cross-compile"
+lib32disabled=yes
 
 CXXFLAGS="-fpermissive"
 # Use BFD linker to avoid erroneous detection of llvm pr8927 with *-musl

From e51710e7a9b2d6c61730ec345b2df8841806a5b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 27 Apr 2021 13:49:28 -0300
Subject: [PATCH 1944/2024] firefox: build with nodejs-lts.

---
 srcpkgs/firefox/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 338a2bb5b9e8..bba9994c2a91 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -16,7 +16,7 @@ checksum=6b50dbfb393f843e4401e23965a1d8f7fd44b5a7628d95138294094094eee297
 lib32disabled=yes
 
 hostmakedepends="autoconf213 unzip zip pkg-config perl python3 yasm rust cargo
- llvm clang nodejs-lts-10 cbindgen python nasm which tar"
+ llvm clang nodejs-lts cbindgen python nasm which tar"
 makedepends="nss-devel libjpeg-turbo-devel gtk+-devel gtk+3-devel icu-devel
  pixman-devel libevent-devel libnotify-devel libvpx-devel
  libXrender-devel libXcomposite-devel libSM-devel libXt-devel rust-std

From 84113279a727e1c0457f62e33ef32211ab4f1a6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 27 Apr 2021 13:49:58 -0300
Subject: [PATCH 1945/2024] firefox-esr: build with nodejs-lts.

---
 srcpkgs/firefox-esr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index fbd9ed2fb8ec..e4ea57638c2c 100644
--- a/srcpkgs/firefox-esr/template
+++ b/srcpkgs/firefox-esr/template
@@ -8,7 +8,7 @@ revision=1
 wrksrc="firefox-${version}"
 build_helper="rust qemu"
 hostmakedepends="autoconf213 unzip zip pkg-config perl python3 yasm rust cargo
- llvm clang nodejs-lts-10 cbindgen python nasm which tar"
+ llvm clang nodejs-lts cbindgen python nasm which tar"
 makedepends="nss-devel libjpeg-turbo-devel gtk+-devel gtk+3-devel icu-devel
  pixman-devel libevent-devel libnotify-devel libvpx-devel
  libXrender-devel libXcomposite-devel libSM-devel libXt-devel rust-std

From c06df78c9764f45cba9d94e1e66c5d190c1234de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 27 Apr 2021 13:47:28 -0300
Subject: [PATCH 1946/2024] thunderbird: build with nodejs-lts.

Working towards removal of nodejs-lts-10.
---
 srcpkgs/thunderbird/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index d65081d6ba32..0c28c456532c 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -16,7 +16,7 @@ checksum=65d79a557027a3b52cc672ab9aea8da7131e6373f94657d03f6d6b9c7b36fb45
 lib32disabled=yes
 
 hostmakedepends="autoconf213 unzip zip pkg-config perl python3 yasm rust cargo
- llvm clang nodejs-lts-10 cbindgen python nasm which tar"
+ llvm clang nodejs-lts cbindgen python nasm which tar"
 makedepends="nss-devel libjpeg-turbo-devel gtk+-devel gtk+3-devel icu-devel
  pixman-devel libevent-devel libnotify-devel libvpx-devel
  libXrender-devel libXcomposite-devel libSM-devel libXt-devel rust-std

From 92c86aca9c40b251e295b636b1548a3d67cc659b Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 27 Apr 2021 09:13:01 +0200
Subject: [PATCH 1947/2024] glib-networking: update to 2.68.1.

---
 srcpkgs/glib-networking/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/glib-networking/template b/srcpkgs/glib-networking/template
index fdb7fbfe8d1a..e2cec4da596b 100644
--- a/srcpkgs/glib-networking/template
+++ b/srcpkgs/glib-networking/template
@@ -1,6 +1,6 @@
 # Template file for 'glib-networking'
 pkgname=glib-networking
-version=2.68.0
+version=2.68.1
 revision=1
 build_style=meson
 configure_args="-Dinstalled_tests=false -Dgnutls=enabled -Dlibproxy=enabled
@@ -14,7 +14,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/glib-networking/"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0b235e85ad26b3c0d12255d0963c460e5a639c4722f78e2a03e969e224b29f6e
+checksum=d05d8bd124a9f53fc2b93b18f2386d512e4f48bc5a80470a7967224f3bf53b30
 lib32disabled=yes
 
 post_install() {

From 31eeafb12db04507bc51055af0053f71d26c9c2c Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 20 Apr 2021 09:41:51 +0200
Subject: [PATCH 1948/2024] bolt: update to 0.9.1.

---
 srcpkgs/bolt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bolt/template b/srcpkgs/bolt/template
index 70a3aeb5827a..20bccb2c3e09 100644
--- a/srcpkgs/bolt/template
+++ b/srcpkgs/bolt/template
@@ -1,6 +1,6 @@
 # Template file for 'bolt'
 pkgname=bolt
-version=0.9
+version=0.9.1
 revision=1
 build_style=meson
 configure_args="-Dman=true -Dsystemd=false"
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gitlab.freedesktop.org/bolt/bolt"
 distfiles="https://gitlab.freedesktop.org/bolt/bolt/-/archive/${version}/bolt-${version}.tar.gz"
-checksum=49fe4cb2cd3361fd104f9c2cd7cbbf791e867038590a968dc39377b27008969a
+checksum=f938db68df79d0ada135a055fd01204f6f3436e17e962dfb8dc6699de77e1895
 patch_args="-Np1"
 
 CFLAGS="-fcommon"

From 9dacb01285718f80daf164eaf6212c804aeb4d83 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Mon, 3 May 2021 02:51:31 +0300
Subject: [PATCH 1949/2024] font-sarasa-gothic: update to 0.31.1

---
 srcpkgs/font-sarasa-gothic/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/font-sarasa-gothic/template b/srcpkgs/font-sarasa-gothic/template
index 9d689359f0e6..26d2eaa693ab 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.31.0
+version=0.31.1
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -9,7 +9,7 @@ maintainer="B. Wilson <x@wilsonb.com>"
 license="OFL-1.1"
 homepage="https://github.com/be5invis/Sarasa-Gothic"
 distfiles="https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"
-checksum=4d6e520500fef185461457aad8f397fd1f9407b9624cbeff50999650a3f525af
+checksum=893dcad279711cc541a143f4ba2356ee1b8e3ff4ed203a2da00601879adda913
 
 font_dirs="/usr/share/fonts/TTF"
 

From 9e3b851599c5221f1c23528726efec91706d8d70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 2 May 2021 22:43:26 -0300
Subject: [PATCH 1950/2024] glib: update to 2.68.1.

---
 ...lations-on-a-second-load-to-glib-2-68.diff | 130 ------------------
 srcpkgs/glib/template                         |   4 +-
 2 files changed, 2 insertions(+), 132 deletions(-)
 delete mode 100644 srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff

diff --git a/srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff b/srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff
deleted file mode 100644
index d3da19b4e10d..000000000000
--- a/srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff
+++ /dev/null
@@ -1,130 +0,0 @@
-From 07ab2e26c937a93ae7389e002014e32aa78e4ec6 Mon Sep 17 00:00:00 2001
-From: Philip Withnall <pwithnall@endlessos.org>
-Date: Tue, 23 Mar 2021 16:27:49 +0000
-Subject: [PATCH 1/2] gkeyfile: Drop a redundant check
-
-It should not be possible for `->locales` to be set without
-`->checked_locales` being set, so drop the redundant check. This helps
-with branch code coverage.
-
-Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
----
- glib/gkeyfile.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git glib/gkeyfile.c glib/gkeyfile.c
-index 50859164b..06c4b7c47 100644
---- glib/gkeyfile.c
-+++ glib/gkeyfile.c
-@@ -1232,7 +1232,7 @@ g_key_file_locale_is_interesting (GKeyFile    *key_file,
-   if (key_file->flags & G_KEY_FILE_KEEP_TRANSLATIONS)
-     return TRUE;
- 
--  if (!key_file->checked_locales && !key_file->locales)
-+  if (!key_file->checked_locales)
-     {
-       key_file->locales = g_strdupv ((gchar **)g_get_language_names ());
-       key_file->checked_locales = TRUE;
--- 
-GitLab
-
-
-From 77649d3d3d94b7cd57cd165eb44105d7d196c2e4 Mon Sep 17 00:00:00 2001
-From: Philip Withnall <pwithnall@endlessos.org>
-Date: Tue, 23 Mar 2021 16:28:31 +0000
-Subject: [PATCH 2/2] gkeyfile: Fix crash when parsing translations on a second
- load
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-If the same `GKeyFile` is reused to load multiple different key files,
-any loads after the first which encounter translated keys will crash,
-because clearing the data from the first load cleared the cached
-language names, but didn’t clear `checked_locales`, so they were never
-reloaded.
-
-Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
-
-Fixes: #2361
----
- glib/gkeyfile.c      |  1 +
- glib/tests/keyfile.c | 43 +++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 44 insertions(+)
-
-diff --git glib/gkeyfile.c glib/gkeyfile.c
-index 06c4b7c47..0b58edb3f 100644
---- glib/gkeyfile.c
-+++ glib/gkeyfile.c
-@@ -648,6 +648,7 @@ g_key_file_clear (GKeyFile *key_file)
-       g_strfreev (key_file->locales);
-       key_file->locales = NULL;
-     }
-+  key_file->checked_locales = FALSE;
- 
-   if (key_file->parse_buffer)
-     {
-diff --git glib/tests/keyfile.c glib/tests/keyfile.c
-index 7530bc8c3..975ef8167 100644
---- glib/tests/keyfile.c
-+++ glib/tests/keyfile.c
-@@ -758,6 +758,48 @@ test_locale_string (void)
-   g_free (old_locale);
- }
- 
-+static void
-+test_locale_string_multiple_loads (void)
-+{
-+  GKeyFile *keyfile = NULL;
-+  GError *local_error = NULL;
-+  gchar *old_locale = NULL;
-+  guint i;
-+  const gchar *data =
-+    "[valid]\n"
-+    "key1=v1\n"
-+    "key1[de]=v1-de\n"
-+    "key1[de_DE]=v1-de_DE\n"
-+    "key1[de_DE.UTF8]=v1-de_DE.UTF8\n"
-+    "key1[fr]=v1-fr\n"
-+    "key1[en] =v1-en\n"
-+    "key1[sr@Latn]=v1-sr\n";
-+
-+  g_test_summary ("Check that loading with translations multiple times works");
-+  g_test_bug ("https://gitlab.gnome.org/GNOME/glib/-/issues/2361");
-+
-+  old_locale = g_strdup (setlocale (LC_ALL, NULL));
-+  g_setenv ("LANGUAGE", "de", TRUE);
-+  setlocale (LC_ALL, "");
-+
-+  keyfile = g_key_file_new ();
-+
-+  for (i = 0; i < 3; i++)
-+    {
-+      g_key_file_load_from_data (keyfile, data, -1, G_KEY_FILE_NONE, &local_error);
-+      g_assert_no_error (local_error);
-+
-+      check_locale_string_value (keyfile, "valid", "key1", "it", "v1");
-+      check_locale_string_value (keyfile, "valid", "key1", "de", "v1-de");
-+      check_locale_string_value (keyfile, "valid", "key1", "de_DE", "v1-de");
-+    }
-+
-+  g_key_file_free (keyfile);
-+
-+  setlocale (LC_ALL, old_locale);
-+  g_free (old_locale);
-+}
-+
- static void
- test_lists (void)
- {
-@@ -1791,6 +1833,7 @@ main (int argc, char *argv[])
-   g_test_add_func ("/keyfile/boolean", test_boolean);
-   g_test_add_func ("/keyfile/number", test_number);
-   g_test_add_func ("/keyfile/locale-string", test_locale_string);
-+  g_test_add_func ("/keyfile/locale-string/multiple-loads", test_locale_string_multiple_loads);
-   g_test_add_func ("/keyfile/lists", test_lists);
-   g_test_add_func ("/keyfile/lists-set-get", test_lists_set_get);
-   g_test_add_func ("/keyfile/group-remove", test_group_remove);
--- 
-GitLab
-
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index a412a0fb08a7..449f33846dcf 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,6 +1,6 @@
 # Template file for 'glib'
 pkgname=glib
-version=2.68.0
+version=2.68.1
 revision=1
 build_style=meson
 # static version is necessary for qemu-user-static;
@@ -16,7 +16,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GLib"
 changelog="https://gitlab.gnome.org/GNOME/glib/raw/master/NEWS"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=67734f584f3a05a2872f57e9a8db38f3b06c7087fb531c5a839d9171968103ea
+checksum=241654b96bd36b88aaa12814efc4843b578e55d47440103727959ac346944333
 
 build_options="gtk_doc"
 desc_option_gtk_doc="Build GTK API docs"

From 6f16a2507d6b1665f05be93bbf5e7ef3ec6d8176 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 27 Apr 2021 09:28:26 +0200
Subject: [PATCH 1951/2024] gtk+3: update to 3.24.29.

Enable tests to run, but they don't complete successfully yet.

Closes: #30537 [via git-merge-pr]
---
 srcpkgs/gtk+3/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gtk+3/template b/srcpkgs/gtk+3/template
index 60c6459b24b5..be97801ad473 100644
--- a/srcpkgs/gtk+3/template
+++ b/srcpkgs/gtk+3/template
@@ -1,7 +1,7 @@
 # Template file for 'gtk+3'
 # Revbump gtk-layer-shell when updating, otherwise it presents a warning message
 pkgname=gtk+3
-version=3.24.28
+version=3.24.29
 revision=1
 wrksrc="gtk+-${version}"
 build_style=gnu-configure
@@ -23,12 +23,13 @@ makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel
  $(vopt_if cloudproviders 'libcloudproviders-devel')"
 depends="gtk-update-icon-cache adwaita-icon-theme
  librsvg shared-mime-info $(vopt_if x11 'dbus-x11')"
+checkdepends="$depends xvfb-run dbus"
 short_desc="GTK+ toolkit (v3)"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gtk.org/"
 distfiles="${GNOME_SITE}/gtk+/${version%.*}/gtk+-${version}.tar.xz"
-checksum=b04e09763367f1ce932cd2ee3a359d4de150e1c38e7bef7d29aa72557a6b47c6
+checksum=f57ec4ade8f15cab0c23a80dcaee85b876e70a8823d9105f067ce335a8268caa
 
 # Package build options
 build_options="broadway colord cups gir cloudproviders wayland x11"
@@ -39,8 +40,8 @@ desc_option_cloudproviders="Enable integration with cloudproviders, such as Next
 build_options_default="colord cups gir broadway wayland x11"
 
 do_check() {
-	# Requires xserver running
-	:
+	# TODO: don't pass fully
+	xvfb-run dbus-run-session make ${makejobs} check
 }
 
 post_install() {

From 0a1e0ff1e68f239bf77537703c3a9516426fd438 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 3 May 2021 08:56:56 +0200
Subject: [PATCH 1952/2024] amdvlk: update to 2021.Q2.2.

---
 srcpkgs/amdvlk/template | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/amdvlk/template b/srcpkgs/amdvlk/template
index a525ce00ae11..a8b6d0c7fcb8 100644
--- a/srcpkgs/amdvlk/template
+++ b/srcpkgs/amdvlk/template
@@ -1,11 +1,11 @@
 # Template file for 'amdvlk'
 pkgname=amdvlk
-version=2021.Q2.1
+version=2021.Q2.2
 revision=1
-_llpc_commit=a8ec3c6e6372dcfd812a2ea592141a821e9584b1
-_xgl_commit=e1be7ee14c39d3a36d9d1aacd00caf3acc437cde
-_pal_commit=83635fbee82fb21662a4737e34437c41172c6fe0
-_llvm_project_commit=b0392f639492720b268697f4261aaccfa3459537
+_llpc_commit=28c4e99487ebe0a8b5801f56b876df6b33903554
+_xgl_commit=f1467f0dfd3dccd643214574ebfbe456a55d03bd
+_pal_commit=0168557a0715bf47a55ffe9858276cde1e74cc1d
+_llvm_project_commit=d2e97f4879565c9292f9177debbc7c65ead6ab84
 _spvgen_commit=59823e6c3557cb7f3fae4a9f2760ad3f6b694997
 _MetroHash_commit=3c566dd9cda44ca7fd97659e0b53ac953f9037d2
 _CWPack_commit=7387247eb9889ddcabbc1053b9c2052e253b088e
@@ -32,11 +32,11 @@ distfiles="https://github.com/GPUOpen-Drivers/AMDVLK/archive/v-${version}.tar.gz
  https://github.com/GPUOpen-Drivers/spvgen/archive/${_spvgen_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/MetroHash/archive/${_MetroHash_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/CWPack/archive/${_CWPack_commit}.tar.gz"
-checksum="c491929f959404527816ec9a88755916282aceeb191cd7bfb0440682e202e186
- f585fd7d43985cb396f8470781f80229018bedc96aae7939b979015ce1caf064
- a999ff6400b0e16b4f47dd9fb063b071ec5b8226f5bca84d58e6a9f52a36966c
- ad36dab535943239357fc6101e9d4be532e950366d97f761f8cb63a6f4ee755d
- 18665c4ba9bc80179315f18c877c3a9e9790e53e2ceb3090c03bc2510f30652e
+checksum="fab8c7db5600d418178d470d19b5507f8bd6166a1fca05abc595f77b2052865e
+ 0a9eacee11c53af5f3fe39d367571e55da9d20bc97d6a2bd8ccd32655c13db7f
+ 09f8c905367b57a9932a3bc7b5d013045906a515f1c8d34eea37e11ea3f71d38
+ a6450459e839c5ccf546b26115f831dcdc76a7878f91fc589a35bf258474b3a2
+ e108164d5f06412fe8be56afb8f393def6e1a280f511f82061852af9be4dd9b6
  124e37608f2ef49a980c3fff9cc73bcb154c9724ee00397e0dee6cc8cf1b4244
  cc8ff538fede25fe023984b3fde27f09b000bdc49793534794cd1d2bf881750a
  186060fbcf87165224ba7df0e1858b66ebc42cf190c481aef1df8d89ebab7abd"

From 896fc0265de6a96bf3dced4846f06d362a1212cf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Apr 2021 23:36:13 +0200
Subject: [PATCH 1953/2024] qt5: update to 5.15.3+20210429.

switch to the KDE patchset
---
 srcpkgs/qt5/template | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index c8e93578e94d..08c7badefa18 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,8 +1,7 @@
 # Template file for 'qt5'
 pkgname=qt5
-version=5.15.2
-revision=5
-wrksrc="qt-everywhere-src-${version}"
+version=5.15.3+20210429
+revision=1
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
  python re2c ruby which"
@@ -21,8 +20,12 @@ short_desc="Cross-platform application and UI framework (QT5)"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, LGPL-3.0-or-later"
 homepage="https://qt.io/"
-distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/single/qt-everywhere-src-${version}.tar.xz"
-checksum=3a530d1b243b5dec00bc54937455471aaa3e56849d2593edb8ded07228202240
+# https://pypi.org/project/git-archive-all
+# tarball is generated with `git archive-all qt5-$version.tar.gz`
+# to keep the size smaller qtwebengine, qtwebview, qtdocgallery, qtactiveqt and qtpim
+# can be marked with the export-ignore attribute
+distfiles="https://void.johnnynator.dev/distfiles/qt5-${version}.tar.gz"
+checksum=6936ecf7c35162832bde5b5685f24c0924868745983f030e377924c1d80f68d1
 python_version=2 #unverified
 replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0 qt5-webkit-devel<5.6.0
  qt5-enginio<5.7.1 qt5-enginio-devel<5.7.1 qt5-plugin-gtk<5.7.1 qt5-canvas3d<5.13.0"
@@ -170,6 +173,12 @@ _msg_cross() {
 	msg_normal "***************************************************\n"
 }
 
+post_extract() {
+	find -maxdepth 1 -type d -exec mkdir -p {}/.git \;
+	# just keep module_version at 5.15.2, since some external modules are still 5.15.2
+	find -maxdepth 1 -type d -exec sed -e "/^MODULE_VERSION/s/5.*/5.15.2/" -i {}/.qmake.conf \;
+}
+
 do_configure() {
 	local opts spec
 
@@ -184,11 +193,6 @@ do_configure() {
 			${wrksrc}/qtbase/mkspecs/common/gcc-base.conf
 		vsed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${XBPS_LDFLAGS}|" \
 			${wrksrc}/qtbase/mkspecs/common/g++-unix.conf
-
-		# Create symbolic links for private include directories
-		for d in $(ls ${wrksrc}/qtbase/include); do
-			ln -sfv ${version}/${d}/private qtbase/include/${d}/private
-		done
 	else
 		# qmake {CXX,L}FLAGS patches
 		vsed -i -e "s|^\(CXXFLAGS =.*\)|\1 ${CXXFLAGS}|" \
@@ -241,6 +245,9 @@ do_configure() {
 	# opts+=" -v"
 	opts+=" -skip qtwebengine"
 	opts+=" -skip qtwebview"
+	opts+=" -skip qtdocgallery"
+	opts+=" -skip qtpim"
+	opts+=" -skip qtsystems"
 	LDFLAGS+=" -Wl,--no-keep-memory"  # needs more than 8GB RAM else
 	if [ "$CROSS_BUILD" ]; then
 		spec=void-${XBPS_CROSS_TRIPLET}-g++

From ce8ec1ef5f1a017718b3c8511e5c71dd7aab17b9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 3 May 2021 12:55:04 +0200
Subject: [PATCH 1954/2024] kwin: rebuild against qt5.15.3

---
 srcpkgs/kwin/template | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index 0306c2416f00..4f0312a39da0 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -1,7 +1,7 @@
 # Template file for 'kwin'
 pkgname=kwin
 version=5.21.4
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext breeze pkg-config"
@@ -10,7 +10,7 @@ makedepends="plasma-framework-devel kcmutils-devel knewstuff-devel
  kdecoration-devel libxkbcommon-devel libinput-devel libSM-devel
  libICE-devel xcb-util-wm-devel qt5-sensors-devel libcap-devel lcms2-devel
  kwayland-server-devel $(vopt_if pipewire pipewire-devel) krunner-devel"
-depends="breeze hicolor-icon-theme kinit qt5-core>=5.15.2<5.15.3"
+depends="breeze hicolor-icon-theme kinit qt5-core>=5.15.2<5.16.0"
 short_desc="KDE Window manager"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
@@ -30,19 +30,6 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
-post_extract() {
-	_qt5_dep_ver="${depends#*>=}"
-	_qt5_dep_ver="${_qt5_dep_ver%<*}"
-	_qt5_version="$(xbps-uhelper version qt5-core)"
-
-	if [[ "${_qt5_version%_*}" != "${_qt5_dep_ver}" ]]; then
-		echo
-		msg_red "Qt5 version doesn't match version listed in \$depends\\n"
-		msg_red "${_qt5_version%_*} does not match ${_qt5_dep_ver}\\n"
-		exit 1
-	fi
-}
-
 kwin-devel_package() {
 	short_desc+=" - development"
 	depends="${makedepends} ${sourcepkg}-${version}_${revision}"

From 190c568db73639df73acf83442942cbddf00756f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 3 May 2021 12:55:15 +0200
Subject: [PATCH 1955/2024] telegram-desktop: rebuild against qt5.15.3

---
 srcpkgs/telegram-desktop/template | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 275c91163861..30a1d2ec6eec 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.4
-revision=1
+revision=2
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
 build_helper="qemu"
@@ -18,7 +18,7 @@ makedepends="alsa-lib-devel ffmpeg-devel libdbusmenu-glib-devel libopenal-devel
  MesaLib-devel libdbusmenu-qt5-devel qt5-wayland-devel libatomic-devel
  xcb-util-keysyms-devel $(vopt_if spellcheck hunspell-devel)
  kwayland-devel glibmm-devel tg_owt webkit2gtk-devel"
-depends="qt5-imageformats qt5-core>=5.15.2<5.15.3"
+depends="qt5-imageformats qt5-core>=5.15.2<5.16.0"
 short_desc="Telegram Desktop messaging app"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, OpenSSL"
@@ -45,16 +45,3 @@ fi
 if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	broken="UI doesn't go beyond initial screen, also LE specific code in networking"
 fi
-
-post_extract() {
-	_qt5_dep_ver="${depends#*>=}"
-	_qt5_dep_ver="${_qt5_dep_ver%<*}"
-	_qt5_version="$(xbps-uhelper version qt5-core)"
-
-	if [[ "${_qt5_version%_*}" != "${_qt5_dep_ver}" ]]; then
-		echo
-		msg_red "Qt5 version doesn't match version listed in \$depends\\n"
-		msg_red "${_qt5_version%_*} does not match ${_qt5_dep_ver}\\n"
-		exit 1
-	fi
-}

From 3eb6ce9a30e7d9927284c9b8039c058fd6e00445 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 3 May 2021 12:55:29 +0200
Subject: [PATCH 1956/2024] qt5-styleplugins: rebuild against qt5.15.3

---
 srcpkgs/qt5-styleplugins/template | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/srcpkgs/qt5-styleplugins/template b/srcpkgs/qt5-styleplugins/template
index 9e6b476ff2ea..24b958640164 100644
--- a/srcpkgs/qt5-styleplugins/template
+++ b/srcpkgs/qt5-styleplugins/template
@@ -7,7 +7,7 @@ wrksrc="qtstyleplugins-${_gitrev}"
 build_style=qmake
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
 makedepends="libxcb-devel libxkbcommon-devel libinput-devel tslib-devel gtk+-devel qt5-devel"
-depends="qt5-core>=5.15.2<5.15.3"
+depends="qt5-core>=5.15.2<5.16.0"
 short_desc="Additional style plugins for Qt5"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only, LGPL-3.0-only"
@@ -18,19 +18,6 @@ checksum=29ec24fa8df64be161ad06d0e5af3ba1a20bfe265004f5fe4ab9f5f3abf9a5ba
 # Cross builds fail with -fuse-ld=gold
 LDFLAGS="-Wl,-fuse-ld=bfd"
 
-pre_configure() {
-	_qt5_dep_ver="${depends#*>=}"
-	_qt5_dep_ver="${_qt5_dep_ver%<*}"
-	_qt5_version="$(xbps-uhelper version qt5-core)"
-
-	if [[ "${_qt5_version%_*}" != "${_qt5_dep_ver}" ]]; then
-		echo
-		msg_red "Qt5 version doesn't match version listed in \$depends\\n"
-		msg_red "${_qt5_version%_*} does not match ${_qt5_dep_ver}\\n"
-		exit 1
-	fi
-}
-
 qt5-styleplugins-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision}"

From 7054cb1cfab45c5233728591e0fbc4c3430703a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 3 May 2021 08:18:27 -0300
Subject: [PATCH 1957/2024] linux5.11: update to 5.11.18.

---
 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 2d3c7f571db3..7947410e0e18 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.17
+version=5.11.18
 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
- b30eb037f7225230cdc4c800fc19447ed0b45220138830c1f3f2c020214a4a0a"
+ 352795f98bb046cfe0fbdf9ed91a50886ad01f05c4496a241e3f182e3784001a"
 skip_extraction="patch-${version}.xz"
 python_version=3
 patch_args="-Np1"

From 6dddc22377120ba43fae95df1de5b8013375ad5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 3 May 2021 11:16:20 -0300
Subject: [PATCH 1958/2024] qt5-styleplugins: actually rebuild against
 qt5.15.3.

---
 srcpkgs/qt5-styleplugins/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qt5-styleplugins/template b/srcpkgs/qt5-styleplugins/template
index 24b958640164..4399c87d86cd 100644
--- a/srcpkgs/qt5-styleplugins/template
+++ b/srcpkgs/qt5-styleplugins/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5-styleplugins'
 pkgname=qt5-styleplugins
 version=5.0.0
-revision=15
+revision=16
 _gitrev=335dbece103e2cbf6c7cf819ab6672c2956b17b3
 wrksrc="qtstyleplugins-${_gitrev}"
 build_style=qmake

From 8ab23f77fb8c871d0ce8a8b9deea4bd6a58c35a7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 3 May 2021 16:17:22 +0200
Subject: [PATCH 1959/2024] re: update to 2.0.1.

---
 common/shlibs       | 2 +-
 srcpkgs/re/template | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 995c9750a41f..1b284ac33ef2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3366,7 +3366,7 @@ libhtmlcxx.so.3 htmlcxx-0.86_1
 libcss_parser_pp.so.0 htmlcxx-0.86_1
 libcss_parser.so.0 htmlcxx-0.86_1
 libaom.so.2 libaom-2.0.0_1
-libre.so re-1.1.0_2
+libre.so.1 re-2.0.1_1
 libspandsp.so.2 spandsp-0.0.6_1
 libspa-alsa.so libspa-alsa-0.3.6_1
 libspa-audioconvert.so libspa-audioconvert-0.3.6_1
diff --git a/srcpkgs/re/template b/srcpkgs/re/template
index 3bef9dc2b477..726ba0360748 100644
--- a/srcpkgs/re/template
+++ b/srcpkgs/re/template
@@ -1,7 +1,7 @@
 # Template file for 're'
 pkgname=re
-version=1.1.0
-revision=2
+version=2.0.1
+revision=1
 build_style=gnu-makefile
 make_build_args="RELEASE=1 EXTRA_CFLAGS=$CFLAGS
  EXTRA_LFLAGS=$LDFLAGS USE_OPENSSL=yes USE_DTLS=yes
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"
 homepage="https://github.com/baresip/re/"
 distfiles="https://github.com/baresip/re/archive/v${version}.tar.gz"
-checksum=82afc903a6b1e436b357f05eb11560ec681712291dd9c83c408465c895f28b5d
+checksum=43aa439b96aff75fe5768b9f9d49dea97042e42e7647df47b345465763e2f7ed
 shlib_provides="libre.so"
 
 case $XBPS_TARGET_MACHINE in

From b2f0413f13f9698f4f9200b0edf566c6f1c6527f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 3 May 2021 16:17:40 +0200
Subject: [PATCH 1960/2024] baresip: update to 1.1.0.

---
 srcpkgs/baresip/template | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index 7b8adf6f4e08..203250ecebfe 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -1,18 +1,18 @@
 # Template file for 'baresip'
 pkgname=baresip
-version=1.0.0
-revision=2
+version=1.1.0
+revision=1
 build_style=gnu-makefile
 make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk  PREFIX=/usr
  SYSROOT=${XBPS_CROSS_BASE}/usr LIBRE_INC=${XBPS_CROSS_BASE}/usr/include/re
  LIBRE_SO=${XBPS_CROSS_BASE}/usr/lib LIBDIR=/usr/lib${XBPS_TARGET_WORDSIZE}
- EXTRA_MODULES=$(vopt_if video snapshot) USE_ALSA=yes USE_GST=yes USE_GST_VIDEO=yes
+ USE_SNAPSHOT=$(vopt_if video yes) USE_ALSA=yes USE_GST=yes USE_GST_VIDEO=yes
  USE_OSS=yes USE_SDL=yes $(vopt_if video '' 'USE_AVCODEC=tes USE_AVFORMAT=yes
- USE_CAIRO=yes USE_SDL2=yes USE_V4L2=yes USE_VIDEO=yes USE_VPX=yes USE_X11=yes')
- $(vopt_if gtk '' 'USE_CAIRO=yes USE_GST1=yes USE_GST_VIDEO1=yes USE_GTK=yes')"
+ USE_SDL2=yes USE_V4L2=yes USE_VIDEO=yes USE_VPX=yes USE_X11=yes')
+ $(vopt_if gtk '' 'USE_GST1=yes USE_GST_VIDEO1=yes USE_GTK=yes')"
 make_install_args="$make_build_args"
 make_use_env=1
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config glib-devel"
 makedepends="libgsm-devel libpng-devel openssl-devel libsndfile-devel
  opus-devel re-devel rem-devel spandsp-devel speex-devel speexdsp-devel
  tiff-devel twolame-devel
@@ -25,7 +25,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"
 homepage="https://github.com/baresip/baresip"
 distfiles="https://github.com/baresip/baresip/archive/v${version}.tar.gz"
-checksum=7b008c0a5b4fccfa0a4003f86dc4aaafeaabbdd259ece4757898e9cb5f04fdcf
+checksum=f9230b27c4a62f31223847bc485c51f3d960f8a09f36998dedb73358e1784b4e
 
 # Package build options
 build_options="gtk video"

From 9d0d5b8d96a096dcded3ffb68c69e7d964c0bc05 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 3 May 2021 17:03:58 +0200
Subject: [PATCH 1961/2024] rem: update to 1.0.0.

---
 srcpkgs/rem/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/rem/template b/srcpkgs/rem/template
index 5278bb98653b..ac2b25e44751 100644
--- a/srcpkgs/rem/template
+++ b/srcpkgs/rem/template
@@ -1,7 +1,7 @@
 # Template file for 'rem'
 pkgname=rem
-version=0.6.0
-revision=2
+version=1.0.0
+revision=1
 build_style=gnu-makefile
 make_build_args="EXTRA_CFLAGS=$CFLAGS EXTRA_LFLAGS=$LDFLAGS RELEASE=1
  LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk \
@@ -13,9 +13,9 @@ makedepends="re-devel"
 short_desc="Library for real-time audio and video processing"
 maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"
-homepage="https://github.com/creytiv/rem"
-distfiles="https://github.com/creytiv/rem/archive/v${version}.tar.gz"
-checksum=fb04e691161eea23c238362b210351d7a19a23691cf31db7d64e364320f18a33
+homepage="https://github.com/baresip/rem"
+distfiles="https://github.com/baresip/rem/archive/v${version}.tar.gz"
+checksum=bcc91bb521fae183357fb422b00a3981477a22e99d3afe165c4ec50a6bbed9da
 shlib_provides="librem.so"
 
 case $XBPS_TARGET_MACHINE in

From b67649c900f9f07bd1876e3e5609514ec1652b61 Mon Sep 17 00:00:00 2001
From: Domagoj Stolfa <ds815@gmx.com>
Date: Mon, 3 May 2021 15:10:25 +0100
Subject: [PATCH 1962/2024] strongswan: enable options that are required for
 MSCHAPv2.

According to the documentation [1], StrongSwan needs --enable-md4 for
eap-mschapv2 to work. Moreover, many EAP-MSCHAPv2 based VPNs require
--enable-eap-identity and --enable-eap-dynamic to correctly work. This
commit simply adds these flags in the StrongSwan `template` file.

https://wiki.strongswan.org/projects/strongswan/wiki/AutoConf
---
 srcpkgs/strongswan/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/strongswan/template b/srcpkgs/strongswan/template
index f0be1ff9bdc3..e0e416ad5469 100644
--- a/srcpkgs/strongswan/template
+++ b/srcpkgs/strongswan/template
@@ -1,12 +1,12 @@
 # Template file for 'strongswan'
 pkgname=strongswan
 version=5.8.4
-revision=1
+revision=2
 build_style=gnu-configure
 # tpm support waits on libtss2
-configure_args="--disable-static --enable-blowfish --enable-curl
- --enable-eap-radius --enable-eap-mschapv2 --enable-eap-md5 --enable-led
- --enable-ha --enable-dhcp --enable-mediation --enable-soup --disable-des
+configure_args="--disable-static --enable-blowfish --enable-curl --enable-md4
+ --enable-eap-radius --enable-eap-mschapv2 --enable-eap-md5 --enable-eap-identity --enable-eap-dynamic
+ --enable-led --enable-ha --enable-dhcp --enable-mediation --enable-soup --disable-des
  --enable-chapoly --enable-nm"
 hostmakedepends="pkg-config flex bison python"
 makedepends="gmp-devel libsoup-devel libldns-devel unbound-devel libcurl-devel NetworkManager-devel"

From af19ec895d4d00339ee70b463703069b29650012 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, 2 May 2021 10:43:51 +0700
Subject: [PATCH 1963/2024] libtls: patch for certs.pem

---
 srcpkgs/libtls/patches/fix-cert-perm.patch | 29 ++++++++++++++++++++++
 srcpkgs/libtls/template                    |  8 ++----
 2 files changed, 31 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/libtls/patches/fix-cert-perm.patch

diff --git a/srcpkgs/libtls/patches/fix-cert-perm.patch b/srcpkgs/libtls/patches/fix-cert-perm.patch
new file mode 100644
index 000000000000..338d25863715
--- /dev/null
+++ b/srcpkgs/libtls/patches/fix-cert-perm.patch
@@ -0,0 +1,29 @@
+Index: libressl-3.2.4/apps/nc/nc.1
+===================================================================
+--- libressl-3.2.4.orig/apps/nc/nc.1
++++ libressl-3.2.4/apps/nc/nc.1
+@@ -219,7 +219,7 @@ Cannot be used together with
+ Load the root CA bundle for TLS certificate verification from
+ .Ar CAfile ,
+ in PEM format, instead of
+-.Pa /etc/ssl/cert.pem .
++.Pa /etc/ssl/certs.pem .
+ Requires
+ .Fl c .
+ .It Fl r
+Index: libressl-3.2.4/tls/Makefile.am
+===================================================================
+--- libressl-3.2.4.orig/tls/Makefile.am
++++ libressl-3.2.4/tls/Makefile.am
+@@ -18,9 +18,9 @@ libtls_la_LIBADD += $(PLATFORM_LDADD)
+ 
+ libtls_la_CPPFLAGS = $(AM_CPPFLAGS)
+ if OPENSSLDIR_DEFINED
+-libtls_la_CPPFLAGS += -DTLS_DEFAULT_CA_FILE=\"@OPENSSLDIR@/cert.pem\"
++libtls_la_CPPFLAGS += -DTLS_DEFAULT_CA_FILE=\"@OPENSSLDIR@/certs.pem\"
+ else
+-libtls_la_CPPFLAGS += -DTLS_DEFAULT_CA_FILE=\"$(sysconfdir)/ssl/cert.pem\"
++libtls_la_CPPFLAGS += -DTLS_DEFAULT_CA_FILE=\"$(sysconfdir)/ssl/certs.pem\"
+ endif
+ 
+ libtls_la_SOURCES = tls.c
diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
index cd46d748bb03..a163b69eee98 100644
--- a/srcpkgs/libtls/template
+++ b/srcpkgs/libtls/template
@@ -1,7 +1,7 @@
 # Template file for 'libtls'
 pkgname=libtls
 version=3.2.5
-revision=1
+revision=2
 wrksrc="libressl-${version}"
 build_style=gnu-configure
 configure_args="$(vopt_enable asm)"
@@ -21,6 +21,7 @@ build_options="asm"
 desc_option_asm="Use platform assembly for faster crypto"
 
 build_options_default="asm"
+patch_args=-Np1
 
 if [ "$build_option_asm" ]; then
 	distfiles+=" https://github.com/q66/libressl-portable-asm/archive/v${_lssl_asm_ver}.tar.gz"
@@ -49,11 +50,6 @@ pre_configure() {
 do_install() {
 	make -C tls install DESTDIR="$DESTDIR"
 	make -C apps/nc install DESTDIR="$DESTDIR"
-	# libtls expects certs linked to /etc/ssl/cert.pem
-	# instead of OpenSSL's /etc/ssl/certs.pem
-	# Create a symlink for now while awaiting discussion.
-	vmkdir etc/ssl
-	ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
 	vlicense COPYING
 	if [ "$build_option_asm" ]; then
 		vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams

From 75a061280f9d7f0dc41bc8b710d6a85e7fccfe24 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 3 May 2021 20:44:38 +0200
Subject: [PATCH 1964/2024] python3-boto3: update to 1.17.62.

---
 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 c376eedc533b..c80aa31bbed8 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.49
+version=1.17.62
 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=08c4ee7dbcf5814555aeb2fed8496ab4165b8e3878acf2fcfd81f8d233f78ada
+checksum=f15caa30dba8e109409a05c5efa27b36935acccf09830af559f922039d1a8b98
 
 post_install() {
 	vlicense LICENSE

From cc9ebbbf60a666a8c3c521bca8d16f6934924112 Mon Sep 17 00:00:00 2001
From: radiden <gabriel2012688@gmail.com>
Date: Tue, 20 Apr 2021 20:20:25 +0200
Subject: [PATCH 1965/2024] moby: update to 20.10.6.

---
 srcpkgs/moby/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/moby/template b/srcpkgs/moby/template
index 6d8ef4e83729..50e198d91574 100644
--- a/srcpkgs/moby/template
+++ b/srcpkgs/moby/template
@@ -1,8 +1,8 @@
 # Template file for 'moby'
 pkgname=moby
-version=20.10.5
+version=20.10.6
 revision=1
-_libnetwork_commit=fa125a3512ee0f6187721c88582bf8c4378bd4d7
+_libnetwork_commit=b3507428be5b458cb0e2b4086b13531fb0706e46
 create_wrksrc=yes
 build_style=go
 go_import_path="github.com/docker/docker"
@@ -10,13 +10,13 @@ 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>"
+maintainer="PWA COLLECTIVE <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"
+checksum="fd7f5571b1f64f26b5ca520a3e1fefb33c190f3732b931051c23a76bdba5000e
+ 90a8dc84bc5d2d74dee0b2c3544f8786598ff85e9fc9f6a55a15b60b7cd78d63"
 system_groups="docker"
 
 _moby_builddir="moby-$version"

From e737113ad6308768f1c2a4d3834bfb376c06162a Mon Sep 17 00:00:00 2001
From: radiden <gabriel2012688@gmail.com>
Date: Tue, 20 Apr 2021 20:20:28 +0200
Subject: [PATCH 1966/2024] docker-cli: update to 20.10.6.

---
 srcpkgs/docker-cli/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/docker-cli/template b/srcpkgs/docker-cli/template
index c337e08b39fa..8299aba7846c 100644
--- a/srcpkgs/docker-cli/template
+++ b/srcpkgs/docker-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'docker-cli'
 pkgname=docker-cli
-version=20.10.5
+version=20.10.6
 revision=2
 wrksrc="cli-${version}"
 build_style=go
@@ -12,11 +12,11 @@ go_ldflags="-X \"${_cli_ver_path}.Version=${version}\"
 hostmakedepends="pkg-config"
 depends="git"
 short_desc="Command-line interface for the Docker daemon"
-maintainer="PWA COLLECTIVE <mail@pwa.cya.cx>"
+maintainer="PWA COLLECTIVE <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
+checksum=eda53b96ab83a59502df2e5e00ab7ee867243259407ef454be55e695303c1113
 system_groups="docker"
 
 pre_build() {
@@ -32,5 +32,5 @@ post_install() {
 docker_package() {
 	build_style="meta"
 	short_desc="Docker container runtime"
-	depends="${sourcepkg}>=${version}_${revision} moby"
+	depends="${sourcepkg}>=${version}_${revision} moby tini"
 }

From 36eca052531da3964d3d5003bf3868de61972e64 Mon Sep 17 00:00:00 2001
From: radiden <gabriel2012688@gmail.com>
Date: Tue, 20 Apr 2021 20:20:32 +0200
Subject: [PATCH 1967/2024] New package: tini-0.19.0

---
 srcpkgs/tini/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/tini/template

diff --git a/srcpkgs/tini/template b/srcpkgs/tini/template
new file mode 100644
index 000000000000..fb18b07ba3f2
--- /dev/null
+++ b/srcpkgs/tini/template
@@ -0,0 +1,17 @@
+# Template file for 'tini'
+pkgname=tini
+version=0.19.0
+revision=1
+build_style=cmake
+short_desc="Tiny but valid init for containers"
+maintainer="PWA COLLECTIVE <pwa@cya.cx>"
+license="MIT"
+homepage="https://github.com/krallin/tini"
+distfiles="https://github.com/krallin/tini/archive/refs/tags/v$version.tar.gz"
+checksum=0fd35a7030052acd9f58948d1d900fe1e432ee37103c5561554408bdac6bbf0d
+CFLAGS="-DPR_SET_CHILD_SUBREAPER=36 -DPR_GET_CHILD_SUBREAPER=37"
+
+post_install() {
+	vlicense LICENSE
+	ln -s tini-static $DESTDIR/usr/bin/docker-init
+}

From 80d8a200225f4e9af88dd9028082f4cd2cd7686f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 3 May 2021 20:55:11 +0200
Subject: [PATCH 1968/2024] dav: fix update-check.

---
 srcpkgs/dav/update | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 srcpkgs/dav/update

diff --git a/srcpkgs/dav/update b/srcpkgs/dav/update
new file mode 100644
index 000000000000..68ec641047fb
--- /dev/null
+++ b/srcpkgs/dav/update
@@ -0,0 +1 @@
+pkgname='dav-text'

From b41f64ca6ddcadda571d7e830a4c9ac3bdca4b09 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 3 May 2021 21:03:52 +0200
Subject: [PATCH 1969/2024] di: update to 4.50.

---
 srcpkgs/di/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/di/template b/srcpkgs/di/template
index 98a043a659e1..65f56f604143 100644
--- a/srcpkgs/di/template
+++ b/srcpkgs/di/template
@@ -1,14 +1,14 @@
 # Template file for 'di'
 pkgname=di
-version=4.48
+version=4.50
 revision=1
 build_style=gnu-makefile
 short_desc="A disk information utility"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Zlib"
-homepage="https://gentoo.com/di"
-distfiles="https://gentoo.com/di/${pkgname}-${version}.tar.gz"
-checksum=19d549feb59ccde7ff1cd2c48fea7b9ba99fa2285da81424603e23d8b5db3b33
+homepage="https://diskinfo-di.sourceforge.io/"
+distfiles="${SOURCEFORGE_SITE}/diskinfo-di/di-${version}.tar.gz"
+checksum=82f08b6c2549fd6ab2e9cb596135a70883ffd4136d176466ae0ec9ba67a3492a
 make_install_args="INSTALL_DIR=\${DESTDIR}/usr"
 
 post_install() {

From 9f4db937a6ea2f451e63756c17b6cd4c6cd8427a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 3 May 2021 21:06:56 +0200
Subject: [PATCH 1970/2024] hunspell-de_DE: fix update-check.

---
 srcpkgs/hunspell-de_DE/update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hunspell-de_DE/update b/srcpkgs/hunspell-de_DE/update
index b2cf8b29bff3..0f916eb6f5f4 100644
--- a/srcpkgs/hunspell-de_DE/update
+++ b/srcpkgs/hunspell-de_DE/update
@@ -1,2 +1,2 @@
-pattern='<span>\K[-_.\d]+(?=</span></a>)'
+pattern='<span>\K[-_.\d]+(?=</span>)'
 version="${_version}"

From 91fa8ef14d643129ee2ca8527d17c7ff60f3731e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 3 May 2021 21:09:12 +0200
Subject: [PATCH 1971/2024] iana-etc: update to 20210429.

---
 srcpkgs/iana-etc/files/services | 12 +++++++-----
 srcpkgs/iana-etc/template       |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/iana-etc/files/services b/srcpkgs/iana-etc/files/services
index eff20e860d08..3c877335d01a 100644
--- a/srcpkgs/iana-etc/files/services
+++ b/srcpkgs/iana-etc/files/services
@@ -238,7 +238,6 @@ emfis-cntl        141/udp
 bl-idm            142/tcp
 bl-idm            142/udp
 imap              143/tcp
-imap              143/udp
 uma               144/tcp
 uma               144/udp
 uaac              145/tcp
@@ -1375,7 +1374,6 @@ nas               991/udp
 telnets           992/tcp
 telnets           992/udp
 imaps             993/tcp
-imaps             993/udp
 pop3s             995/tcp
 pop3s             995/udp
 vsinet            996/tcp
@@ -2391,7 +2389,9 @@ pdap-np          1526/tcp
 pdap-np          1526/udp
 tlisrv           1527/tcp
 tlisrv           1527/udp
-ngr-t            1528/udp
+norp             1528/tcp
+norp             1528/udp
+norp             1528/sctp
 coauthor         1529/tcp
 coauthor         1529/udp
 rap-service      1530/tcp
@@ -8861,8 +8861,8 @@ spramsd          5770/tcp
 spramsd          5770/udp
 netagent         5771/tcp
 netagent         5771/udp
-dali-port        5777/tcp
-dali-port        5777/udp
+starfield-io     5777/tcp
+starfield-io     5777/udp
 vts-rpc          5780/tcp
 3par-evts        5781/tcp
 3par-evts        5781/udp
@@ -8930,6 +8930,7 @@ nuxsl            5991/udp
 consul-insight   5992/tcp
 consul-insight   5992/udp
 cim-rs           5993/tcp
+rms-agent        5994/tcp
 cvsup            5999/tcp
 cvsup            5999/udp
 x11              6000/tcp
@@ -9764,6 +9765,7 @@ http-alt         8008/udp
 nvme-disc        8009/tcp
 cfg-cloud        8015/tcp
 ads-s            8016/tcp
+cisco-cloudsec   8017/udp
 qbdb             8019/tcp
 qbdb             8019/udp
 intu-ec-svcdisc  8020/tcp
diff --git a/srcpkgs/iana-etc/template b/srcpkgs/iana-etc/template
index 5f8eacb33041..c296edefc474 100644
--- a/srcpkgs/iana-etc/template
+++ b/srcpkgs/iana-etc/template
@@ -1,7 +1,7 @@
 # Template file for 'iana-etc'
 pkgname=iana-etc
 reverts="202001016_1"
-version=20210106
+version=20210429
 revision=1
 bootstrap=yes
 short_desc="Unix /etc/services and /etc/protocols files"

From 60c303e40055a0216e632f011a7d8c2b96cf9076 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 3 May 2021 21:13:02 +0200
Subject: [PATCH 1972/2024] k9s: update to 0.24.8.

---
 srcpkgs/k9s/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/k9s/template b/srcpkgs/k9s/template
index 6ceec1f3e0ad..7232ec025e1b 100644
--- a/srcpkgs/k9s/template
+++ b/srcpkgs/k9s/template
@@ -1,6 +1,6 @@
 # Template file for 'k9s'
 pkgname=k9s
-version=0.24.6
+version=0.24.8
 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=72cce161786273f203421e93d8b22bfa7659fecdf2d0f018a5dc113302ba3958
+checksum=347048203464fd022c70f40b5f8b37c0374af083e514a39b49c5993f7886f2bf

From 9bd6ee29b5e4bb1556cd4264c6a3834fbd6d4239 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 3 May 2021 21:30:28 +0200
Subject: [PATCH 1973/2024] puzzles: update to 20210427.8ff394d.

---
 srcpkgs/puzzles/template | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/puzzles/template b/srcpkgs/puzzles/template
index 9b75048b1a9c..cda5ec6b2850 100644
--- a/srcpkgs/puzzles/template
+++ b/srcpkgs/puzzles/template
@@ -1,28 +1,19 @@
 # Template file for 'puzzles'
 pkgname=puzzles
-version=20200609.9aa7b7c
+version=20210427.8ff394d
 revision=1
 wrksrc="${pkgname}-${version#*.}"
-hostmakedepends="pkg-config perl"
-makedepends="gtk+-devel"
+build_style=cmake
+configure_args="-DNAME_PREFIX=puzzles-"
+hostmakedepends="pkg-config"
+makedepends="gtk+3-devel"
 short_desc="Simon Tatham's Portable Puzzle Collection"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/"
-distfiles="https://git.tartarus.org/?p=simon/puzzles.git;a=snapshot;h=9aa7b7cdfb2bcd200f45941a58d6ae698882a2d4;sf=tgz>${wrksrc}.tgz"
-checksum=855a548a7b2485ca80a1c83eeb7fdb35b01500faae986e7ba9b8da9a2f0c9060
+distfiles="https://git.tartarus.org/?p=simon/puzzles.git;a=snapshot;h=8ff394d1cc42efc3509135bbdd6ce92498eafcf3;sf=tgz>${wrksrc}.tgz"
+checksum=54c507b3e6607344e9c4d6ab7beb29369ffeaacf3bbd258c6e76432d35f0ad60
 
-do_build() {
-	sed -i 's/-Werror -ansi -pedantic//' mkfiles.pl
-	./mkfiles.pl
-	echo "XLIBS += ${LDFLAGS}" >>Makefile.gtk
-	echo "ULIBS += ${LDFLAGS}" >>Makefile.gtk
-	make ${makejobs} -f Makefile.gtk prefix=/usr BINPREFIX=puzzles-
-}
-
-do_install() {
-	vmkdir usr/bin
-	make -f Makefile.gtk prefix=/usr gamesdir=/usr/bin \
-		DESTDIR="${DESTDIR}" BINPREFIX=puzzles- install
+post_install() {
 	vlicense LICENCE LICENSE
 }

From b2ace2e54e3d36a9f2d7eaa366c656d4367813dc Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 3 May 2021 21:36:52 +0200
Subject: [PATCH 1974/2024] python3-pyinfra: update to 1.4.

---
 srcpkgs/python3-pyinfra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pyinfra/template b/srcpkgs/python3-pyinfra/template
index e14fcad29d7b..e505474c00a8 100644
--- a/srcpkgs/python3-pyinfra/template
+++ b/srcpkgs/python3-pyinfra/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyinfra'
 pkgname=python3-pyinfra
-version=1.3.11
+version=1.4
 revision=1
 wrksrc="pyinfra-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://pyinfra.com/"
 distfiles="https://github.com/Fizzadar/pyinfra/archive/v${version}.tar.gz"
-checksum=415977585103aa42bfb1aeb9f627bd19d270d5deb4cb4a516b1d5cc445631388
+checksum=7e23bf20ace5f5c6f15d8c712c304b34ec1e93d42abcf28be11734f1baaf0391
 
 post_extract() {
 	vsed -i -e '/configparser/d' setup.py  # is in Python 3.8

From 159c5bc96a7dcf8c8c29d4ef50fb5a6ff79d70eb Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 3 May 2021 21:40:59 +0200
Subject: [PATCH 1975/2024] qiv: fix update-check.

---
 srcpkgs/qiv/update | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qiv/update b/srcpkgs/qiv/update
index 96c8a5defc82..c5e5278278b2 100644
--- a/srcpkgs/qiv/update
+++ b/srcpkgs/qiv/update
@@ -1,2 +1,2 @@
-site=https://bitbucket.org/ciberandy/qiv/downloads/?tab=tags
-pattern='/get/v?\K[\d.]+(?=\.tar)'
+site=http://spiegl.de/qiv/download/
+pattern='qiv-\K[\d.]+(?=\.tgz">)'

From 191120428245d9a8996f2c41fd50bc834496ff96 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 3 May 2021 21:46:58 +0200
Subject: [PATCH 1976/2024] schilytools: update to 2021.04.21.

---
 srcpkgs/schilytools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/schilytools/template b/srcpkgs/schilytools/template
index 341007f35cb3..dc2c974e1cc9 100644
--- a/srcpkgs/schilytools/template
+++ b/srcpkgs/schilytools/template
@@ -1,6 +1,6 @@
 # Template file for 'schilytools'
 pkgname=schilytools
-version=2021.01.05
+version=2021.04.21
 revision=1
 wrksrc="schily-${version//./-}"
 build_style=meta
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="CDDL-1.0"
 homepage="https://sourceforge.net/projects/schilytools/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/schily-${version//./-}.tar.bz2"
-checksum=20bfdaf57fa63b9613aa0d96f2ad0bfdf0c07722bc46f3146bac667a90e2dfe1
+checksum=4c2666b872269cf36318c957d1125aea1946a20ede4e989ce5ed864cdfcfddb1
 nocross=yes  # configure + re-builds with itself
 
 do_build() {

From e4b6cde0c2e59d8d5527aae58831619fe0be7517 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 3 May 2021 21:47:24 +0200
Subject: [PATCH 1977/2024] ugrep: update to 3.2.

---
 srcpkgs/ugrep/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index 5c72c4d86d0b..4e252fe1a62d 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,16 +1,17 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.1.15
+version=3.2
 revision=1
 build_style=gnu-configure
 configure_args="--disable-avx"
-makedepends="bzip2-devel liblz4-devel liblzma-devel pcre2-devel zlib-devel"
+makedepends="bzip2-devel liblz4-devel liblzma-devel libzstd-devel pcre2-devel
+ zlib-devel"
 short_desc="Ultra fast grep with interactive query UI"
 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=a34457751f1b99d12a98404d04bfe96c16fdf0960df7e9141b03e41ed0a62de8
+checksum=e5b4d7b2e4a87b34416200d068dc1984967f980418670fa6b08268edf00a4a9d
 
 post_install() {
 	vlicense LICENSE.txt LICENSE

From 6d1bde3f1edc9963f816777456723eda911eee57 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 3 May 2021 21:58:34 +0200
Subject: [PATCH 1978/2024] erlang: update to 23.3.2.

---
 srcpkgs/erlang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index 549c0df7bd5b..1c7b6df1d093 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,6 +1,6 @@
 # Template file for 'erlang'
 pkgname=erlang
-version=23.3.1
+version=23.3.2
 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=a5a067a3b17bbef8511f2c056957925b666670b6f2cdaf645e1bc28ce3dd3517
+checksum=02443dd42023d0eb73f73dc05f4d3ded7bc4ab59d348041a37a045ba1581b48b
 subpackages="erlang-doc"
 
 if [ -z "$CROSS_BUILD" ]; then

From 325e70f47bc5d54f009380f3fe7437c92d23367a Mon Sep 17 00:00:00 2001
From: eater <=@eater.me>
Date: Mon, 3 May 2021 21:40:27 +0200
Subject: [PATCH 1979/2024] musikcube: update to 0.96.7

---
 .../patches/use-pkg-config-for-pipewire.patch  | 18 ------------------
 srcpkgs/musikcube/template                     |  4 ++--
 2 files changed, 2 insertions(+), 20 deletions(-)
 delete mode 100644 srcpkgs/musikcube/patches/use-pkg-config-for-pipewire.patch

diff --git a/srcpkgs/musikcube/patches/use-pkg-config-for-pipewire.patch b/srcpkgs/musikcube/patches/use-pkg-config-for-pipewire.patch
deleted file mode 100644
index e98bf1f7955b..000000000000
--- a/srcpkgs/musikcube/patches/use-pkg-config-for-pipewire.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git src/plugins/pipewireout/CMakeLists.txt src/plugins/pipewireout/CMakeLists.txt
-index 7c24320d..233adab2 100644
---- src/plugins/pipewireout/CMakeLists.txt
-+++ src/plugins/pipewireout/CMakeLists.txt
-@@ -7,10 +7,8 @@ ensure_library_exists(pipewire-0.3)
- 
- message(STATUS "[pipewireout] plugin enabled")
- 
--include_directories("/usr/include/spa-0.2")
--include_directories("/usr/local/include/spa-0.2")
--include_directories("/usr/include/pipewire-0.3")
--include_directories("/usr/local/include/pipewire-0.3")
-+find_package(PkgConfig)
-+pkg_check_modules(PIPEWIRE REQUIRED IMPORTED_TARGET libpipewire-0.3)
- 
- add_library(pipewireout SHARED ${pipewireout_SOURCES})
--target_link_libraries(pipewireout ${musikcube_LINK_LIBS} pipewire-0.3)
-+target_link_libraries(pipewireout ${musikcube_LINK_LIBS} PkgConfig::PIPEWIRE)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index 7a217ebb96e2..c786f86bef31 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,6 +1,6 @@
 # Template file for 'musikcube'
 pkgname=musikcube
-version=0.96.6
+version=0.96.7
 revision=1
 build_style=cmake
 make_cmd=make
@@ -16,7 +16,7 @@ maintainer="eater <=@eater.me>"
 license="BSD-3-Clause"
 homepage="https://musikcube.com/"
 distfiles="https://github.com/clangen/musikcube/archive/${version}.tar.gz"
-checksum=3d3512ae03ff5a233de8d6787417b32731e50d813035fd49188b2fca66c6d21e
+checksum=81922ec6e86c06061dc009be3ec7c4bc8e8fd5ed3bb92231dabede8bbccaf723
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From a66512e4c3161be9b0f907e47db1455fd71321ab Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 3 May 2021 15:50:46 -0500
Subject: [PATCH 1980/2024] manuskript: update to 0.12.0.

---
 srcpkgs/manuskript/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/manuskript/template b/srcpkgs/manuskript/template
index 2f9f58d6d734..a390bebbb4d9 100644
--- a/srcpkgs/manuskript/template
+++ b/srcpkgs/manuskript/template
@@ -1,7 +1,7 @@
 # Template file for 'manuskript'
 pkgname=manuskript
-version=0.11.0
-revision=2
+version=0.12.0
+revision=1
 pycompile_dirs="usr/share/${pkgname}"
 hostmakedepends="python3-setuptools"
 depends="python3-enchant python3-lxml python3-Markdown python3-PyQt5 qt5-svg"
@@ -10,7 +10,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="http://www.theologeek.ch/manuskript"
 distfiles="https://github.com/olivierkes/manuskript/archive/${version}.tar.gz"
-checksum=bed0114c5d7787df07b420aa4909a7ae216e1581147058e03fda4c07deef8ef8
+checksum=72e5f8111573ad110f43ba385f7346243bd0823ad1f910e38929b24cb77289ea
 python_version=3
 
 do_install() {

From 8b4d156abd90fe88ff2fe03e806d9613c86e7b80 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 3 May 2021 15:56:22 -0500
Subject: [PATCH 1981/2024] oidentd: update to 2.5.1.

---
 srcpkgs/oidentd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/oidentd/template b/srcpkgs/oidentd/template
index 54a87348bb85..f7ffb8217f4e 100644
--- a/srcpkgs/oidentd/template
+++ b/srcpkgs/oidentd/template
@@ -1,6 +1,6 @@
 # Template file for 'oidentd'
 pkgname=oidentd
-version=2.5.0
+version=2.5.1
 revision=1
 build_style=gnu-configure
 conf_files="/etc/oidentd.conf /etc/oidentd_masq.conf"
@@ -12,7 +12,7 @@ license="GPL-2.0-only, GFDL-1.1-or-later"
 homepage="https://oidentd.janikrabe.com/"
 changelog="https://raw.githubusercontent.com/janikrabe/${pkgname}/v${version}/ChangeLog"
 distfiles="https://files.janikrabe.com/pub/${pkgname}/releases/${version}/${pkgname}-${version}.tar.xz"
-checksum=c2d2d0b8a75290590c1df86996b92625246d6111904b83c88e2b4ec73993a83d
+checksum=e30bc67f151ac64a3b623cb7c3ddccd4680e03364a7f753590a0f85bb4243910
 
 post_install() {
 	vsv oidentd

From f9fa7c18d8d227f22c717d4a38d9dfaa02d1f97f Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 3 May 2021 16:23:37 -0500
Subject: [PATCH 1982/2024] bucklespring: updated to 1.5.0.

---
 srcpkgs/bucklespring-data     |  1 -
 srcpkgs/bucklespring/template | 17 +++++------------
 2 files changed, 5 insertions(+), 13 deletions(-)
 delete mode 120000 srcpkgs/bucklespring-data

diff --git a/srcpkgs/bucklespring-data b/srcpkgs/bucklespring-data
deleted file mode 120000
index 0674b0bb18f6..000000000000
--- a/srcpkgs/bucklespring-data
+++ /dev/null
@@ -1 +0,0 @@
-bucklespring
\ No newline at end of file
diff --git a/srcpkgs/bucklespring/template b/srcpkgs/bucklespring/template
index 2e4568bb7466..0764042d75c0 100644
--- a/srcpkgs/bucklespring/template
+++ b/srcpkgs/bucklespring/template
@@ -1,19 +1,19 @@
 # Template file for 'bucklespring'
 pkgname=bucklespring
-version=1.4.0
-revision=2
+version=1.5.0
+revision=1
 build_style=gnu-makefile
 make_use_env=yes
 make_build_args="PATH_AUDIO=/usr/share/${pkgname}/wav"
 hostmakedepends="pkg-config"
 makedepends="alure-devel libinput-devel libXtst-devel"
-depends="bucklespring-data"
 short_desc="Emulate the sound of the IBM Model-M while typing"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-only"
 homepage="https://github.com/zevv/bucklespring"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b38b2c0ec905573a243cb9db543f8eeb92e4d040025ef338d8bcfcfd5ccd5348
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=0b9505abde912775dd78d8396d2282a6d89e3ad3342b3f150c207becb40d34ab
+replaces="bucklespring-data>=0"
 
 if [ $XBPS_CROSS_BASE ]; then
 	make_build_args+=" CROSS=$XBPS_CROSS_TRIPLET-"
@@ -24,10 +24,3 @@ do_install() {
 	vmkdir usr/share/${pkgname}
 	vcopy wav usr/share/${pkgname}
 }
-
-bucklespring-data_package() {
-	short_desc+=" - data files"
-	pkg_install() {
-		vmove usr/share
-	}
-}

From b994c9fbe5561e16de84d5d58891e11547c351ac Mon Sep 17 00:00:00 2001
From: Kye Shi <shi.kye@gmail.com>
Date: Mon, 3 May 2021 15:13:56 -0700
Subject: [PATCH 1983/2024] just: update to 0.9.2.

---
 srcpkgs/just/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/just/template b/srcpkgs/just/template
index e351ac32ad68..087f95b40364 100644
--- a/srcpkgs/just/template
+++ b/srcpkgs/just/template
@@ -1,6 +1,6 @@
 # Template file for 'just'
 pkgname=just
-version=0.9.0
+version=0.9.2
 revision=1
 build_style=cargo
 short_desc="Just a command runner"
@@ -9,7 +9,7 @@ license="CC0-1.0"
 homepage="https://github.com/casey/just"
 changelog="https://raw.githubusercontent.com/casey/just/master/CHANGELOG.md"
 distfiles="https://github.com/casey/just/archive/v${version}.tar.gz"
-checksum=877fdd517722ec1a554b046e1a9fd112f3503d91211702895c5ba12b29dcbcc6
+checksum=0f064d0ea9f3d8bbcd84c5e6a85243738bdb6f49d059f589fd6928c64ea6fb64
 
 # Fix failing test
 pre_check() {

From a68005eff3773ffc5ccf0bbc50b895113c7fa900 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 3 May 2021 15:01:24 +0200
Subject: [PATCH 1984/2024] dbeaver: update to 21.0.4.

---
 .../patches/colortheme-plugin-update-url.patch      | 13 -------------
 srcpkgs/dbeaver/template                            |  4 ++--
 2 files changed, 2 insertions(+), 15 deletions(-)
 delete mode 100644 srcpkgs/dbeaver/patches/colortheme-plugin-update-url.patch

diff --git a/srcpkgs/dbeaver/patches/colortheme-plugin-update-url.patch b/srcpkgs/dbeaver/patches/colortheme-plugin-update-url.patch
deleted file mode 100644
index c8c9b887c815..000000000000
--- a/srcpkgs/dbeaver/patches/colortheme-plugin-update-url.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git plugins/org.jkiss.dbeaver.ext.ui.colortheme/pom.xml plugins/org.jkiss.dbeaver.ext.ui.colortheme/pom.xml
-index 173322136b..6b9034eab5 100644
---- plugins/org.jkiss.dbeaver.ext.ui.colortheme/pom.xml
-+++ plugins/org.jkiss.dbeaver.ext.ui.colortheme/pom.xml
-@@ -16,7 +16,7 @@
-     <repositories>
-         <repository>
-             <id>eclipse-color-theme</id>
--            <url>https://eclipse-color-theme.github.com/update</url>
-+            <url>https://eclipse-color-theme.github.io/update/</url>
-             <layout>p2</layout>
-         </repository>
-     </repositories>
diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index 839984621cd2..ad84b846cdcd 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=21.0.3
+version=21.0.4
 revision=1
 # the build downloads binaries linked to glibc
 archs="x86_64"
@@ -11,7 +11,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="Apache-2.0"
 homepage="https://dbeaver.io"
 distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz"
-checksum=1573aee8642e6f65edc41b08376873765ddde72146c8b374d7e1e7e4cbbb0844
+checksum=c946fa92679edabd41d5c5f482d2572e837860f0c62450aed9bbcd836aa00cf4
 nopie=true
 
 do_build() {

From 55a5ac22cab85e6f50597789fe62cbe9c6c9f4b1 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Tue, 4 May 2021 12:19:42 +1000
Subject: [PATCH 1985/2024] hfsprogs: fix distfile

---
 srcpkgs/hfsprogs/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hfsprogs/template b/srcpkgs/hfsprogs/template
index 41bd475db09e..f1e0c690511d 100644
--- a/srcpkgs/hfsprogs/template
+++ b/srcpkgs/hfsprogs/template
@@ -2,6 +2,7 @@
 pkgname=hfsprogs
 _distver=540.1
 _patchver=3
+_md5sum=0435afc389b919027b69616ad1b05709
 version="${_distver}.linux${_patchver}"
 revision=8
 wrksrc="diskdev_cmds-${version}"
@@ -10,8 +11,8 @@ makedepends="openssl-devel libuuid-devel"
 short_desc="Apple's mkfs and fsck for HFS and HFS+ file systems"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="APSL-2.0"
-homepage="http://www.opensource.apple.com/"
-distfiles="http://cavan.codon.org.uk/~mjg59/diskdev_cmds/diskdev_cmds-${version}.tar.gz"
+homepage="https://www.opensource.apple.com/"
+distfiles="https://src.fedoraproject.org/repo/pkgs/hfsplus-tools/diskdev_cmds-${version}.tar.gz/${_md5sum}/diskdev_cmds-${version}.tar.gz"
 checksum=b01b203a97f9a3bf36a027c13ddfc59292730552e62722d690d33bd5c24f5497
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then

From 6472be80f8ad784f25e77e1e3bb443cc9def479d Mon Sep 17 00:00:00 2001
From: Morgan Thomas <m@m0rg.dev>
Date: Wed, 28 Apr 2021 10:17:07 -0700
Subject: [PATCH 1986/2024] orientdb: update to 3.1.11

---
 srcpkgs/orientdb/template | 13 ++++++-------
 srcpkgs/orientdb/update   |  4 ++--
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/orientdb/template b/srcpkgs/orientdb/template
index fea95ed35e7d..c7c49f59af5b 100644
--- a/srcpkgs/orientdb/template
+++ b/srcpkgs/orientdb/template
@@ -1,18 +1,17 @@
 # Template file for 'orientdb'
 pkgname=orientdb
-version=2.2.29
-revision=2
+version=3.1.11
+revision=1
 archs="i686 x86_64"
 conf_files="/etc/${pkgname}/*"
-wrksrc="${pkgname}-community-${version}"
 depends="virtual?java-runtime"
 short_desc="Distributed Graph Database"
 maintainer="bougyman <bougyman@rubyists.com>"
 license="Apache-2.0"
-patch_args="-p1"
-homepage="http://orientdb.com"
-distfiles="http://www.orientdb.com/download.php?email=unknown@unknown.com&file=orientdb-community-${version}.tar.gz&os=linux>orientdb-community-${version}.tar.gz"
-checksum=0e4f5d5150afcfb509dcafd6dced587d70f521dab4e27980e30c76c69be78ea9
+homepage="https://orientdb.org"
+distfiles="https://s3.us-east-2.amazonaws.com/orientdb3/releases/${version}/orientdb-${version}.tar.gz"
+checksum=73830279a5587de17ea4f5864598a0829bb03212d6cd36d185fe126a46086236
+patch_args="-Np1"
 system_accounts="orientdb"
 
 do_install() {
diff --git a/srcpkgs/orientdb/update b/srcpkgs/orientdb/update
index 058609c20e84..7f4963322546 100644
--- a/srcpkgs/orientdb/update
+++ b/srcpkgs/orientdb/update
@@ -1,2 +1,2 @@
-site="https://orientdb.com/releases/"
-pattern="OrientDB v \K[\d\.]+"
+site="https://orientdb.org/download/"
+pattern="OrientDB \K[\d\.]+"

From 478f2b29785ab2698715456cc427567ddd6c518a Mon Sep 17 00:00:00 2001
From: RunningDroid <runningdroid@zoho.com>
Date: Sun, 2 May 2021 23:49:49 -0400
Subject: [PATCH 1987/2024] python3-SecretStorage: update to 3.3.1.

---
 srcpkgs/python3-SecretStorage/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-SecretStorage/template b/srcpkgs/python3-SecretStorage/template
index d1ddbfb7a8fe..a2ff3a2fc457 100644
--- a/srcpkgs/python3-SecretStorage/template
+++ b/srcpkgs/python3-SecretStorage/template
@@ -1,18 +1,23 @@
 # Template file for 'python3-SecretStorage'
 pkgname=python3-SecretStorage
-version=3.2.0
+version=3.3.1
 revision=1
 wrksrc="SecretStorage-${version}"
 build_style=python3-module
-pycompile_module="secretstorage"
 hostmakedepends="python3-setuptools"
 depends="python3-jeepney python3-cryptography"
+checkdepends="gnome-keyring dbus ${depends}"
 short_desc="Python3 bindings to FreeDesktop.org Secret Service API"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/mitya57/secretstorage"
 distfiles="${PYPI_SITE}/S/SecretStorage/SecretStorage-${version}.tar.gz"
-checksum=46305c3847ee3f7252b284e0eee5590fa6341c891104a2fd2313f8798c615a82
+checksum=fd666c51a6bf200643495a04abb261f83229dcb6fd8472ec393df7ffc8b6f195
+make_check=ci-skip
+
+do_check() {
+	dbus-run-session -- python3 -m unittest discover -s tests
+}
 
 post_install() {
 	vlicense LICENSE

From c5c823b2275bc52d528fd74e57e6733109a07e61 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 4 May 2021 11:24:30 +0200
Subject: [PATCH 1988/2024] hwloc: update to 2.4.1.

---
 srcpkgs/hwloc/template | 4 ++--
 srcpkgs/hwloc/update   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/hwloc/template b/srcpkgs/hwloc/template
index 62a08bdd0bb5..a8fba4973b0b 100644
--- a/srcpkgs/hwloc/template
+++ b/srcpkgs/hwloc/template
@@ -1,6 +1,6 @@
 # Template file for 'hwloc'
 pkgname=hwloc
-version=2.3.0
+version=2.4.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://www.open-mpi.org/projects/hwloc/"
 distfiles="https://www.open-mpi.org/software/hwloc/v${version%.*}/downloads/${pkgname}-${version}.tar.bz2"
-checksum=b607f6097873f69ef6b4b01e66e0dcb45f9939e8979827284664bbf0d4018a64
+checksum=392421e69f26120c8ab95d151fe989f2b4b69dab3c7735741c4e0a6d7de5de63
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*|ppc64*) makedepends+=" libnuma-devel";;
diff --git a/srcpkgs/hwloc/update b/srcpkgs/hwloc/update
index cd5e03873cba..0d6931bc97a2 100644
--- a/srcpkgs/hwloc/update
+++ b/srcpkgs/hwloc/update
@@ -1,2 +1,2 @@
-pattern='hwloc v\K[\d.rc]+'
+pattern='hwloc \K\d[\d.rc]+'
 ignore='*rc*'

From 6c3c89500e94e9c3031cb72f570c8ef9f4db5427 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 4 May 2021 11:24:41 +0200
Subject: [PATCH 1989/2024] quickjs: fix update-check.

---
 srcpkgs/quickjs/update | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 srcpkgs/quickjs/update

diff --git a/srcpkgs/quickjs/update b/srcpkgs/quickjs/update
new file mode 100644
index 000000000000..f1638f92252d
--- /dev/null
+++ b/srcpkgs/quickjs/update
@@ -0,0 +1 @@
+pattern='quickjs-\K[\d-]+(?=.tar.xz)'

From 377f9f18567f994f1249717aa866141043f4d0cb Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 4 May 2021 11:26:08 +0200
Subject: [PATCH 1990/2024] k9s: update to 0.24.9.

---
 srcpkgs/k9s/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/k9s/template b/srcpkgs/k9s/template
index 7232ec025e1b..7e3db09bf076 100644
--- a/srcpkgs/k9s/template
+++ b/srcpkgs/k9s/template
@@ -1,6 +1,6 @@
 # Template file for 'k9s'
 pkgname=k9s
-version=0.24.8
+version=0.24.9
 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=347048203464fd022c70f40b5f8b37c0374af083e514a39b49c5993f7886f2bf
+checksum=d4a97a244d2320e42015505e4d78dd1a459adf822371e5e910f6b33027b290ae

From 086b30e9b6382906e884fb2adcb96b232ac7013c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20Treffenst=C3=A4dt?=
 <lucas.treffenstaedt@tngtech.com>
Date: Tue, 4 May 2021 13:52:02 +0200
Subject: [PATCH 1991/2024] intellij-idea-ultimate-edition: update to 2021.1.1.

---
 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 6b1e2474cd69..20b2c7cbd226 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -1,16 +1,16 @@
 # Template file for 'intellij-idea-ultimate-edition'
 pkgname=intellij-idea-ultimate-edition
-version=2021.1
+version=2021.1.1
 revision=1
 archs="i686 x86_64"
-wrksrc="idea-IU-211.6693.111"
+wrksrc="idea-IU-211.7142.45"
 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=fdfd7fda5b4215b9eea925e341f4947eda5319f1b92e1d0083457741e0555318
+checksum=31ce6b0173bc8e046b263d7ab5601e3e1d1535a8e14f54487ce8a7f3a525f1a7
 repository=nonfree
 restricted=yes
 nopie=yes

From 22626bc85d928817b85e42da720afba95dbc68ea Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Tue, 4 May 2021 11:09:35 +0200
Subject: [PATCH 1992/2024] gparted: update to 1.3.0, mv INSTALL.msg to
 README.voidlinux

---
 srcpkgs/gparted/{INSTALL.msg => files/README.voidlinux} | 0
 srcpkgs/gparted/template                                | 5 +++--
 2 files changed, 3 insertions(+), 2 deletions(-)
 rename srcpkgs/gparted/{INSTALL.msg => files/README.voidlinux} (100%)

diff --git a/srcpkgs/gparted/INSTALL.msg b/srcpkgs/gparted/files/README.voidlinux
similarity index 100%
rename from srcpkgs/gparted/INSTALL.msg
rename to srcpkgs/gparted/files/README.voidlinux
diff --git a/srcpkgs/gparted/template b/srcpkgs/gparted/template
index 50d6dbe4dece..2a84ad3954ae 100644
--- a/srcpkgs/gparted/template
+++ b/srcpkgs/gparted/template
@@ -1,6 +1,6 @@
 # Template file for 'gparted'
 pkgname=gparted
-version=1.2.0
+version=1.3.0
 revision=1
 build_style=gnu-configure
 configure_args="--enable-libparted-dmraid"
@@ -13,7 +13,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-or-later"
 homepage="https://gparted.sourceforge.io"
 distfiles="${SOURCEFORGE_SITE}/gparted/gparted/gparted-${version}/gparted-${version}.tar.gz"
-checksum=6c90715d254d7a7ec0208b29007b64160dd9fb7df4c4aa7f8ec2c9d23114c719
+checksum=8dc180245dd9ea45e6e2f4bc69512f187e08be7f799c98a825a0b04c161cbd2a
 
 # Some tests are known to fail since 1.1.0
 # This disables these:
@@ -26,4 +26,5 @@ pre_configure() {
 post_install() {
 	vinstall ${FILESDIR}/org.void.pkexec.gparted.policy 644 /usr/share/polkit-1/actions
 	vbin ${FILESDIR}/gparted-pkexec
+	vdoc "${FILESDIR}/README.voidlinux"
 }

From e34169c998e05996586c4fc60e65bffda2e48809 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Tue, 4 May 2021 08:35:05 +0200
Subject: [PATCH 1993/2024] perl-DateTime-Format-Strptime: update to 1.79

---
 srcpkgs/perl-DateTime-Format-Strptime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-DateTime-Format-Strptime/template b/srcpkgs/perl-DateTime-Format-Strptime/template
index 0bdf353b38da..554202a35c0a 100644
--- a/srcpkgs/perl-DateTime-Format-Strptime/template
+++ b/srcpkgs/perl-DateTime-Format-Strptime/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-DateTime-Format-Strptime'
 pkgname=perl-DateTime-Format-Strptime
-version=1.78
+version=1.79
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="Artistic-2.0"
 homepage="https://metacpan.org/release/DateTime-Format-Strptime"
 distfiles="${CPAN_SITE}/DateTime/${pkgname/perl-/}-$version.tar.gz"
-checksum=5143cb8032301b49abef8b989cbfa7592e78db29b7b8c3b874bb0b9489e0d90f
+checksum=701e46802c86ed4d88695c1a6dacbbe90b3390beeb794f387e7c792300037579

From ef7caadf38e7dac49c2dc8054dda201e4addd37c Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Tue, 4 May 2021 16:03:41 +0300
Subject: [PATCH 1994/2024] font-iosevka: update to 6.1.3

---
 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 768b5b7ebd9f..1155320af055 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
 # Template file for 'font-iosevka'
 pkgname=font-iosevka
-version=6.1.2
+version=6.1.3
 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}/super-ttc-iosevka-${version}.zip
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-slab-${version}.zip"
 checksum="72c3d557ff41d871680652f56afd565ba6834c90eadc45a4ec15410dce1c0c80
- 2415cfa67462a913c4e6e4d55f7fa3b64ed0c57694013704579dc18fb925b874
- 721ab82b60e0168d12731938ec97e0632f8608fd7c6f098ad991946ca1280cd5"
+ 4f2ae801cbcb24adb620d76484653cf5a5e8ebab7836031ab6e9e6a5c9b33529
+ 03540b47cbd710c66a34f8e15449a8a0f6cf4065d63b22d7f0a5d092b53a4352"
 
 font_dirs="/usr/share/fonts/TTF"
 

From 1cd6c246d27f3bc011ed96fd6baba243f44f55fc Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Tue, 4 May 2021 16:00:39 +0300
Subject: [PATCH 1995/2024] font-sarasa-gothic: update to 0.31.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 26d2eaa693ab..5a891813bd19 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.31.1
+version=0.31.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=893dcad279711cc541a143f4ba2356ee1b8e3ff4ed203a2da00601879adda913
+checksum=927968ee2ec67c4073f55adc4775f1ee000419df98ea780236da1851a1c7c75c
 
 font_dirs="/usr/share/fonts/TTF"
 

From b80e6a2c4f7bb8f016a44b91cb3453726c81e006 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 4 May 2021 16:54:27 +0200
Subject: [PATCH 1996/2024] zchunk: update to 1.1.11.

---
 srcpkgs/zchunk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zchunk/template b/srcpkgs/zchunk/template
index b56a3aba18bd..9c351c8210bd 100644
--- a/srcpkgs/zchunk/template
+++ b/srcpkgs/zchunk/template
@@ -1,7 +1,7 @@
 # Template file for 'zchunk'
 pkgname=zchunk
-version=1.1.9
-revision=3
+version=1.1.11
+revision=1
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libcurl-devel libzstd-devel"
@@ -10,7 +10,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/zchunk/zchunk"
 distfiles="https://github.com/zchunk/zchunk/archive/${version}.tar.gz"
-checksum=9e9bac8bb92e86eba50dc7fcf1f79e7835534c3aa15274355ffd84a8bcc03f91
+checksum=febbbfb1de7720641e7e36cef6ae0ce8ed18684e3faf539f703a5497f830267f
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) makedepends+=" argp-standalone"

From 909f8da2eaf4cc0d4bed0ea4133ef108e0307869 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 4 May 2021 17:07:19 +0200
Subject: [PATCH 1997/2024] syncthing: update to 1.16.0.

---
 srcpkgs/syncthing/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index bc393826442b..caabaf3cb191 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,6 +1,6 @@
 # Template file for 'syncthing'
 pkgname=syncthing
-version=1.15.1
+version=1.16.0
 revision=1
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
@@ -17,7 +17,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=ad7276cec428f1b680a660179a29708a68d4214d58c73043453b5a164e316c92
+checksum=1245efe448aa736c209aecfe8abb21677f25887b15c72fb0f352281ef74cb5e3
 
 pre_build() {
 	GOARCH= go generate \

From 76bf2121f54d5ac1939c1c6207f9dc2258db26f1 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Mon, 3 May 2021 20:26:56 +0200
Subject: [PATCH 1998/2024] dpkg: update to 1.20.9.

---
 srcpkgs/dpkg/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/dpkg/template b/srcpkgs/dpkg/template
index 19c1079a9f2f..86b653fe7e45 100644
--- a/srcpkgs/dpkg/template
+++ b/srcpkgs/dpkg/template
@@ -1,20 +1,20 @@
 # Template file for 'dpkg'
 pkgname=dpkg
-version=1.20.5
-revision=2
+version=1.20.9
+revision=1
 build_style=gnu-configure
 configure_args="--disable-start-stop-daemon --with-libz --with-libbz2
  --with-liblzma"
 hostmakedepends="pkg-config perl tar"
 makedepends="zlib-devel bzip2-devel liblzma-devel ncurses-devel"
 depends="perl"
-checkdepends="gnupg perl-Test-Pod"
+checkdepends="gnupg perl-Test-Pod xz"
 short_desc="Debian Package Manager"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://packages.debian.org/dpkg"
 distfiles="${DEBIAN_SITE}/main/d/dpkg/dpkg_${version}.tar.xz"
-checksum=f2f23f3197957d89e54b87cf8fc42ab00e1b74f3a32090efe9acd08443f3e0dd
+checksum=5ce242830f213b5620f08e6c4183adb1ef4dc9da28d31988a27c87c71fe534ce
 
 dpkg-devel_package() {
 	short_desc+=" - development files"

From 6ebaa25bbbbb1e9f9150d1ad41136ff57e63b2d4 Mon Sep 17 00:00:00 2001
From: Abhijit <abhijitsipahimalani@gmail.com>
Date: Tue, 4 May 2021 08:19:43 -0700
Subject: [PATCH 1999/2024] blanket: update to 0.4.1

fixed distfiles

removed trailing whitespace

switched the distfiles location back
---
 srcpkgs/blanket/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/blanket/template b/srcpkgs/blanket/template
index 91fed55cbc17..7bde1ef9e8fe 100644
--- a/srcpkgs/blanket/template
+++ b/srcpkgs/blanket/template
@@ -1,6 +1,6 @@
 # Template file for 'blanket'
 pkgname=blanket
-version=0.3.1
+version=0.4.1
 revision=2
 build_style=meson
 hostmakedepends="pkg-config gettext glib-devel"
@@ -9,6 +9,6 @@ short_desc="Improve focus and productivity by listening to different sounds"
 maintainer="Reback00 <reback00@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/rafaelmardojai/blanket"
-distfiles="https://github.com/rafaelmardojai/blanket/archive/${version}.tar.gz"
-checksum=79942ed919507c0078266d221c433ba9209f8ea5f11371d55d64bd3b469623bf
+distfiles="https://github.com/rafaelmardojai/blanket/archive/refs/tags/${version}.tar.gz"
+checksum=fbb5f34a704840c50bb5b29f6fae69a2f37677d88db717b79e6bf6fdd625d9eb
 python_version=3

From 98c7bce28abc697231e096d49c551a95b27c8426 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 22 Apr 2021 16:35:21 +0200
Subject: [PATCH 2000/2024] base-files: disable unprivileged eBPF by default.

eBPF allowed a fair amount of local privilege escalation in
the past, disallow it for ordinary users by default.
---
 srcpkgs/base-files/files/bpf.conf    | 2 ++
 srcpkgs/base-files/files/sysctl.conf | 2 +-
 srcpkgs/base-files/template          | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/base-files/files/bpf.conf

diff --git a/srcpkgs/base-files/files/bpf.conf b/srcpkgs/base-files/files/bpf.conf
new file mode 100644
index 000000000000..faefda3b8d0e
--- /dev/null
+++ b/srcpkgs/base-files/files/bpf.conf
@@ -0,0 +1,2 @@
+# Block unprivileged use of eBPF
+kernel.unprivileged_bpf_disabled=1
diff --git a/srcpkgs/base-files/files/sysctl.conf b/srcpkgs/base-files/files/sysctl.conf
index 1e1a2768d677..c8e9eaec96be 100644
--- a/srcpkgs/base-files/files/sysctl.conf
+++ b/srcpkgs/base-files/files/sysctl.conf
@@ -2,7 +2,7 @@
 # User-alterable options are in 10-void-user.conf.
 
 # Append the PID to the core filename
-kernel.core_uses_pid = 1
+kernel.core_uses_pid=1
 
 # Enable hard and soft link protection
 fs.protected_hardlinks=1
diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template
index ff629498408b..758cd54ad147 100644
--- a/srcpkgs/base-files/template
+++ b/srcpkgs/base-files/template
@@ -1,6 +1,6 @@
 # Template file for 'base-files'
 pkgname=base-files
-version=0.141
+version=0.142
 revision=11
 bootstrap=yes
 depends="xbps-triggers"
@@ -75,6 +75,7 @@ do_install() {
 	# sysctl(8) files
 	vinstall ${FILESDIR}/sysctl.conf 644 usr/lib/sysctl.d 10-void.conf
 	vinstall ${FILESDIR}/sysctl-user.conf 644 usr/lib/sysctl.d 10-void-user.conf
+	vinstall ${FILESDIR}/bpf.conf 644 usr/lib/sysctl.d 20-bpf.conf
 
 	# Install common licenses, from Debian.
 	vmkdir usr/share/licenses

From 8ee863fd745afaea3682b10a5c655e48ef5ce654 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Tue, 4 May 2021 12:26:12 +0200
Subject: [PATCH 2001/2024] fuzzypkg: add missing xtools dependency

---
 srcpkgs/fuzzypkg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fuzzypkg/template b/srcpkgs/fuzzypkg/template
index 4ef5fdb203b2..70c540da1de9 100644
--- a/srcpkgs/fuzzypkg/template
+++ b/srcpkgs/fuzzypkg/template
@@ -1,8 +1,8 @@
 # Template file for 'fuzzypkg'
 pkgname=fuzzypkg
 version=1.0.4
-revision=1
-depends="bash"
+revision=2
+depends="bash xtools"
 short_desc="XBPS fuzzy package manager"
 maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="MIT"

From b0085903f3f68d1c93672f515c1f9a6fa9f7683b Mon Sep 17 00:00:00 2001
From: Domagoj Stolfa <ds815@gmx.com>
Date: Mon, 3 May 2021 18:17:02 +0100
Subject: [PATCH 2002/2024] ansible-base: add python3-packaging as a runtime
 dependency

Running the current ansible package results in a warning:

"[WARNING]: packaging Python module unavailable; unable to validate collection Ansible version requirements"

A simple web search leads to the Ansible developers stating that
python3-packaging is a dependency for ansible-base[1], and this commit
adds it.

[1]: https://github.com/ansible/ansible/issues/72117
---
 srcpkgs/ansible-base/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ansible-base/template b/srcpkgs/ansible-base/template
index 195856106a84..1d959c2367c3 100644
--- a/srcpkgs/ansible-base/template
+++ b/srcpkgs/ansible-base/template
@@ -1,11 +1,11 @@
 # Template file for 'ansible-base'
 pkgname=ansible-base
 version=2.10.8
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="${hostmakedepends} python3-cryptography python3-Jinja2 python3-paramiko
- python3-yaml"
+ python3-yaml python3-packaging"
 short_desc="Simple deployment, configuration management and execution framework"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="GPL-3.0-or-later"

From 745dae0d13213fd7d05eed38629a6a5923fb7450 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 4 May 2021 16:19:11 -0500
Subject: [PATCH 2003/2024] sqlmap: update to 1.5.5.

---
 srcpkgs/sqlmap/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/sqlmap/template b/srcpkgs/sqlmap/template
index a1cbfdedfaa5..41c7521e8bb2 100644
--- a/srcpkgs/sqlmap/template
+++ b/srcpkgs/sqlmap/template
@@ -1,15 +1,15 @@
 # Template file for 'sqlmap'
 pkgname=sqlmap
-version=1.5.4
+version=1.5.5
 revision=1
-pycompile_dirs="usr/share/sqlmap"
+pycompile_dirs="usr/libexec/sqlmap"
 depends="python3"
 short_desc="Automatic SQL injection and database takeover tool"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://sqlmap.org"
 distfiles="https://github.com/sqlmapproject/sqlmap/archive/${version}.tar.gz"
-checksum=5b86671338102e6f48761b2edd6b7b9db8280cdb788ca531df612ea7654d6743
+checksum=66a234c3ee60604a8edd685a64110663a633757d3183db314edd76526fe1a0d8
 python_version=3
 
 do_install() {

From 4425d3a2116c62cf2881c60de795b44f1d8e71c4 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 4 May 2021 16:28:08 -0500
Subject: [PATCH 2004/2024] Amass: update to 3.12.3.

---
 srcpkgs/Amass/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template
index 2d8a44324103..9494f04abf32 100644
--- a/srcpkgs/Amass/template
+++ b/srcpkgs/Amass/template
@@ -1,6 +1,6 @@
 # Template file for 'Amass'
 pkgname=Amass
-version=3.12.2
+version=3.12.3
 revision=1
 build_style=go
 go_import_path="github.com/OWASP/Amass/v3/..."
@@ -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=e4162b84a25ea6e21aa88c5afb556a4fe8e52c73deb411915faca845842bc769
+checksum=92045ab82afe9a3bf15741c49d8df8d37f3fcb1e5fad7fa1c6f770cfd334bd8d

From 6ba7fb7dae9d6324edda2dbcd98158cf9c453587 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 4 May 2021 17:34:38 -0500
Subject: [PATCH 2005/2024] bpytop: update to 1.0.65.

---
 srcpkgs/bpytop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bpytop/template b/srcpkgs/bpytop/template
index f20fcbf99fb8..1598f3c49d59 100644
--- a/srcpkgs/bpytop/template
+++ b/srcpkgs/bpytop/template
@@ -1,6 +1,6 @@
 # Template file for 'bpytop'
 pkgname=bpytop
-version=1.0.64
+version=1.0.65
 revision=1
 build_style=gnu-makefile
 depends="python3-psutil"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/aristocratos/bpytop"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=233299db3f17863ab69b0f7b149b586c499f5697177ab71b2006770398b11196
+checksum=4c5b59fa24ba70398b19515651b2058eea5b6e940fb10a95dd2615bd6bfd9609
 
 pre_configure() {
 	vsed -e '/^update_check/s/\$update_check/false/' -i bpytop.py

From d0cd120050c086a630797a6fc661c18e4167dca6 Mon Sep 17 00:00:00 2001
From: Abhijit <abhijitsipahimalani@gmail.com>
Date: Tue, 4 May 2021 15:27:28 -0700
Subject: [PATCH 2006/2024] New Package: iwgtk 0.4

Closes: #30669
Closes: #30686 [via git-merge-pr]
---
 srcpkgs/iwgtk/patches/fix-makefile.patch | 29 ++++++++++++++++++++++++
 srcpkgs/iwgtk/template                   | 14 ++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 srcpkgs/iwgtk/patches/fix-makefile.patch
 create mode 100644 srcpkgs/iwgtk/template

diff --git a/srcpkgs/iwgtk/patches/fix-makefile.patch b/srcpkgs/iwgtk/patches/fix-makefile.patch
new file mode 100644
index 000000000000..0ce589d04e96
--- /dev/null
+++ b/srcpkgs/iwgtk/patches/fix-makefile.patch
@@ -0,0 +1,29 @@
+https://patch-diff.githubusercontent.com/raw/J-Lentz/iwgtk/pull/14.patch
+
+--- Makefile.orig
++++ Makefile
+@@ -1,8 +1,8 @@
+-CC=gcc
+-CFLAGS=`pkg-config --cflags gtk+-3.0`
++CC?=gcc
++CCINCS=`pkg-config --cflags gtk+-3.0`
+ LDLIBS=`pkg-config --libs gtk+-3.0`
+ 
+-prefix=/usr/local
++prefix?=$(PREFIX)
+ exec_prefix=$(prefix)
+ bindir=$(exec_prefix)/bin
+ datarootdir=$(prefix)/share
+@@ -23,10 +23,10 @@
+ .PHONY : clean install uninstall
+ 
+ iwgtk : $(objects)
+-	$(CC) $(CFLAGS) -o $@ $^ $(LDLIBS)
++	$(CC) $(CCINCS) $(CFLAGS) -o $@ $^ $(LDLIBS)
+ 
+ %.o : $(srcdir)/%.c $(headers)
+-	$(CC) -c $(CFLAGS) -o $@ $<
++	$(CC) -c $(CCINCS) $(CFLAGS) -o $@ $<
+ 
+ $(srcdir)/icons.c : icons.gresource.xml $(icons)
+ 	glib-compile-resources --target=$@ --sourcedir=icons --generate-source $<
diff --git a/srcpkgs/iwgtk/template b/srcpkgs/iwgtk/template
new file mode 100644
index 000000000000..a9b23b80f0ca
--- /dev/null
+++ b/srcpkgs/iwgtk/template
@@ -0,0 +1,14 @@
+# Template file for 'iwgtk'
+pkgname=iwgtk
+version=0.4
+revision=1
+build_style=gnu-makefile
+hostmakedepends="glib-devel pkg-config"
+makedepends="gtk+3-devel"
+depends="iwd"
+short_desc="GUI WiFi management utility to control iwd"
+maintainer="caughtquick <me@caughtquick.tech>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/J-Lentz/iwgtk/"
+distfiles="https://github.com/J-Lentz/iwgtk/archive/refs/tags/v${version}.tar.gz"
+checksum=71bb85546a55bf710052d4947f6be5f5a01033d04d2d14a85a7e734dd570657d

From de6984a4b0c707e482704f94c4df5d17d2f5d9dd Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 4 May 2021 15:56:09 -0500
Subject: [PATCH 2007/2024] spotify-tui: update to 0.24.0.

---
 srcpkgs/spotify-tui/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/spotify-tui/template b/srcpkgs/spotify-tui/template
index 19593004ef06..686dc039843a 100644
--- a/srcpkgs/spotify-tui/template
+++ b/srcpkgs/spotify-tui/template
@@ -1,7 +1,7 @@
 # Template file for 'spotify-tui'
 pkgname=spotify-tui
-version=0.23.0
-revision=2
+version=0.24.0
+revision=1
 build_style=cargo
 hostmakedepends="pkg-config python3"
 makedepends="openssl-devel python3-devel libxcb-devel"
@@ -10,7 +10,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/Rigellute/spotify-tui"
 distfiles="https://github.com/Rigellute/spotify-tui/archive/v${version}.tar.gz"
-checksum=836a686c78599431b7e4dcf4a2830d16b25d28bdc4f35d79f0d5e8c000788da7
+checksum=c3da9eec76fe5387555b63ff7e4de8e0e4f5eba948af6df112e02cf8031519ee
 
 pre_build() {
 	cargo update --package openssl-sys --precise 0.9.58

From 10cd698d863a9499593873f730ddca189112971e Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 4 May 2021 16:17:38 -0500
Subject: [PATCH 2008/2024] spotify-qt: update to 3.6.

---
 srcpkgs/spotify-qt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spotify-qt/template b/srcpkgs/spotify-qt/template
index a2aa39226749..c9af2988c3d9 100644
--- a/srcpkgs/spotify-qt/template
+++ b/srcpkgs/spotify-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'spotify-qt'
 pkgname=spotify-qt
-version=3.5
+version=3.6
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-devel"
@@ -10,4 +10,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/kraxarn/spotify-qt"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b8c4827a6c3e012b897f0a87ef2cc6e04b2d97f14bc505d19ebd439464094b4e
+checksum=215d4a71db08b54556e2077d14e462497e12b3c91fd9471bee1f4a58ec09cd29

From d18c790b8835b797896b3787b840b59d3e67efab 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, 5 May 2021 07:04:45 +0700
Subject: [PATCH 2009/2024] mutt: update to 2.0.7.

---
 srcpkgs/mutt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template
index 91a9a7b0c8c0..f04981c480dd 100644
--- a/srcpkgs/mutt/template
+++ b/srcpkgs/mutt/template
@@ -1,6 +1,6 @@
 # Template file for 'mutt'
 pkgname=mutt
-version=2.0.6
+version=2.0.7
 revision=1
 build_style=gnu-configure
 configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
@@ -18,7 +18,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.mutt.org"
 changelog="http://mutt.org/relnotes/${version%.*}"
 distfiles="http://ftp.mutt.org/pub/mutt/${pkgname}-${version}.tar.gz"
-checksum=81e31c45895fd624747f19106aa2697d2aa135049ff2e9e9db0a6ed876bcb598
+checksum=957688c6a521561992d4f2f27cf9feb239c7c6c0042c6061c0e474a7dd26cc91
 
 post_install() {
 	# provided by mime-types

From 88a41512e25c0b3d7bf567962a6e09da8d33e429 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Wed, 5 May 2021 01:57:02 +0200
Subject: [PATCH 2010/2024] tor: fix Failing because we have 4063 connections
 already. Please read doc/TUNING for guidance.

---
 srcpkgs/tor/files/tor/run | 1 +
 srcpkgs/tor/template      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/tor/files/tor/run b/srcpkgs/tor/files/tor/run
index 66d61c6c1b59..d0d402d25f5a 100755
--- a/srcpkgs/tor/files/tor/run
+++ b/srcpkgs/tor/files/tor/run
@@ -1,3 +1,4 @@
 #!/bin/sh
 [ -r conf ] && . ./conf
+ulimit -n ${MAX_OPEN_FILES:-8192}
 exec tor ${OPTS:=--quiet} --runasdaemon 0 2>&1
diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index 564a36ec87ef..cef10708f390 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
 # Template file for 'tor'
 pkgname=tor
 version=0.4.5.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-zstd"
 hostmakedepends="pkg-config"

From 52cd162f6e29f66df773ed7bd5f73bdda1f140d0 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Tue, 4 May 2021 23:33:55 +0200
Subject: [PATCH 2011/2024] libhandy1: update to 1.2.2.

---
 srcpkgs/libhandy1/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libhandy1/template b/srcpkgs/libhandy1/template
index c8298f8f629c..b8bc2f205561 100644
--- a/srcpkgs/libhandy1/template
+++ b/srcpkgs/libhandy1/template
@@ -1,6 +1,6 @@
 # Template file for 'libhandy1'
 pkgname=libhandy1
-version=1.2.1
+version=1.2.2
 revision=1
 wrksrc="libhandy-${version}"
 build_style=meson
@@ -15,8 +15,9 @@ short_desc="GTK+3 building blocks for modern adaptive applications"
 maintainer="Paper <paper@tilde.institute>"
 license="LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libhandy/"
+changelog="https://gitlab.gnome.org/GNOME/libhandy/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/libhandy/${version%.*}/libhandy-${version}.tar.xz"
-checksum=411b4c6a4d5f9ed5e46594b4abb04c54af294e3242cf364942029f5e0b6f510b
+checksum=47ffd2865d02bd1ca579522deadd7e2f95362f1f202462fd5eeae2b81668b048
 
 build_options="gir glade gtk_doc"
 desc_option_glade="Generate glade modules and catalog files"

From 612d81b6993da3564e09fd015da69b388ad8b863 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Tue, 4 May 2021 08:20:50 +0200
Subject: [PATCH 2012/2024] gtkdatabox3: fix update check

---
 srcpkgs/gtkdatabox3/update | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 srcpkgs/gtkdatabox3/update

diff --git a/srcpkgs/gtkdatabox3/update b/srcpkgs/gtkdatabox3/update
new file mode 100644
index 000000000000..541d9ae6394b
--- /dev/null
+++ b/srcpkgs/gtkdatabox3/update
@@ -0,0 +1 @@
+pkgname=gtkdatabox

From 940a4aadabad658228e5a557be53817dba6cda75 Mon Sep 17 00:00:00 2001
From: jgart <jgart@dismail.de>
Date: Mon, 3 May 2021 05:49:06 -0400
Subject: [PATCH 2013/2024] chezmoi: update to 2.0.11.

---
 srcpkgs/chezmoi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index eaad865e0f96..970fc1c9bc83 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.0.10
+version=2.0.11
 revision=1
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
@@ -13,7 +13,7 @@ maintainer="Abigail G <dev@kb6.ee>"
 license="MIT"
 homepage="https://chezmoi.io/"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
-checksum=2baff338f656b209502329327764d3f8dd5808f53303a13f3be6d48d076df9a3
+checksum=79f5165f7db7636e8ead30aedcaedd63ad4b710a7fb8c756718a5ba0e6091ec0
 
 post_install() {
 	vlicense LICENSE

From 2715619e0a4dc96e499a677df0e5b0685949f0d0 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Mon, 3 May 2021 20:25:42 +0200
Subject: [PATCH 2014/2024] apache: update to 2.4.47.

---
 srcpkgs/apache/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 54d12f3a57b5..e83e871bfed1 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
 # Template file for 'apache'
 pkgname=apache
-version=2.4.46
-revision=2
+version=2.4.47
+revision=1
 wrksrc="httpd-${version}"
 build_style=gnu-configure
 configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
@@ -36,7 +36,7 @@ license="Apache-2.0"
 homepage="http://httpd.apache.org/"
 changelog="http://www.apache.org/dist/httpd/CHANGES_2.4"
 distfiles="https://archive.apache.org/dist/httpd/httpd-${version}.tar.bz2"
-checksum=740eddf6e1c641992b22359cabc66e6325868c3c5e2e3f98faf349b61ecf41ea
+checksum=23d006dbc8e578116a1138fa457eea824048458e89c84087219f0372880c03ca
 
 system_accounts="_${pkgname}"
 _apache_homedir="/srv/www/$pkgname"

From 91b790b0b002b65b4986755402d12b5827dfbdb1 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Mon, 3 May 2021 20:28:57 +0200
Subject: [PATCH 2015/2024] haproxy: update to 2.3.10.

---
 srcpkgs/haproxy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index 39e7eb4f78e1..5a4c6a12751d 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,6 +1,6 @@
 # Template file for 'haproxy'
 pkgname=haproxy
-version=2.3.8
+version=2.3.10
 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=2aa2691238dbe6360318673603aecd1041df19d55447172f8cd988780788159c
+checksum=9946e0cfc83f29072b3431e37246221cf9d4a9d28a158c075714d345266f4f35
 
 haproxy_homedir="/var/lib/${pkgname}"
 make_dirs="$haproxy_homedir 0750 ${pkgname} ${pkgname}"

From e75389b0788d432872a921288d6c9ee111e85995 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Mon, 3 May 2021 20:28:03 +0200
Subject: [PATCH 2016/2024] loksh: update to 6.9.

---
 srcpkgs/loksh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/loksh/template b/srcpkgs/loksh/template
index 9089c868036a..327ac3a7583d 100644
--- a/srcpkgs/loksh/template
+++ b/srcpkgs/loksh/template
@@ -1,6 +1,6 @@
 # Template file for 'loksh'
 pkgname=loksh
-version=6.8.1
+version=6.9
 revision=1
 build_style=meson
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 license="custom:Public Domain"
 homepage="https://github.com/dimkr/loksh"
 distfiles="https://github.com/dimkr/loksh/releases/download/${version}/loksh-${version}.tar.xz"
-checksum=ceeda4913febdb7e5f42db6a465835178221417e9f24865b0017e89a1a6a610e
+checksum=1633048cd5f1270c5fa28ab49d9cb9f7e8305ab6880601b0c15b88ecb92450f9
 register_shell="/bin/loksh"
 
 alternatives="

From a9da609f80af8ae0405a0ca045774ae855ee9577 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Sun, 2 May 2021 22:53:55 +1000
Subject: [PATCH 2017/2024] retroarch: update to 1.9.2

---
 srcpkgs/retroarch/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index 8b2d3fb445f4..92d6cf76fb7f 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,13 +1,12 @@
 # Template file for 'retroarch'
 pkgname=retroarch
-version=1.9.1
+version=1.9.2
 revision=1
 wrksrc="RetroArch-$version"
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
  --enable-udev --disable-builtinflac --disable-builtinglslang
  --disable-builtinmbedtls --disable-builtinminiupnpc --disable-builtinzlib
- --disable-git_version
  $(vopt_enable ffmpeg) $(vopt_enable flac) $(vopt_enable glslang) $(vopt_enable jack)
  $(vopt_enable miniupnpc) $(vopt_enable pulseaudio pulse) $(vopt_enable qt5 qt)
  $(vopt_enable sdl2) $(vopt_enable vulkan) $(vopt_enable wayland) $(vopt_enable x11)"
@@ -25,7 +24,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.retroarch.com/"
 distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
-checksum=153f7057cecd22441904f557302d50f969d199c4b6ff263bfe87d9cf4a9bab75
+checksum=782b1d15ac20b5b629e9e520bbfd8f0a4e00bf1bbeb10189f811770b68b610cf
 
 build_options="ffmpeg flac gles2 glslang jack miniupnpc neon opengl pulseaudio qt5 sdl2 vulkan wayland x11"
 build_options_default="ffmpeg flac gles2 glslang miniupnpc opengl pulseaudio sdl2 vulkan wayland x11"

From 0ca709ce3a39302a96bbf2a1e4c26790cef8ffa3 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 1 May 2021 13:28:28 -0700
Subject: [PATCH 2018/2024] kinfocenter: fix license

---
 srcpkgs/kinfocenter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template
index f3854c636e4e..825a1234b7ea 100644
--- a/srcpkgs/kinfocenter/template
+++ b/srcpkgs/kinfocenter/template
@@ -1,7 +1,7 @@
 # Template file for 'kinfocenter'
 pkgname=kinfocenter
 version=5.21.4
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext pkg-config qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ makedepends="kdoctools plasma-framework-devel kdesignerplugin-devel kcmutils-dev
 depends="hwids"
 short_desc="KDE Info Center"
 maintainer="John <me@johnnynator.dev>"
-license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2"
+license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/kinfocenter"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
 checksum=3e5c3fed0156f3464bb30ebb9e0822c4141d71802dfa8995961f84c548771394

From 0e2b3a735510f6b064e36b44c1fd5d58c060d5e8 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 1 May 2021 13:36:47 -0700
Subject: [PATCH 2019/2024] klystrack: fix license

---
 srcpkgs/klystrack/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/klystrack/template b/srcpkgs/klystrack/template
index 927645f0787c..fa15065adcad 100644
--- a/srcpkgs/klystrack/template
+++ b/srcpkgs/klystrack/template
@@ -1,14 +1,14 @@
 # Template file for 'klystrack'
 pkgname=klystrack
 version=1.7.3
-revision=1
+revision=2
 _klystronsha=f5114db4de299ece73852becbef56d7d461bf421
 create_wrksrc=yes
 hostmakedepends="SDL2-devel"
 makedepends="SDL2_image-devel SDL2_mixer-devel"
 short_desc="Chiptune music tracker"
 maintainer="allan <mail@may.mooo.com>"
-license="BSD"
+license="MIT"
 homepage="http://kometbomb.github.io/klystrack/"
 distfiles="https://github.com/kometbomb/klystrack/archive/${version}.tar.gz
  https://github.com/kometbomb/klystron/archive/${_klystronsha}.tar.gz"
@@ -45,5 +45,5 @@ do_install() {
 	vcopy key usr/lib/klystrack
 	vmkdir usr/share/examples/klystrack
 	vcopy examples usr/share/examples/klystrack
-	vlicense linux/copyright
+	vlicense doc/LICENSE
 }

From 0ec1f43b000a90188c019305af23d1eae71eb3a5 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sat, 1 May 2021 13:45:54 -0700
Subject: [PATCH 2020/2024] kmenuedit: fix license

---
 srcpkgs/kmenuedit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmenuedit/template b/srcpkgs/kmenuedit/template
index 0115325e3485..8809898978b4 100644
--- a/srcpkgs/kmenuedit/template
+++ b/srcpkgs/kmenuedit/template
@@ -1,7 +1,7 @@
 # Template file for 'kmenuedit'
 pkgname=kmenuedit
 version=5.21.4
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools
@@ -10,7 +10,7 @@ makedepends="kdelibs4support-devel kdesignerplugin-devel kdoctools"
 depends="khotkeys"
 short_desc="KDE Menu editor"
 maintainer="John <me@johnnynator.dev>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kmenuedit"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
 checksum=d022bb6486663fd1db8b627794be5eb557fa0daa45b27bb69d834fa84494b8c2

From b09f6993f7b0557db37e5120f78293c80317765d Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Mon, 3 May 2021 18:24:37 -0700
Subject: [PATCH 2021/2024] ksysguard: fix license

---
 srcpkgs/ksysguard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksysguard/template b/srcpkgs/ksysguard/template
index 3603a4f413c9..8ab3e37792bb 100644
--- a/srcpkgs/ksysguard/template
+++ b/srcpkgs/ksysguard/template
@@ -1,7 +1,7 @@
 # Template file for 'ksysguard'
 pkgname=ksysguard
 version=5.21.4
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools
@@ -11,7 +11,7 @@ makedepends="knewstuff-devel libksysguard-devel kinit-devel libsensors-devel
 depends="hicolor-icon-theme lm_sensors"
 short_desc="KDE program to monitor various elements of your system"
 maintainer="John <me@johnnynator.dev>"
-license="GPL-2.0-or-later, GFDL-1.2"
+license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/ksysguard"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
 checksum=cd1482653c35c5e04e6940346836fcd0655c213fc191da30685cb10cd05ae582

From cdfec0a7190b94e8154ba4d4ff15f4f337e1f59e Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Mon, 3 May 2021 18:34:47 -0700
Subject: [PATCH 2022/2024] ktoblzcheck: fix license, other lint, fix test

Test fix is a temporary stand-in until the next version.
---
 srcpkgs/ktoblzcheck/template | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/ktoblzcheck/template b/srcpkgs/ktoblzcheck/template
index 8d04d9e51f46..45cdb65345e5 100644
--- a/srcpkgs/ktoblzcheck/template
+++ b/srcpkgs/ktoblzcheck/template
@@ -1,17 +1,21 @@
 # Template file for 'ktoblzcheck'
 pkgname=ktoblzcheck
 version=1.53
-revision=1
+revision=2
+build_style=cmake
+configure_args="-DENABLE_BANKDATA_DOWNLOAD=NO"
 hostmakedepends="pkg-config python"
 makedepends="python-devel"
-build_style=cmake
+short_desc="Tool for verification of account numbers and bank codes"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="LGPL-2.1"
+license="LGPL-2.1-or-later"
 homepage="http://ktoblzcheck.sourceforge.net"
-short_desc="Tool for verification of account numbers and bank codes"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=18b9118556fe83240f468f770641d2578f4ff613cdcf0a209fb73079ccb70c55
-configure_args="-DENABLE_BANKDATA_DOWNLOAD=NO"
+
+post_patch() {
+	vsed -i src/python/test_ktoblzcheck.py -e 's/Postbank Ndl der DB Privat- und Firmenkundenbank/Postbank Ndl der Deutsche Bank/'
+}
 
 ktoblzcheck-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 01954f29c2f28c0fe49def9cf35ca5aa0e9760c9 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Mon, 3 May 2021 20:28:27 +0200
Subject: [PATCH 2023/2024] kexec-tools: update to 2.0.22.

Closes: #30652 [via git-merge-pr]
---
 srcpkgs/kexec-tools/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kexec-tools/template b/srcpkgs/kexec-tools/template
index 761e5c60a9fe..06f6f4527138 100644
--- a/srcpkgs/kexec-tools/template
+++ b/srcpkgs/kexec-tools/template
@@ -1,17 +1,17 @@
 # Template file for 'kexec-tools'
 pkgname=kexec-tools
-version=2.0.21
+version=2.0.22
 revision=1
 create_wrksrc=yes
 build_style=gnu-configure
 hostmakedepends="tar xz"
 makedepends="zlib-devel liblzma-devel"
 short_desc="Tools to support fast kexec reboots"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
 license="GPL-2.0-only"
 homepage="http://kernel.org/pub/linux/utils/kernel/kexec/"
 distfiles="${KERNEL_SITE}/utils/kernel/kexec/${pkgname}-${version}.tar.xz"
-checksum=e113142dee891638ad96e0f72cf9277b244477619470b30c41999d312e8e8702
+checksum=96c97f49ed86049f8b72722cb53e7fe3693e5a4f31e78a3a6249e3d18dac49c2
 skip_extraction="${pkgname}-${version}.tar.xz"
 
 CFLAGS="-fcommon"

From 1b1aaa38b3c24b81bb8206431987c5822f115af7 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Mon, 3 May 2021 20:26:13 +0200
Subject: [PATCH 2024/2024] ethtool: update to 5.12.

---
 srcpkgs/ethtool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ethtool/template b/srcpkgs/ethtool/template
index 19c9799eaa64..e9d8c365320f 100644
--- a/srcpkgs/ethtool/template
+++ b/srcpkgs/ethtool/template
@@ -1,6 +1,6 @@
 # Template file for 'ethtool'
 pkgname=ethtool
-version=5.10
+version=5.12
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -10,4 +10,4 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="http://www.kernel.org/pub/software/network/ethtool/"
 distfiles="http://www.kernel.org/pub/software/network/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=817d5396a9307b4c637b435d4c558b8f5f964a1464a035ca3c0180f4cc93cfcf
+checksum=f5ddfa9c75053d8011b8c8c99ec4e2d3c83cd1972f638692d62e37fa3ef36f07

^ permalink raw reply	[flat|nested] 37+ 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
                   ` (16 preceding siblings ...)
  2021-05-05 13:36 ` Logarithmus
@ 2021-05-05 13:39 ` Logarithmus
  2021-05-05 20:16 ` Logarithmus
                   ` (17 subsequent siblings)
  35 siblings, 0 replies; 37+ messages in thread
From: Logarithmus @ 2021-05-05 13:39 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 552f49dd2b275f2d81a3c8060c35b0002ea9a9b7 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 0d5970dd8d4d5d17ba6908c2aeddb4290540432c 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] 37+ 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
                   ` (17 preceding siblings ...)
  2021-05-05 13:39 ` Logarithmus
@ 2021-05-05 20:16 ` Logarithmus
  2021-05-06  8:20 ` [BUGFIX] " Logarithmus
                   ` (16 subsequent siblings)
  35 siblings, 0 replies; 37+ messages in thread
From: Logarithmus @ 2021-05-05 20:16 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 165 bytes --]

New comment by Logarithmus on void-packages repository

https://github.com/void-linux/void-packages/pull/29756#issuecomment-832978332

Comment:
@ericonr gentle ping

^ permalink raw reply	[flat|nested] 37+ messages in thread

* Re: [BUGFIX] 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
                   ` (18 preceding siblings ...)
  2021-05-05 20:16 ` Logarithmus
@ 2021-05-06  8:20 ` Logarithmus
  2021-05-06  9:36 ` Logarithmus
                   ` (15 subsequent siblings)
  35 siblings, 0 replies; 37+ messages in thread
From: Logarithmus @ 2021-05-06  8:20 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1247 bytes --]

New comment by Logarithmus on void-packages repository

https://github.com/void-linux/void-packages/pull/29756#issuecomment-832978332

Comment:
@ericonr `sccache-0.2.13` is buggy and doesn't work. I always get this error when I run `cargo build`:

```
Caused by:
  process didn't exit successfully: `/usr/bin/sccache rustc - --crate-name ___ --print=file-names --crate-type bin --crate-type rlib --crate-type dylib --crate-type cdylib --crate-type staticlib --crate-type proc-macro --print=sysroot --print=cfg` (exit code: 2)
  --- stderr
  error: failed to execute compile
  caused by: Failed to send data to or receive data from server
  caused by: Failed to read response header
  caused by: failed to fill whole buffer
```

More info: https://github.com/mozilla/sccache/issues/887, https://github.com/mozilla/sccache/issues/887#issuecomment-737938142
As you can see, version 0.2.13 is unusable. I noticed that and thus filed this PR back in March. Unfortunately, you don't seem interested in merging it, so I decided to provide some proofs that this change is very important.

I've also managed to add `sccache` support to `xbps-src`, just like `ccache`. Obviously, it doesn't work on `sccache-0.2.15`, so this PR is a blocker.

^ permalink raw reply	[flat|nested] 37+ messages in thread

* Re: [BUGFIX] 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
                   ` (19 preceding siblings ...)
  2021-05-06  8:20 ` [BUGFIX] " Logarithmus
@ 2021-05-06  9:36 ` Logarithmus
  2021-05-06 14:54 ` ericonr
                   ` (14 subsequent siblings)
  35 siblings, 0 replies; 37+ messages in thread
From: Logarithmus @ 2021-05-06  9:36 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1247 bytes --]

New comment by Logarithmus on void-packages repository

https://github.com/void-linux/void-packages/pull/29756#issuecomment-832978332

Comment:
@ericonr `sccache-0.2.13` is buggy and doesn't work. I always get this error when I run `cargo build`:

```
Caused by:
  process didn't exit successfully: `/usr/bin/sccache rustc - --crate-name ___ --print=file-names --crate-type bin --crate-type rlib --crate-type dylib --crate-type cdylib --crate-type staticlib --crate-type proc-macro --print=sysroot --print=cfg` (exit code: 2)
  --- stderr
  error: failed to execute compile
  caused by: Failed to send data to or receive data from server
  caused by: Failed to read response header
  caused by: failed to fill whole buffer
```

More info: https://github.com/mozilla/sccache/issues/887, https://github.com/mozilla/sccache/issues/887#issuecomment-737938142
As you can see, version 0.2.13 is unusable. I noticed that and thus filed this PR back in March. Unfortunately, you don't seem interested in merging it, so I decided to provide some proofs that this change is very important.

I've also managed to add `sccache` support to `xbps-src`, just like `ccache`. Obviously, it doesn't work on `sccache-0.2.13`, so this PR is a blocker.

^ permalink raw reply	[flat|nested] 37+ messages in thread

* Re: [BUGFIX] 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
                   ` (20 preceding siblings ...)
  2021-05-06  9:36 ` Logarithmus
@ 2021-05-06 14:54 ` ericonr
  2021-06-29 11:59 ` [PR PATCH] [Updated] " Logarithmus
                   ` (13 subsequent siblings)
  35 siblings, 0 replies; 37+ messages in thread
From: ericonr @ 2021-05-06 14:54 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 322 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29756#issuecomment-833588876

Comment:
Please don't make separate packages, the `rust-std` package is 117MB compressed, and anyone using this has one (or more) `rust-std` installed (either via void packages or `rustup`).

^ permalink raw reply	[flat|nested] 37+ messages in thread

* Re: [PR PATCH] [Updated] [BUGFIX] 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
                   ` (21 preceding siblings ...)
  2021-05-06 14:54 ` ericonr
@ 2021-06-29 11:59 ` Logarithmus
  2021-06-29 12:03 ` Logarithmus
                   ` (12 subsequent siblings)
  35 siblings, 0 replies; 37+ messages in thread
From: Logarithmus @ 2021-06-29 11:59 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1624 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

[BUGFIX] 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: 1520 bytes --]

From ffa7dbea7ca8c7ac5528b0605562072cadf3ce56 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 distributed builds

---
 srcpkgs/rust-sccache/template | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index 5d8f2bf185c1..552f63b976bb 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -1,23 +1,22 @@
 # 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"
-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*) ;;
+	x86_64*) configure_args+=" --features dist-server"
+	i686*|arm*|aarch64*) ;;
 	*) broken="ftbfs in ring" ;;
 esac
-
-pre_build() {
-	cargo update --package openssl-sys --precise 0.9.58
-}

^ permalink raw reply	[flat|nested] 37+ messages in thread

* Re: [PR PATCH] [Updated] [BUGFIX] 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
                   ` (22 preceding siblings ...)
  2021-06-29 11:59 ` [PR PATCH] [Updated] " Logarithmus
@ 2021-06-29 12:03 ` Logarithmus
  2021-06-29 21:52 ` Logarithmus
                   ` (11 subsequent siblings)
  35 siblings, 0 replies; 37+ messages in thread
From: Logarithmus @ 2021-06-29 12:03 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1624 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

[BUGFIX] 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: 1523 bytes --]

From 2b7311d5110a76154bba0f739a8e22af0cd75cb9 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 distributed builds

---
 srcpkgs/rust-sccache/template | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index 5d8f2bf185c1..d2cd3c0f902c 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -1,23 +1,22 @@
 # 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"
-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*) ;;
+	x86_64*) configure_args+=" --features dist-server" ;;
+	i686*|arm*|aarch64*) ;;
 	*) broken="ftbfs in ring" ;;
 esac
-
-pre_build() {
-	cargo update --package openssl-sys --precise 0.9.58
-}

^ permalink raw reply	[flat|nested] 37+ messages in thread

* Re: [PR PATCH] [Updated] [BUGFIX] 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
                   ` (23 preceding siblings ...)
  2021-06-29 12:03 ` Logarithmus
@ 2021-06-29 21:52 ` Logarithmus
  2021-06-29 22:08 ` Logarithmus
                   ` (10 subsequent siblings)
  35 siblings, 0 replies; 37+ messages in thread
From: Logarithmus @ 2021-06-29 21:52 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1624 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

[BUGFIX] 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: 1523 bytes --]

From bdb22dba8182b2201407ec06b9ddf2e3e790bea1 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 distributed builds

---
 srcpkgs/rust-sccache/template | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index 5d8f2bf185c1..d2cd3c0f902c 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -1,23 +1,22 @@
 # 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"
-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*) ;;
+	x86_64*) configure_args+=" --features dist-server" ;;
+	i686*|arm*|aarch64*) ;;
 	*) broken="ftbfs in ring" ;;
 esac
-
-pre_build() {
-	cargo update --package openssl-sys --precise 0.9.58
-}

^ permalink raw reply	[flat|nested] 37+ messages in thread

* Re: [BUGFIX] 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
                   ` (24 preceding siblings ...)
  2021-06-29 21:52 ` Logarithmus
@ 2021-06-29 22:08 ` Logarithmus
  2021-07-01 12:26 ` [PR PATCH] [Updated] [BUGFIX] rust-sccache: update to 0.2.15, enable feature=dist-server for x86_64* Logarithmus
                   ` (9 subsequent siblings)
  35 siblings, 0 replies; 37+ messages in thread
From: Logarithmus @ 2021-06-29 22:08 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 274 bytes --]

New comment by Logarithmus on void-packages repository

https://github.com/void-linux/void-packages/pull/29756#issuecomment-870951903

Comment:
@ericonr seems it builds fine, though during build of `x86_64-musl` there were some issues with Internet connection on CI server.

^ permalink raw reply	[flat|nested] 37+ messages in thread

* Re: [PR PATCH] [Updated] [BUGFIX] rust-sccache: update to 0.2.15, enable feature=dist-server for x86_64*
  2021-03-25 20:22 [PR PATCH] rust-sccache: update to 0.2.15 Logarithmus
                   ` (25 preceding siblings ...)
  2021-06-29 22:08 ` Logarithmus
@ 2021-07-01 12:26 ` Logarithmus
  2021-07-18 14:51 ` Logarithmus
                   ` (8 subsequent siblings)
  35 siblings, 0 replies; 37+ messages in thread
From: Logarithmus @ 2021-07-01 12:26 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1475 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

[BUGFIX] rust-sccache: update to 0.2.15, enable feature=dist-server for x86_64*
<!-- Mark items with [x] where applicable -->

#### 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: 1523 bytes --]

From 97d178011a3dd9bc6d8de22d61b73bcd3c27e903 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 distributed builds

---
 srcpkgs/rust-sccache/template | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index 5d8f2bf185c1..d2cd3c0f902c 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -1,23 +1,22 @@
 # 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"
-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*) ;;
+	x86_64*) configure_args+=" --features dist-server" ;;
+	i686*|arm*|aarch64*) ;;
 	*) broken="ftbfs in ring" ;;
 esac
-
-pre_build() {
-	cargo update --package openssl-sys --precise 0.9.58
-}

^ permalink raw reply	[flat|nested] 37+ messages in thread

* Re: [PR PATCH] [Updated] [BUGFIX] rust-sccache: update to 0.2.15, enable feature=dist-server for x86_64*
  2021-03-25 20:22 [PR PATCH] rust-sccache: update to 0.2.15 Logarithmus
                   ` (26 preceding siblings ...)
  2021-07-01 12:26 ` [PR PATCH] [Updated] [BUGFIX] rust-sccache: update to 0.2.15, enable feature=dist-server for x86_64* Logarithmus
@ 2021-07-18 14:51 ` Logarithmus
  2021-07-27  1:06 ` Logarithmus
                   ` (7 subsequent siblings)
  35 siblings, 0 replies; 37+ messages in thread
From: Logarithmus @ 2021-07-18 14:51 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1475 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

[BUGFIX] rust-sccache: update to 0.2.15, enable feature=dist-server for x86_64*
<!-- Mark items with [x] where applicable -->

#### 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: 1523 bytes --]

From 4d3c37e5cb53159669d6d5f726b5797b42b325d4 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 distributed builds

---
 srcpkgs/rust-sccache/template | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index 5d8f2bf185c1..d2cd3c0f902c 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -1,23 +1,22 @@
 # 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"
-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*) ;;
+	x86_64*) configure_args+=" --features dist-server" ;;
+	i686*|arm*|aarch64*) ;;
 	*) broken="ftbfs in ring" ;;
 esac
-
-pre_build() {
-	cargo update --package openssl-sys --precise 0.9.58
-}

^ permalink raw reply	[flat|nested] 37+ messages in thread

* Re: [PR PATCH] [Updated] [BUGFIX] rust-sccache: update to 0.2.15, enable feature=dist-server for x86_64*
  2021-03-25 20:22 [PR PATCH] rust-sccache: update to 0.2.15 Logarithmus
                   ` (27 preceding siblings ...)
  2021-07-18 14:51 ` Logarithmus
@ 2021-07-27  1:06 ` Logarithmus
  2021-07-27  1:08 ` Logarithmus
                   ` (6 subsequent siblings)
  35 siblings, 0 replies; 37+ messages in thread
From: Logarithmus @ 2021-07-27  1:06 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1475 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

[BUGFIX] rust-sccache: update to 0.2.15, enable feature=dist-server for x86_64*
<!-- Mark items with [x] where applicable -->

#### 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: 1881 bytes --]

From d44cf24d2ed8550f341764a725840af4d805423d 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 distributed builds

---
 srcpkgs/rust-sccache/template | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index 5d8f2bf185c1..cf35867a481f 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
 hostmakedepends="pkg-config"
 makedepends="openssl-devel"
-short_desc="Sccache is a ccache-like tool"
+checkdepends="cargo"
+# test_rust_cargo: tests/test-crate directory exists in v0.2.15 tag on github,
+# but is strangely missing from v0.2.15 on crates.io
+make_check_args="-- --skip test_rust_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
 
 case "$XBPS_TARGET_MACHINE" in
-	x86_64*|i686*|arm*|aarch64*) ;;
+	x86_64*) configure_args+=" --features dist-server" ;;
+	i686*|arm*|aarch64*) ;;
 	*) broken="ftbfs in ring" ;;
 esac
 
-pre_build() {
-	cargo update --package openssl-sys --precise 0.9.58
-}
+# test_sccache_command will fail if gcc/clang is actually a ccache wrapper
+# requires fixing in upstream
+if [ -n "$XBPS_CCACHE" ]; then
+	make_check_args+=" --skip test_sccache_command"
+fi

^ permalink raw reply	[flat|nested] 37+ messages in thread

* Re: [PR PATCH] [Updated] [BUGFIX] rust-sccache: update to 0.2.15, enable feature=dist-server for x86_64*
  2021-03-25 20:22 [PR PATCH] rust-sccache: update to 0.2.15 Logarithmus
                   ` (28 preceding siblings ...)
  2021-07-27  1:06 ` Logarithmus
@ 2021-07-27  1:08 ` Logarithmus
  2021-07-27  1:10 ` Logarithmus
                   ` (5 subsequent siblings)
  35 siblings, 0 replies; 37+ messages in thread
From: Logarithmus @ 2021-07-27  1:08 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1475 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

[BUGFIX] rust-sccache: update to 0.2.15, enable feature=dist-server for x86_64*
<!-- Mark items with [x] where applicable -->

#### 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: 1881 bytes --]

From 828926e9fbb4e70ec1fe5d101d0219348b5081f2 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 distributed builds

---
 srcpkgs/rust-sccache/template | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index 5d8f2bf185c1..0b200b9ed294 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
+# test_rust_cargo: tests/test-crate directory exists in v0.2.15 tag on github,
+# but is strangely missing from v0.2.15 on crates.io
+make_check_args="-- --skip test_rust_cargo"
 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++ & 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
 
 case "$XBPS_TARGET_MACHINE" in
-	x86_64*|i686*|arm*|aarch64*) ;;
+	x86_64*) configure_args+=" --features dist-server" ;;
+	i686*|arm*|aarch64*) ;;
 	*) broken="ftbfs in ring" ;;
 esac
 
-pre_build() {
-	cargo update --package openssl-sys --precise 0.9.58
-}
+# test_sccache_command will fail if gcc/clang is actually a ccache wrapper
+# requires fixing in upstream
+if [ -n "$XBPS_CCACHE" ]; then
+	make_check_args+=" --skip test_sccache_command"
+fi

^ permalink raw reply	[flat|nested] 37+ messages in thread

* Re: [PR PATCH] [Updated] [BUGFIX] rust-sccache: update to 0.2.15, enable feature=dist-server for x86_64*
  2021-03-25 20:22 [PR PATCH] rust-sccache: update to 0.2.15 Logarithmus
                   ` (29 preceding siblings ...)
  2021-07-27  1:08 ` Logarithmus
@ 2021-07-27  1:10 ` Logarithmus
  2021-07-27  1:51 ` Logarithmus
                   ` (4 subsequent siblings)
  35 siblings, 0 replies; 37+ messages in thread
From: Logarithmus @ 2021-07-27  1:10 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1475 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

[BUGFIX] rust-sccache: update to 0.2.15, enable feature=dist-server for x86_64*
<!-- Mark items with [x] where applicable -->

#### 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: 1881 bytes --]

From 4e283e2e5b7c107b2c4fdb8300be710874242a7c 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 distributed builds

---
 srcpkgs/rust-sccache/template | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index 5d8f2bf185c1..0b200b9ed294 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
+# test_rust_cargo: tests/test-crate directory exists in v0.2.15 tag on github,
+# but is strangely missing from v0.2.15 on crates.io
+make_check_args="-- --skip test_rust_cargo"
 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++ & 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
 
 case "$XBPS_TARGET_MACHINE" in
-	x86_64*|i686*|arm*|aarch64*) ;;
+	x86_64*) configure_args+=" --features dist-server" ;;
+	i686*|arm*|aarch64*) ;;
 	*) broken="ftbfs in ring" ;;
 esac
 
-pre_build() {
-	cargo update --package openssl-sys --precise 0.9.58
-}
+# test_sccache_command will fail if gcc/clang is actually a ccache wrapper
+# requires fixing in upstream
+if [ -n "$XBPS_CCACHE" ]; then
+	make_check_args+=" --skip test_sccache_command"
+fi

^ permalink raw reply	[flat|nested] 37+ messages in thread

* Re: [BUGFIX] rust-sccache: update to 0.2.15, enable feature=dist-server for x86_64*
  2021-03-25 20:22 [PR PATCH] rust-sccache: update to 0.2.15 Logarithmus
                   ` (30 preceding siblings ...)
  2021-07-27  1:10 ` Logarithmus
@ 2021-07-27  1:51 ` Logarithmus
  2021-07-27  1:56 ` Logarithmus
                   ` (3 subsequent siblings)
  35 siblings, 0 replies; 37+ messages in thread
From: Logarithmus @ 2021-07-27  1:51 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 510 bytes --]

New comment by Logarithmus on void-packages repository

https://github.com/void-linux/void-packages/pull/29756#issuecomment-887146555

Comment:
@ericonr seems like `cargo 0.54.0` has some issue with HTTP/2 and thus fails to work inside Github Actions. The issue has its roots in `curl`.
More info: https://github.com/rust-lang/cargo/issues/9697, https://github.com/rust-lang/crates.io/issues/3782#issuecomment-880868422, https://github.com/rust-lang/cargo/pull/9695,  https://github.com/curl/curl/issues/7400

^ permalink raw reply	[flat|nested] 37+ messages in thread

* Re: [BUGFIX] rust-sccache: update to 0.2.15, enable feature=dist-server for x86_64*
  2021-03-25 20:22 [PR PATCH] rust-sccache: update to 0.2.15 Logarithmus
                   ` (31 preceding siblings ...)
  2021-07-27  1:51 ` Logarithmus
@ 2021-07-27  1:56 ` Logarithmus
  2021-07-27  6:23 ` redasamik
                   ` (2 subsequent siblings)
  35 siblings, 0 replies; 37+ messages in thread
From: Logarithmus @ 2021-07-27  1:56 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 661 bytes --]

New comment by Logarithmus on void-packages repository

https://github.com/void-linux/void-packages/pull/29756#issuecomment-887146555

Comment:
@ericonr seems like `cargo 0.54.0` has some issue with HTTP/2 and thus fails to work inside Github Actions. The issue has its roots in `curl`.
More info: https://github.com/rust-lang/cargo/issues/9697, https://github.com/rust-lang/crates.io/issues/3782#issuecomment-880868422, https://github.com/rust-lang/cargo/pull/9695,  https://github.com/curl/curl/issues/7400

I really hope https://github.com/rust-lang/cargo/pull/9695 will be included into `rust 1.54`, otherwise we will have to wait for another 6 weeks...

^ permalink raw reply	[flat|nested] 37+ messages in thread

* Re: [BUGFIX] rust-sccache: update to 0.2.15, enable feature=dist-server for x86_64*
  2021-03-25 20:22 [PR PATCH] rust-sccache: update to 0.2.15 Logarithmus
                   ` (32 preceding siblings ...)
  2021-07-27  1:56 ` Logarithmus
@ 2021-07-27  6:23 ` redasamik
  2022-05-14  2:17 ` github-actions
  2022-05-29  2:13 ` [PR PATCH] [Closed]: " github-actions
  35 siblings, 0 replies; 37+ messages in thread
From: redasamik @ 2021-07-27  6:23 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1087 bytes --]

New comment by redasamik on void-packages repository

https://github.com/void-linux/void-packages/pull/29756#issuecomment-887245398

Comment:
بتاريخ الثلاثاء، 27 يوليو 2021، جاء من Artur Sinila <
***@***.***>:

> @ericonr <https://github.com/ericonr> seems like cargo 0.54.0 has some
> issue with HTTP/2 and thus fails to work inside Github Actions. The issue
> has its roots in curl.
> More info: rust-lang/cargo#9697
> <https://github.com/rust-lang/cargo/issues/9697>, rust-lang/crates.io#3782
> (comment)
> <https://github.com/rust-lang/crates.io/issues/3782#issuecomment-880868422>,
> rust-lang/cargo#9695 <https://github.com/rust-lang/cargo/pull/9695>,
> curl/curl#7400 <https://github.com/curl/curl/issues/7400>
>
> —
> You are receiving this because you are subscribed to this thread.
> Reply to this email directly, view it on GitHub
> <https://github.com/void-linux/void-packages/pull/29756#issuecomment-887146555>,
> or unsubscribe
> <https://github.com/notifications/unsubscribe-auth/AOW7T7HCFPHMAVYINO2E5G3TZYGLXANCNFSM4Z2CBFQA>
> .
>


-- 
reda


^ permalink raw reply	[flat|nested] 37+ messages in thread

* Re: [BUGFIX] rust-sccache: update to 0.2.15, enable feature=dist-server for x86_64*
  2021-03-25 20:22 [PR PATCH] rust-sccache: update to 0.2.15 Logarithmus
                   ` (33 preceding siblings ...)
  2021-07-27  6:23 ` redasamik
@ 2022-05-14  2:17 ` github-actions
  2022-05-29  2:13 ` [PR PATCH] [Closed]: " github-actions
  35 siblings, 0 replies; 37+ messages in thread
From: github-actions @ 2022-05-14  2:17 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 305 bytes --]

New comment by github-actions[bot] on void-packages repository

https://github.com/void-linux/void-packages/pull/29756#issuecomment-1126614046

Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that.  If this pull request is still relevant bump it or assign it.

^ permalink raw reply	[flat|nested] 37+ messages in thread

* Re: [PR PATCH] [Closed]: [BUGFIX] rust-sccache: update to 0.2.15, enable feature=dist-server for x86_64*
  2021-03-25 20:22 [PR PATCH] rust-sccache: update to 0.2.15 Logarithmus
                   ` (34 preceding siblings ...)
  2022-05-14  2:17 ` github-actions
@ 2022-05-29  2:13 ` github-actions
  35 siblings, 0 replies; 37+ messages in thread
From: github-actions @ 2022-05-29  2:13 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1311 bytes --]

There's a closed pull request on the void-packages repository

[BUGFIX] rust-sccache: update to 0.2.15, enable feature=dist-server for x86_64*
https://github.com/void-linux/void-packages/pull/29756

Description:
<!-- Mark items with [x] where applicable -->

#### 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
-->


^ permalink raw reply	[flat|nested] 37+ messages in thread

end of thread, other threads:[~2022-05-29  2:13 UTC | newest]

Thread overview: 37+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
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
2021-03-27 13:28 ` Logarithmus
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
2021-03-27 15:09 ` [PR PATCH] [Updated] " Logarithmus
2021-03-27 15:10 ` Logarithmus
2021-03-27 19:14 ` Logarithmus
2021-03-27 19:16 ` [PR PATCH] [Updated] " Logarithmus
2021-04-01 17:33 ` Logarithmus
2021-04-01 17:34 ` Logarithmus
2021-05-05 13:36 ` Logarithmus
2021-05-05 13:39 ` Logarithmus
2021-05-05 20:16 ` Logarithmus
2021-05-06  8:20 ` [BUGFIX] " Logarithmus
2021-05-06  9:36 ` Logarithmus
2021-05-06 14:54 ` ericonr
2021-06-29 11:59 ` [PR PATCH] [Updated] " Logarithmus
2021-06-29 12:03 ` Logarithmus
2021-06-29 21:52 ` Logarithmus
2021-06-29 22:08 ` Logarithmus
2021-07-01 12:26 ` [PR PATCH] [Updated] [BUGFIX] rust-sccache: update to 0.2.15, enable feature=dist-server for x86_64* Logarithmus
2021-07-18 14:51 ` Logarithmus
2021-07-27  1:06 ` Logarithmus
2021-07-27  1:08 ` Logarithmus
2021-07-27  1:10 ` Logarithmus
2021-07-27  1:51 ` Logarithmus
2021-07-27  1:56 ` Logarithmus
2021-07-27  6:23 ` redasamik
2022-05-14  2:17 ` github-actions
2022-05-29  2:13 ` [PR PATCH] [Closed]: " github-actions

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).